Changeset 883 for Scheduling/trunk

Timestamp:

Jul 18, 2010, 7:17:02 AM (14 years ago)

Author:

Sam Habiel

Message:

edits and clean-ups prior to release, first step

Location:

Scheduling/trunk/m

Files:

• BSDX01.m (modified) (1 diff)
• BSDX07.m (modified) (3 diffs)
• BSDX09.m (modified) (3 diffs)
• BSDX12.m (modified) (2 diffs)
• BSDX13.m (modified) (1 diff)
• BSDX28.m (modified) (1 diff)
• BSDX29.m (modified) (1 diff)
• i18n_log.log (modified) (6 diffs)

Scheduling/trunk/m/BSDX01.m

@@ -1 @@
-BSDX01  ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ;
+BSDX01  ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 7/18/10 2:04pm
         ;;1.3;IHS WINDOWS SCHEDULING;;NOV 01, 2007
-        ;;Test line for svn update
         ;
         ;

Scheduling/trunk/m/BSDX07.m

@@ -1 @@
-BSDX07  ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ;  ; 7/6/10 4:28pm
+BSDX07  ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ;  ; 7/18/10 2:11pm
         ;;2.0;IHS WINDOWS SCHEDULING;;NOV 01, 2007
+    ;
+    ; Change Log:
+    ; UJO/SMH
     ; v1.3 July 13 2010 - Add support i18n - Dates input as FM dates, not US.
         ;
@@ -50 +53 @@
         ; S %DT="T",X=BSDXEND D ^%DT S BSDXEND=Y
         ; I BSDXEND=-1 D ERR(BSDXI+1,"BSDX07 Error: Invalid End Time") Q
-        I $L(BSDXEND,".")=1 D ERR(BSDXI+1,"BSDX07 Error: Invalid End Time") Q
+    ;
+    ; If C# sends the dates with extra zeros, remove them
+        S BSDXSTART=+BSDXSTART,BSDXEND=+BSDXEND
+    ;
+    I $L(BSDXEND,".")=1 D ERR(BSDXI+1,"BSDX07 Error: Invalid End Time") Q
         I BSDXSTART>BSDXEND S BSDXTMP=BSDXEND,BSDXEND=BSDXSTART,BSDXSTART=BSDXTMP
         I '+BSDXPATID,'$D(^DPT(BSDXPATID,0)) D ERR(BSDXI+1,"BSDX07 Error: Invalid Patient ID") Q
@@ -111 +118 @@
         ;Returns ien in BSDXAPPT or 0 if failed
         ;Create entry in BSDX APPOINTMENT
-    ; BSDXSTART and BSDXEND need to be stored as numeric, not string
-    ; So 3090713.0900 is incorrect --> it should be 3090713.09
         N BSDXAPPTID
-        S BSDXFDA(9002018.4,"+1,",.01)=+BSDXSTART  ; smh fix bug stores as string
-        S BSDXFDA(9002018.4,"+1,",.02)=+BSDXEND
+        S BSDXFDA(9002018.4,"+1,",.01)=BSDXSTART
+        S BSDXFDA(9002018.4,"+1,",.02)=BSDXEND
         S BSDXFDA(9002018.4,"+1,",.05)=BSDXPATID
         S BSDXFDA(9002018.4,"+1,",.07)=BSDXRESD

Scheduling/trunk/m/BSDX09.m

@@ -1 @@
-BSDX09  ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 
-        ;;2.0;IHS WINDOWS SCHEDULING;**local**;NOV 01, 2007
-        ;;local mods by WV/SMH
+BSDX09  ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ;  ; 7/18/10 2:26pm
+        ;;1.3;IHS WINDOWS SCHEDULING;;NOV 01, 2007
         ;
+    ; Change Log:
+    ; UJO/TH - v 1.3 on 3100714 - Extra Demographics:
+    ; - Email
+    ; - Cell Phone
+    ; - Country
+    ; - + refactoring of routine
+        ; 
+    ; UJO/TH - v 1.3 on 3100715 - Change SSN to PID and get PID field instead
         ;
 GETREGA(BSDXRET,BSDXPAT)               ;EP
@@ -10 +17 @@
         ;   13 NOK NAME^RELATIONSHIP^PHONE^STREET^CITY^STATE^ZIP
         ;   20 DATAREVIEWED^
-        ; removed/smh;   21 Medicare#^Suffix
         ;   21 RegistrationComments
+    ;   22 EMAIL ADDRESS^PHONE NUMBER [CELLULAR]^COUNTRY
         ;
         ;For patient with ien BSDXPAT
@@ -58 +65 @@
         S BSDXNOD=^DPT(+BSDXPAT,0)
         S $P(BSDXY,"^",6)=$P(BSDXNOD,U) ;NAME
-        S $P(BSDXY,"^",8)=$$GET1^DIQ(2,BSDXPAT,"PRIMARY LONG ID")
+        S $P(BSDXY,"^",8)=$$GET1^DIQ(2,BSDXPAT,"PRIMARY LONG ID") ;PID
         S Y=$P(BSDXNOD,U,3) I Y]""  X ^DD("DD") S Y=$TR(Y,"@"," ")
         S $P(BSDXY,"^",7)=Y ;DOB

Scheduling/trunk/m/BSDX12.m

@@ -1 @@
-BSDX12  ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 7/6/10 6:33am
+BSDX12  ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 7/18/10 2:14pm
         ;;1.3;IHS WINDOWS SCHEDULING;;NOV 01, 2007
