Changeset 115 for ccr/trunk

Timestamp:

Aug 29, 2008, 3:00:11 PM (16 years ago)

Author:

George Lilly

Message:

Vitals time extract fixed... Vitals now in date order

File:

• ccr/trunk/p/GPLVITAL.m (modified) (3 diffs)

ccr/trunk/p/GPLVITAL.m

@@ -46 +46 @@
           . . I DEBUG W "VMAP= ",VITVMAP,!
           . . S VITPTMP=VITRSLT(VSORT(J)) ; DATE SORTED VITAL FROM RETURN ARRAY
-          . . W "VITAL ",VSORT(J),!
-          . . W VITRSLT(VSORT(J))," ",$$FMDTOUTC^CCRUTIL($P(VITPTMP,U,4),"DT"),!
-          . . W $P(VITPTMP,U,4),!
+          . . I DEBUG W "VITAL ",VSORT(J),!
+          . . I DEBUG W VITRSLT(VSORT(J))," ",$$FMDTOUTC^CCRUTIL($P(VITPTMP,U,4),"DT"),!
+          . . I DEBUG W $P(VITPTMP,U,4),!
           . . S @VITVMAP@("VITALSIGNSDATAOBJECTID")="VITAL"_J ; UNIQUE OBJID
           . . I $P(VITPTMP,U,2)="HT" D
@@ -185 +185 @@
                ; AS EXTRINSIC
                ; BOTH V1 AND V2 ARE PASSED BY REFERENCE
-          ; N VSRT ; TEMP FOR HASHING DATES
-          ; N ZI,ZJ,ZTMP,ZCNT,ZP1,ZP2
+          N VSRT ; TEMP FOR HASHING DATES
+          N ZI,ZJ,ZTMP,ZCNT,ZP1,ZP2
           S ZCNT=0 ; COUNTING NUMBER OF VITALS
           S ZTMP="" ;
@@ -197 +197 @@
           . . S VSRT(ZP1,ZP2_"00000"_ZCNT)=ZCNT ; HASH ON DATE AND TIME
           . . ; S VSRT($P(V2(ZTMP),U,4)_"000000"_ZCNT)=ZCNT ; PULL DATE
-          . W "ZTMP=",ZTMP," "
+          . I DEBUG W "ZTMP=",ZTMP," "
           S V1(0)=ZCNT ; ARRAYS ARE THE SAME SIZE
-          S ZJ=""
-          ZWR V2
-          ZWR VSRT
-          F ZI=1:1:ZCNT D  Q:$O(VSRT(ZJ))="" ; VISIT THE ARRAY IN DATE ORDER
-          . ; S ZJ=$O(VSRT(ZJ)) ; NEXT DATE
-          . ; S V1(ZI)=VSRT(ZJ) ; ASSIGN INDEX OF NEXT DATE
-          . S V1(ZI)=ZI ; PLUG FOR NOW, DATES NOT SORTED
+          I DEBUG ZWR V2
+          I DEBUG ZWR VSRT
+          N ZD,ZT ; DATA AND TIME ITERATORS
+          N ZDONE ; DONE FLAG
+          S (ZD,ZT)=""
+          S ZDONE=0
+          N ZZCNT S ZZCNT=0 ; ANOTHER COUNTER
+          F ZI=0:0 D  Q:ZDONE ; VISIT THE ARRAY IN DATE ORDER
+          . S ZD=$O(VSRT(ZD)) ; NEXT DATE
+          . I ZD="" S ZDONE=1
+          . I 'ZDONE D  ; MORE DATES
+          . . S ZT="" ; WANT FIRST TIME FOR THIS DATE
+          . . F ZJ=0:0 D  Q:$O(VSRT(ZD,ZT))=""  ; LOOP THROUGH ALL TIMES
+          . . . S ZT=$O(VSRT(ZD,ZT)) ; NEXT TIME
+          . . . S ZZCNT=ZZCNT+1 ; INCREMENT COUNTER
+          . . . S V1(ZZCNT)=VSRT(ZD,ZT) ; PULL OUT THE INDEX
+          . ; S V1(ZI)=ZI ; PLUG FOR NOW, DATES NOT SORTED
+          I DEBUG ZWR V1
           Q ZCNT
           ;