Changeset 185 for ccr/trunk

Timestamp:

Oct 5, 2008, 10:40:39 PM (16 years ago)

Author:

George Lilly

Message:

fixed meds bug

File:

• ccr/trunk/p/CCRMEDS.m (modified) (1 diff)

ccr/trunk/p/CCRMEDS.m

@@ -38 +38 @@
    . S MEDCNT=@MEDOUTXML@(0) ; SAVE COUNT TO KNOW HOW TO ADD TO MAP
    . W "HAS ACTIVE OP MEDS",!
-   N PENDINGXML
-   D EXTRACT^CCRMEDS2(MEDXML,DFN,"PENDINGXML") ; FIRST EXTRACT OUTPATIENT MEDS
-   I PENDINGXML(0)>0 D  ; CCRMEDS FOUND PENDING OP MEDS
+   N PENDINGXML,MEDPENDING
+   S PENDINGXML="MEDPENDING" ;NAME FOR ARRAY
+   D EXTRACT^CCRMEDS2(MEDXML,DFN,PENDINGXML) ; FIRST EXTRACT OUTPATIENT MEDS
+   I @PENDINGXML@(0)>0 D  ; CCRMEDS FOUND PENDING OP MEDS
    . S HASOP=1 ; SET FLAG TO KNOW HOW TO ADD XML
    . I @MEDOUTXML@(0)>0 D  ; IF WE NEED TO COMBINE MEDS
-   . . D INSINNER^GPLXPATH(MEDOUTXML,"PENDINGXML") ;ADD PENDING TO ACTIVE
-   . E  D CP^GPLXPATH("PENDINXML",MEDOUTXML) ; NO ACTIVE MEDS, JUST COPY
+   . . D INSINNER^GPLXPATH(MEDOUTXML,PENDINGXML) ;ADD PENDING TO ACTIVE
+   . E  D CP^GPLXPATH(PENDINGXML,MEDOUTXML) ; NO ACTIVE MEDS, JUST COPY
    . S MEDCNT=@MEDOUTXML@(0) ; SAVE COUNT TO KNOW HOW TO ADD TO MAP
-   . W "HAS OP MEDS",!
+   . W "HAS OP PENDING MEDS",!
    N MEDRSLT,I,J,K,MEDPTMP,X,MEDVMAP,TBUF
    D ACTIVE^ORWPS(.MEDRSLT,DFN)