-    ; v 1.3 - i18n support
+    ; 
+    ; Change Log:
+    ; v 1.3 - i18n support - 3100718
     ; BSDXSTART and BSDXEND passed in FM Dates, not US dates
         ;
@@ -31 +33 @@
         ; S %DT="T",X=BSDXEND D ^%DT S BSDXEND=Y
         ; I BSDXEND=-1 D ERR(70) Q
+    ; Make sure dates are canonical and don't contain extra zeros
+    S BSDXSTART=+BSDXSTART,BSDXEND=+BSDXEND
+    ;
         I $L(BSDXEND,".")=1 D ERR(70) Q
         I BSDXSTART>BSDXEND S BSDXTMP=BSDXEND,BSDXEND=BSDXSTART,BSDXSTART=BSDXTMP

Scheduling/trunk/m/BSDX13.m

@@ -1 @@
-BSDX13  ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 7/6/10 7:24am
+BSDX13  ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 7/18/10 2:17pm
         ;;1.3;IHS WINDOWS SCHEDULING;;NOV 01, 2007
-    ; V 1.3 - i18n support - Dates passed to Routine as FM Date
-        ;
-        ;
+    ;
+    ; Change Log:
+    ; V 1.3 - i18n support - Dates passed to Routine as FM Date - WV/SMH
         Q
 AVDELDTD(BSDXY,BSDXRESD,BSDXSTART,BSDXEND)      ;EP

Scheduling/trunk/m/BSDX28.m

@@ -1 @@
-BSDX28  ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 7/6/10 3:55pm
-        ;;2.0;IHS WINDOWS SCHEDULING;;NOV 01, 2007
-        ;
+BSDX28  ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 7/18/10 2:30pm
+        ;;1.3;IHS WINDOWS SCHEDULING;;NOV 01, 2007
+        ; 
+    ; Change Log:
         ; HMW 3050721 Added test for inactivated record
-    ; SMH 3100714 add PID search, return PID instead of SSN
-    ; Change Error trap to new style.
+    ; V1.3 WV/SMH 3100714 
+    ; - add PID search
+    ; - return PID instead of SSN (change header and logic)
+    ; - Change Error trap to new style.
         ;
 PTLOOKRS(BSDXY,BSDXP,BSDXC)      ;EP Patient Lookup

Scheduling/trunk/m/BSDX29.m

@@ -1 @@
-BSDX29  ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 7/13/10 9:47am
-        ;;2.0;IHS WINDOWS SCHEDULING;;NOV 01, 2007
-        ;
+BSDX29  ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 7/18/10 2:03pm
+        ;;1.3;IHS WINDOWS SCHEDULING;;NOV 01, 2007
+    ; 
+    ; Change Log:
+    ; v1.3 by WV/SMH on 3100713
+        ; - Beginning and Ending dates passed as FM Dates
         ;
 BSDXCPD(BSDXY,BSDXRES,BSDX44,BSDXBEG,BSDXEND)   ;EP

Scheduling/trunk/m/i18n_log.log

@@ -24 +24 @@
 r858 | sam | 2010-07-13 09:58:25 +0300 (Tue, 13 Jul 2010) | 1 line
 Changed paths:
-   M /Scheduling/trunk/m/BSDX29.m
+#   M /Scheduling/trunk/m/BSDX29.m
 
 changes to BSDX29 for i18n
@@ -30 +30 @@
 r861 | sam | 2010-07-13 12:05:30 +0300 (Tue, 13 Jul 2010) | 1 line
 Changed paths:
-   M /Scheduling/trunk/m/BSDX01.m
+#   M /Scheduling/trunk/m/BSDX01.m
 
 Test update
@@ -36 +36 @@
 r862 | sam | 2010-07-13 12:07:13 +0300 (Tue, 13 Jul 2010) | 1 line
 Changed paths:
-   M /Scheduling/trunk/m/BSDX01.m
+#   M /Scheduling/trunk/m/BSDX01.m
 
 Test update
@@ -42 +42 @@
 r863 | sam | 2010-07-13 16:04:57 +0300 (Tue, 13 Jul 2010) | 1 line
 Changed paths:
-   M /Scheduling/trunk/m/BSDX07.m
-   M /Scheduling/trunk/m/BSDX12.m
-   M /Scheduling/trunk/m/BSDX13.m
-   M /Scheduling/trunk/m/BSDX33.m
+#   M /Scheduling/trunk/m/BSDX07.m
+#   M /Scheduling/trunk/m/BSDX12.m
+#   M /Scheduling/trunk/m/BSDX13.m
+#   M /Scheduling/trunk/m/BSDX33.m
 
 more i18n work
@@ -51 +51 @@
 r865 | sam | 2010-07-14 11:20:30 +0300 (Wed, 14 Jul 2010) | 1 line
 Changed paths:
-   M /Scheduling/trunk/m/BSDX09.m
+#   M /Scheduling/trunk/m/BSDX09.m
 
 Routine to pull extra registration data
@@ -69 +69 @@
 r871 | sam | 2010-07-14 15:55:40 +0300 (Wed, 14 Jul 2010) | 1 line
 Changed paths:
-   M /Scheduling/trunk/m/BSDX09.m
+#   M /Scheduling/trunk/m/BSDX09.m
 
 PID added insted of SNN