iSharkFly-Open
/
VistA-Scheduling
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes to support i18n (Receive FM dates from C# instead of culture specific date).Also, fix for Rebooking. Now it works.

This commit is contained in:
sam 2010-07-11 14:11:26 +00:00
parent e923b7c59f
commit adf21ecda9
3 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
m/BSDX02.m
View File

@ -1,4 +1,4 @@
BSDX02 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ;
BSDX02 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 7/11/10 5:17pm
;;2.0;IHS WINDOWS SCHEDULING;;NOV 01, 2007
;
;
@ -27,12 +27,10 @@ CRSCH(BSDXY,BSDXRES,BSDXSTART,BSDXEND,BSDXWKIN) ;
S ^BSDXTMP($J,0)="I00020APPOINTMENTID^D00030START_TIME^D00030END_TIME^D00030CHECKIN^D00030AUXTIME^I00020PATIENTID^T00030PATIENTNAME^T00030RESOURCENAME^I00005NOSHOW^T00020HRN^I00005ACCESSTYPEID^I00005WALKIN^T00250NOTE"_$C(30)
D ^XBKVAR S X="ETRAP^BSDX02",@^%ZOSF("TRAP")
;
S:BSDXSTART["@0000" BSDXSTART=$P(BSDXSTART,"@")
S:BSDXEND["@0000" BSDXEND=$P(BSDXEND,"@")
S %DT="T",X=BSDXSTART D ^%DT S BSDXSTART=Y
I BSDXSTART=-1 S ^BSDXTMP($J,1)=$C(31) Q
S %DT="T",X=BSDXEND D ^%DT S BSDXEND=Y
I BSDXEND=-1 S ^BSDXTMP($J,1)=$C(31) Q
; S %DT="T",X=BSDXSTART D ^%DT S BSDXSTART=Y
; I BSDXSTART=-1 S ^BSDXTMP($J,1)=$C(31) Q
; S %DT="T",X=BSDXEND D ^%DT S BSDXEND=Y
; I BSDXEND=-1 S ^BSDXTMP($J,1)=$C(31) Q
;
S BSDXI=0
D STRES

6
m/BSDX33.m
View File

@ -1,5 +1,6 @@
BSDX33 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ;
BSDX33 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 7/11/10 11:38am
;;2.0;IHS WINDOWS SCHEDULING;;NOV 01, 2007
; Mods by WV/STAR
;
;
Q
@ -42,6 +43,9 @@ RBNEXT(BSDXY,BSDXDATE,BSDXRES,BSDXTPID) ;EP
I BSDXFND=0 S BSDXFND=""
E S Y=BSDXFND X ^DD("DD") S BSDXFND=Y
S BSDXI=BSDXI+1
;//smh - bug: Need to replace @ in FM date for C# to recognize it
S BSDXFND=$TR(BSDXFND,"@"," ")
;//smh end fix
S ^BSDXTMP($J,BSDXI)="1^"_BSDXFND_"^"_$C(30)_$C(31)
Q
SETRBKD(BSDXY,BSDXAPPT,BSDXDATE) ;EP

13
m/BSDX34.m
View File

@ -1,4 +1,4 @@
BSDX34 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 5/21/10 9:56pm
BSDX34 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 7/11/10 11:28am
;;2.0;IHS WINDOWS SCHEDULING;;NOV 01, 2007
;
;
@ -38,20 +38,19 @@ RBCLIN(BSDXY,BSDXCLST,BSDXBEG,BSDXEND) ;EP
;between dates BSDXBEG and BSDXEND for each clinic in BSDXCLST.
;Used in generating rebook letters for a clinic
;BSDXCLST is a |-delimited list of BSDX RESOURCE iens. (The last |-piece is null, so discard it.)
;BSDXBEG and BSDXEND are in external date form.
;Called by BSDX REBOOK CLINIC LIST and BSDX CANCEL CLINIC LIST via entry point CANCLIN above
;
;Jul 11 2010 (smh):
;for i18n, pass BSDXBEG and BSDXEND in FM format.
;
S X="RBERR^BSDX34",@^%ZOSF("TRAP")
;
S BSDXY="^BSDXTMP("_$J_")"
N %DT,Y,BSDXJ,BSDXCID,BSDXCLN,BSDXSTRT,BSDXAID,BSDXNOD,BSDXLIST,BSDX,BSDY
;Convert beginning and ending dates
;TODO: Validation of date to make sure it's a right FM Date
S BSDXBEG=BSDXBEG-1,BSDXBEG=BSDXBEG_".9999"
S BSDXEND=BSDXEND_".9999"
;
S X=BSDXBEG,%DT="XT" D ^%DT S BSDXBEG=$P(Y,"."),BSDXBEG=BSDXBEG-1,BSDXBEG=BSDXBEG_".9999"
I Y=-1 D RBERR Q
S X=BSDXEND,%DT="XT" D ^%DT S BSDXEND=$P(Y,"."),BSDXEND=BSDXEND_".9999"
I Y=-1 D RBERR Q
I BSDXCLST="" D RBERR Q
;
;