Changeset 185 for ccr/trunk


Ignore:
Timestamp:
Oct 5, 2008, 10:40:39 PM (16 years ago)
Author:
George Lilly
Message:

fixed meds bug

File:
1 edited

Legend:

Unmodified
Added
Removed
  • ccr/trunk/p/CCRMEDS.m

    r184 r185  
    3838   . S MEDCNT=@MEDOUTXML@(0) ; SAVE COUNT TO KNOW HOW TO ADD TO MAP
    3939   . W "HAS ACTIVE OP MEDS",!
    40    N PENDINGXML
    41    D EXTRACT^CCRMEDS2(MEDXML,DFN,"PENDINGXML") ; FIRST EXTRACT OUTPATIENT MEDS
    42    I PENDINGXML(0)>0 D  ; CCRMEDS FOUND PENDING OP MEDS
     40   N PENDINGXML,MEDPENDING
     41   S PENDINGXML="MEDPENDING" ;NAME FOR ARRAY
     42   D EXTRACT^CCRMEDS2(MEDXML,DFN,PENDINGXML) ; FIRST EXTRACT OUTPATIENT MEDS
     43   I @PENDINGXML@(0)>0 D  ; CCRMEDS FOUND PENDING OP MEDS
    4344   . S HASOP=1 ; SET FLAG TO KNOW HOW TO ADD XML
    4445   . I @MEDOUTXML@(0)>0 D  ; IF WE NEED TO COMBINE MEDS
    45    . . D INSINNER^GPLXPATH(MEDOUTXML,"PENDINGXML") ;ADD PENDING TO ACTIVE
    46    . E  D CP^GPLXPATH("PENDINXML",MEDOUTXML) ; NO ACTIVE MEDS, JUST COPY
     46   . . D INSINNER^GPLXPATH(MEDOUTXML,PENDINGXML) ;ADD PENDING TO ACTIVE
     47   . E  D CP^GPLXPATH(PENDINGXML,MEDOUTXML) ; NO ACTIVE MEDS, JUST COPY
    4748   . S MEDCNT=@MEDOUTXML@(0) ; SAVE COUNT TO KNOW HOW TO ADD TO MAP
    48    . W "HAS OP MEDS",!
     49   . W "HAS OP PENDING MEDS",!
    4950   N MEDRSLT,I,J,K,MEDPTMP,X,MEDVMAP,TBUF
    5051   D ACTIVE^ORWPS(.MEDRSLT,DFN)
Note: See TracChangeset for help on using the changeset viewer.