Changeset 112

Timestamp:

Aug 29, 2008, 1:48:03 PM (16 years ago)

Author:

George Lilly

Message:

fixed indexing of vitals, still not in date order

Location:

ccr/trunk/p

Files:

• GPLACTOR.m (modified) (1 diff)
• GPLRIMA.m (modified) (1 diff)
• GPLVITAL.m (modified) (4 diffs)

ccr/trunk/p/GPLACTOR.m

@@ -1 @@
-GPLACTORS  ; CCDCCR/GPL - CCR/CCD PROCESSING FOR ACTORS ; 7/3/08
+GPLACTOR  ; CCDCCR/GPL - CCR/CCD PROCESSING FOR ACTORS ; 7/3/08
  ;;0.3;CCDCCR;nopatch;noreleasedate
  ;Copyright 2008 WorldVistA.  Licensed under the terms of the GNU

ccr/trunk/p/GPLRIMA.m

@@ -64 +64 @@
     . I $D(^TMP("GPLCCR",$J,"MEDICATIONS",1)) D  ; MEDS VARS EXISTS
     . . M @RIMBASE@("VARS",RIMDFN,"MEDS")=^TMP("GPLCCR",$J,"MEDICATIONS")
+    . K ^TMP("GPLCCR",$J) ; KILL WORK AREA FOR CCR BUILDING
     . ;
     . ; EVALUATE THE VARIABLES AND CREATE AN ATTRIBUTE MAP

ccr/trunk/p/GPLVITAL.m

@@ -1 @@
-GPLVITALS ; CCDCCR/CJE - CCR/CCD PROCESSING FOR VITALS ; 07/16/08
+GPLVITAL ; CCDCCR/CJE - CCR/CCD PROCESSING FOR VITALS ; 07/16/08
           ;;0.1;CCDCCR;;JUL 16,2008;
           ;Copyright 2008 WorldVistA.  Licensed under the terms of the GNU
@@ -24 +24 @@
           ;
           ; VITXML AND OUTXML ARE PASSED BY NAME SO GLOBALS CAN BE USED
-          ; IVITXML WILL CONTAIN ONLY THE VITALS SECTION OF THE OVERALL TEMPLATE
-          ;
-          N VITRSLT,J,K,VITPTMP,X,VITVMAP,TBUF
+          ; IVITXML CONTAINS ONLY THE VITALS SECTION OF THE OVERALL TEMPLATE
+          ;
+          N VITRSLT,J,K,VITPTMP,X,VITVMAP,TBUF,VORDR
           D VITALS^ORQQVI(.VITRSLT,DFN,"","")
           I $P(VITRSLT(1),U,2)="No vitals found." D  ; NULL RESULT FROM RPC
@@ -36 +36 @@
           S VITTARYTMP=$NA(^TMP("GPLCCR",$J,"VITALARYTMP"))
           K @VITTVMAP,@VITTARYTMP ; KILL OLD ARRAY VALUES
-          F J=1:1:VITRSLT(1)  D  ; FOR EACH VITAL IN THE LIST
-          . I $D(VITRSLT(J)) D
+          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
+          F J=1:1:VCNT  D  ; FOR EACH VITAL IN THE LIST
+          . I $D(VITRSLT(VSORT(J))) D
           . . S VITVMAP=$NA(@VITTVMAP@(J))
           . . K @VITVMAP
           . . I DEBUG W "VMAP= ",VITVMAP,!
-          . . S VITPTMP=VITRSLT(J) ; PULL OUT VITAL FROM RPC RETURN ARRAY
-          . . S @VITVMAP@("VITALSIGNSDATAOBJECTID")="VITAL"_J ; UNIQUE OBJID FOR VITAL
+          . . 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),!
+          . . S @VITVMAP@("VITALSIGNSDATAOBJECTID")="VITAL"_J ; UNIQUE OBJID
           . . I $P(VITPTMP,U,2)="HT" D
           . . . S @VITVMAP@("VITALSIGNSDATETIMETYPETEXT")="OBSERVED"
@@ -175 +181 @@
           Q
           ;
+VITSORT(V1,V2) ; DATE SORT VITALS ARRAY AND RETURN INDEX IN V1 AND COUNT
+               ; AS EXTRINSIC
+               ; BOTH V1 AND V2 ARE PASSED BY REFERENCE
+          ; N VSRT ; TEMP FOR HASHING DATES
+          ; N ZI,ZJ,ZTMP,ZCNT,ZP1,ZP2
+          S ZCNT=0 ; COUNTING NUMBER OF VITALS
+          S ZTMP="" ;
+          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
+          . I $D(V2(ZTMP)) D  ; IF THE RESULT EXISTS
+          . . S ZP1=$P($P(V2(ZTMP),U,4),".",1) ; THE DATE PIECE
+          . . S ZP2=$P($P(V2(ZTMP),U,4),".",2) ; THE TIME PIECE
+          . . 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," "
+          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
+          Q ZCNT
+          ;