Changeset 184 for ccr/trunk/p/CCRMEDS.m

Timestamp:

Oct 5, 2008, 9:16:50 PM (16 years ago)

Author:

George Lilly

Message:

rename MEDS routines to CCRMEDSx

File:

• ccr/trunk/p/CCRMEDS.m (modified) (2 diffs)

ccr/trunk/p/CCRMEDS.m

@@ -1 @@
-GPLMEDS ; CCDCCR/CJE - CCR/CCD PROCESSING FOR MEDICATIONS ;07/23/08  14:33
+CCRMEDS ; CCDCCR/GPL - CCR/CCD PROCESSING FOR MEDICATIONS ;07/23/08  14:33
    ;;0.1;CCDCCR;;JUL 16,2008;
    ;Copyright 2008 WorldVistA.  Licensed under the terms of the GNU
@@ -28 +28 @@
    N HASOP S HASOP=0 ; FLAG FOR HAS OUTPATIENT MEDS
    N MEDCNT S MEDCNT=0 ; COUNT FOR MEDS ALREADY PROCESSED
-   ; OUTPATIENT MEDS ARE PROCESSED IN EXTRACT^CCRMEDS, ALL OTHERS HERE
-   D EXTRACT^CCRMEDS(MEDXML,DFN,MEDOUTXML) ; FIRST EXTRACT OUTPATIENT MEDS
+   ; OUTPATIENT ACTIVE MEDS ARE PROCESSED IN EXTRACT^CCRMEDS1
+   ; OUTPATIENT PENDING MEDS IN EXTRACT^CCRMEDS2
+   ; NON-VA MEDS IN EXTRACT^CCRMEDS3
+   ; INPATIENT MEDS IN EXTRACT^CCRMEDS4
+   ; ALL OTHERS HERE
+   D EXTRACT^CCRMEDS1(MEDXML,DFN,MEDOUTXML) ; FIRST EXTRACT OUTPATIENT MEDS
    I @MEDOUTXML@(0)>0 D  ; CCRMEDS FOUND ACTIVE OP MEDS
    . S HASOP=1 ; SET FLAG TO KNOW HOW TO ADD XML
    . S MEDCNT=@MEDOUTXML@(0) ; SAVE COUNT TO KNOW HOW TO ADD TO MAP
    . W "HAS ACTIVE OP MEDS",!
-   D EXTRACT^CCRMEDS2(MEDXML,DFN,MEDOUTXML) ; FIRST EXTRACT OUTPATIENT MEDS
-   I @MEDOUTXML@(0)>0 D  ; CCRMEDS FOUND 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
    . 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
    . S MEDCNT=@MEDOUTXML@(0) ; SAVE COUNT TO KNOW HOW TO ADD TO MAP
    . W "HAS OP MEDS",!