From ab2f082f1e8a7449fbb37b6063439b617b83714e Mon Sep 17 00:00:00 2001 From: sam Date: Wed, 11 Jul 2012 00:39:33 +0000 Subject: [PATCH] Mostly minor changes. Most significant is that BSDX31 no longer reverses no-show in the error trap. --- m/BSDX26.m | 5 +++-- m/BSDX31.m | 3 +-- m/BSDXAPI.m | 5 ++--- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/m/BSDX26.m b/m/BSDX26.m index 6f7a772..ce295a8 100644 --- a/m/BSDX26.m +++ b/m/BSDX26.m @@ -1,4 +1,4 @@ -BSDX26 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 7/9/12 2:19pm +BSDX26 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 7/10/12 10:27am ;;1.7T1;BSDX;;Jul 06, 2012;Build 18 ; Licensed under LGPL ; Change History: @@ -70,6 +70,7 @@ EDITAPT(BSDXY,BSDXAPTID,BSDXNOTE) ;EP Edit appointment (only note text can be K ^TMP($J) M ^TMP($J,"BEFORE","BSDXAPPT")=^BSDXAPPT(BSDXAPTID) ; + ; Update note in BSDX APPOINTMENT I $D(BSDXNOTE(.5)) D . D WP^DIE(9002018.4,BSDXAPTID_",",1,"","BSDXNOTE","BSDXMSG") ; @@ -85,7 +86,7 @@ EDITAPT(BSDXY,BSDXAPTID,BSDXNOTE) ;EP Edit appointment (only note text can be I HLIEN S BSDXRES=$$UPDATENT^BSDXAPI1(PTIEN,HLIEN,DATE,BSDXNOTE(.5)) ; If we get an error (denoted by -1 in BSDXRES), return error to client ; AND restore the original note - I BSDXRES<0 D ERR(BSDXI,"4~BSDX26: BSDXAPI reports an error: "_BSDXRES),ROLLBACK(BSDXAPTID) QUIT + I BSDXRES D ERR(BSDXI,"4~BSDX26: BSDXAPI reports an error: "_BSDXRES),ROLLBACK(BSDXAPTID) QUIT ; ;Return Recordset indicating success L -^BSDXAPPT(BSDXAPTID) diff --git a/m/BSDX31.m b/m/BSDX31.m index 2c9577d..1bfdb25 100644 --- a/m/BSDX31.m +++ b/m/BSDX31.m @@ -1,4 +1,4 @@ -BSDX31 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 7/9/12 12:57pm +BSDX31 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 7/10/12 10:39am ;;1.7T1;BSDX;;Jul 06, 2012;Build 18 ; Licensed under LGPL ; Change Log: @@ -200,7 +200,6 @@ ETRAP ;EP Error trap entry N $ET S $ET="D ^%ZTER HALT" ; Emergency Error Trap D ^%ZTER ; - I $G(BSDXAPTID),$D(BSDXNS) N % S %=$$BSDXNOS(BSDXAPTID,'BSDXNS) ; Reverse No-Show status (whatever it was) ; Send to client I '$D(BSDXI) N BSDXI S BSDXI=0 D ERR(-100,"BSDX31 Error: "_$G(%ZTERZE)) diff --git a/m/BSDXAPI.m b/m/BSDXAPI.m index 76fe2b1..2717fce 100644 --- a/m/BSDXAPI.m +++ b/m/BSDXAPI.m @@ -1,4 +1,4 @@ -BSDXAPI ; IHS/LJF,HMW,MAW & VEN/SMH - SCHEDULING APIs ; 7/9/12 4:00pm +BSDXAPI ; IHS/LJF,HMW,MAW & VEN/SMH - SCHEDULING APIs ; 7/10/12 5:58pm ;;1.7T1;BSDX;;Jul 06, 2012;Build 18 ; Licensed under LGPL ; @@ -154,7 +154,7 @@ UNMAKE(BSDR) ; Reverse Make - Private $$ ; Only used in Emergiencies where Fileman data filing fails. ; If previous data exists, which caused an error, it's destroyed. ; NB: ^DIK stops for nobody - ; TODO: If Patient Appointment previously existed as cancelled, it's removed. + ; NB: If Patient Appointment previously existed as cancelled, it's removed. ; How can I tell if one previously existed when data is in an intermediate ; State? Can I restore it if the other file failed? Restoration can cause ; another error. If I restore the global, there will be cross-references @@ -419,7 +419,6 @@ SCIEN(PAT,CLINIC,DATE) ;PEP; returns ien for appt in ^SC ; APPLEN(PAT,CLINIC,DATE) ; $$ PEP; returns an appointment's length ; Get either the appointment length or zero - ; TODO: Test N SCIEN S SCIEN=$$SCIEN(PAT,CLINIC,DATE) Q:SCIEN $P(^SC(CLINIC,"S",DATE,1,SCIEN,0),U,2) Q 0