Changeset 81 for ccr/trunk/p

Timestamp:

Jul 30, 2008, 3:11:28 PM (16 years ago)

Author:

Christopher Edwards

Message:

fix infinite loop bug if more than one med

File:

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

ccr/trunk/p/GPLMEDS.m

@@ -32 +32 @@
           S MEDTVMAP=$NA(^TMP("GPLCCR",$J,"MEDICATIONS"))
           S MEDTARYTMP=$NA(^TMP("GPLCCR",$J,"MEDARYTMP"))
-          F J=1:1 Q:'$D(MEDRSLT(J))  D  ; FOR EACH MEDICATION IN THE LIST
-          . W "J IS",J,!
+          F J=1:3 Q:'$D(MEDRSLT(J))  D  ; FOR EACH MEDICATION IN THE LIST
+          . W "J IS ",J,!
           . S MEDVMAP=$NA(@MEDTVMAP@(J))
           . K @MEDVMAP
@@ -57 +57 @@
           . S @MEDVMAP@("MEDICATIONSTRENGTHUNIT")=""
           . S @MEDVMAP@("MEDICATIONFORMTEXT")=""
-          . S J=J+1
-          . S @MEDVMAP@("MEDICATIONDESCRIPTIONTEXT")=$P(MEDRSLT(J)," *",2)
-          . S J=J+1
-          . S @MEDVMAP@("MEDICATIONDIRECTIONDESCRIPTIONTEXT")=$P(MEDRSLT(J),"\ Sig: ",2)
+          . S @MEDVMAP@("MEDICATIONDESCRIPTIONTEXT")=$P(MEDRSLT(J+1)," *",2)
+          . S @MEDVMAP@("MEDICATIONDIRECTIONDESCRIPTIONTEXT")=$P(MEDRSLT(J+2),"\ Sig: ",2)
           . S @MEDVMAP@("MEDICATIONDIRECTIONDOSEVALUE")=""
           . S @MEDVMAP@("MEDICATIONDIRECTIONROUTETEXT")=""
@@ -67 +65 @@
           . K @MEDARYTMP
           . D MAP^GPLXPATH(MEDXML,MEDVMAP,MEDARYTMP)
-          . I J=3 D  ; FIRST ONE IS JUST A COPY
+          . I J=1 D  ; FIRST ONE IS JUST A COPY
           . . ; W "FIRST ONE",!
           . . D CP^GPLXPATH(MEDARYTMP,MEDOUTXML)
-          . I J>3 D  ; AFTER THE FIRST, INSERT INNER XML
+          . I J>1 D  ; AFTER THE FIRST, INSERT INNER XML
           . . D INSINNER^GPLXPATH(MEDOUTXML,MEDARYTMP)
-          . S J=J+1
           N MEDTMP,MEDI
           D MISSING^GPLXPATH(MEDOUTXML,"MEDTMP") ; SEARCH XML FOR MISSING VARS