Changeset 36 for ccr/trunk/p/CCRUTIL.m

Timestamp:

Jul 3, 2008, 4:54:25 PM (16 years ago)

Author:

Christopher Edwards

Message:

switch proccessing of vitals and problems so CCR would validate
added date time for ccr
cleaned up template ccr (more to come)
more work done in vitals section

File:

• ccr/trunk/p/CCRUTIL.m (modified) (2 diffs)

ccr/trunk/p/CCRUTIL.m

@@ -1 @@
-CCRUTIL ;CCRCCD/SMH - Various Utilites for generating the CCR/CCD;06/15/08
+CCRUTIL ;CCRCCD/SMH - Various Utilites for generating the CCR/CCD;06/15/08
         ;;0.1;CCRCCD;;Jun 15, 2008;
-
+        
         W "No Entry at Top!" Q
-
-FMDTOUTC(DATE,FORMAT) ; Convert Fileman Date to UTC Date Format; PUBLIC; Extrinsic
+        
+FMDTOUTC(DATE,FORMAT)   ; Convert Fileman Date to UTC Date Format; PUBLIC; Extrinsic
         ; FORMAT is Format of Date. Can be either D (Day) or DT (Date and Time)
         ; If not passed, or passed incorrectly, it's assumed that it is D.
@@ -16 +16 @@
         S H=$E(DATE,9,10)
         S MM=$E(DATE,11,12)
-        S S=$E(DATE,12,13)
+        S S=$E(DATE,13,14)
         S OFF=$$TZ^XLFDT ; See Kernel Manual for documentation.
         ; If H, MM and S are empty, it means that the FM date didn't supply the time.
         ; In this case, set H, MM and S to "00"
         S:('$L(H)&'$L(MM)&'$L(S)) (H,MM,S)="00"
-        S UTC=Y_"-"_M_"-"_D_"T"_H_":"_MM_":"_S_OFF
+        I S="" S UTC=Y_"-"_M_"-"_D_"T"_H_":"_MM_OFF
+        E  S UTC=Y_"-"_M_"-"_D_"T"_H_":"_MM_":"_S_OFF
         I $L($G(FORMAT)),FORMAT="DT" Q UTC ; Date with time.
         E  Q $P(UTC,"T")