Changeset 121 for ccr/trunk/p/GPLVITAL.m

Timestamp:

Aug 30, 2008, 1:29:46 PM (16 years ago)

Author:

George Lilly

Message:

XINDEX fixes, and generalized Date sort utility for Vitals SORTDT^CCRUTIL

File:

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

ccr/trunk/p/GPLVITAL.m

@@ -37 +37 @@
           S VITTARYTMP=$NA(^TMP("GPLCCR",$J,"VITALARYTMP"))
           K @VITTVMAP,@VITTARYTMP ; KILL OLD ARRAY VALUES
-          N VSORT,VCNT ; ARRAY FOR DATE SORTED VITALS INDEX
-          S VCNT=$$VITSORT(.VSORT,.VITRSLT) ; PUT VITALS IN DATE ORDER
-          ; AND COUNT THEM VSORT CONTAINS INDEXES ONLY
+          N VSORT,VDATES,VCNT ; ARRAY FOR DATE SORTED VITALS INDEX
+          D VITDATES(.VDATES) ; PULL OUT THE DATES INTO AN ARRAY
+          I DEBUG ZWR VDATES ;DEBUG
+          S VCNT=$$SORTDT^CCRUTIL(.VSORT,.VDATES,-1) ; PUT VITALS IN REVERSE
+          ; DATE ORDER AND COUNT THEM. VSORT CONTAINS INDIRECT INDEXES ONLY
           F J=1:1:VCNT  D  ; FOR EACH VITAL IN THE LIST
           . I $D(VITRSLT(VSORT(J))) D
@@ -182 +184 @@
           Q
           ;
-VITSORT(V1,V2) ; DATE SORT VITALS ARRAY AND RETURN INDEX IN V1 AND COUNT
+VITSORT(V1,V2) ; DEPRECATED USE $$RSORTDT^CCRUTIL
+               ; DATE SORT VITALS ARRAY AND RETURN INDEX IN V1 AND COUNT
                ; AS EXTRINSIC
                ; BOTH V1 AND V2 ARE PASSED BY REFERENCE
@@ -189 +192 @@
           S ZCNT=0 ; COUNTING NUMBER OF VITALS
           S ZTMP="" ;
-          F ZI=0:0 D  Q:$O(V2(ZTMP))="" ; FOR EACH VITAL IN THE ARRAY
+          F ZI=0:0 D  Q:$O(V2(ZTMP))=""  ; FOR EACH VITAL IN THE ARRAY
           . S ZCNT=ZCNT+1 ; INCREMENT THE COUNT
           . S ZTMP=$O(V2(ZTMP)) ; NEXT VITAL
@@ -206 +209 @@
           S ZDONE=0
           N ZZCNT S ZZCNT=0 ; ANOTHER COUNTER
-          F ZI=0:0 D  Q:ZDONE ; VISIT THE ARRAY IN DATE ORDER
+          F ZI=0:0 D  Q:ZDONE  ; VISIT THE ARRAY IN DATE ORDER
           . S ZD=$O(VSRT(ZD),-1) ; NEXT DATE
           . I ZD="" S ZDONE=1
@@ -219 +222 @@
           Q ZCNT
           ;
+VITDATES(VDT) ; VDT IS PASSED BY REFERENCE AND WILL CONTAIN THE ARRAY
+         ; OF DATES IN THE VITALS RESULTS
+         N VDTI,VDTJ,VTDCNT
+         S VTDCNT=0 ; COUNT TO BUILD ARRAY
+         S VDTJ="" ; USED TO VISIT THE RESULTS
+         F VDTI=0:0 D  Q:$O(VITRSLT(VDTJ))=""  ; VISIT ALL RESULTS
+         . S VDTJ=$O(VITRSLT(VDTJ)) ; NEXT RESULT
+         . S VTDCNT=VTDCNT+1 ; INCREMENT COUNTER
+         . S VDT(VTDCNT)=$P(VITRSLT(VDTJ),U,4) ; PULL OUT THE DATE
+         Q
+         ;