Changeset 165 for ccr/trunk

Timestamp:

Sep 22, 2008, 12:25:53 AM (16 years ago)

Author:

George Lilly

Message:

fixes to CCRMEDS

Location:

ccr/trunk/p

Files:

• CCRMEDS.m (modified) (3 diffs)
• GPLCCR.m (modified) (1 diff)
• GPLMEDS.m (modified) (1 diff)
• GPLRIMA.m (modified) (1 diff)

ccr/trunk/p/CCRMEDS.m

@@ -21 +21 @@
           Q
           ;
-EXTRACT(INXML,DFN,OUTXML)       ; EXTRACT MEDICATIONS INTO PROVIDED XML TEMPLATE
+EXTRACT(MINXML,DFN,OUTXML)      ; EXTRACT MEDICATIONS INTO PROVIDED XML TEMPLATE
           ;
           ; INXML AND OUTXML ARE PASSED BY NAME SO GLOBALS CAN BE USED
@@ -35 +35 @@
           ; http://www.va.gov/vdl/documents/Clinical/Pharm-Outpatient_Pharmacy/phar_1_api_r0807.pdf
           ; Output of API is ^TMP($J,"SUBSCRIPT",DFN,RXIENS).
-        
+          ; D PARY^GPLXPATH(MINXML)
           N MEDS,MAP
           K ^TMP($J)
@@ -164 +164 @@
           . N RESULT S RESULT=$NA(^TMP("GPLCCR",$J,"RESULT"))
           . K @RESULT
-          . D MAP^GPLXPATH($NA(INXML),MAP,RESULT)
+          . ; D MAP^GPLXPATH($NA(INXML),MAP,RESULT)
+          . D MAP^GPLXPATH(MINXML,MAP,RESULT)
+          . ; D PARY^GPLXPATH(RESULT)
           . D:MEDCOUNT=1 CP^GPLXPATH(RESULT,OUTXML) ; First one is a copy
           . D:MEDCOUNT>1 INSINNER^GPLXPATH(OUTXML,RESULT) ; AFTER THE FIRST, INSERT INNER XML

ccr/trunk/p/GPLCCR.m

@@ -130 +130 @@
     D PUSH^GPLXPATH(TAB,"EXTRACT;GPLPROBS;//ContinuityOfCareRecord/Body/Problems;^TMP(""GPLCCR"",$J,DFN,""PROBLEMS"")")
     I TESTMEDS D PUSH^GPLXPATH(TAB,"EXTRACT;CCRMEDS;//ContinuityOfCareRecord/Body/Medications;^TMP(""GPLCCR"",$J,DFN,""MEDICATIONS"")")
-    E  D PUSH^GPLXPATH(TAB,"EXTRACT;GPLMEDS;//ContinuityOfCareRecord/Body/Medications;^TMP(""GPLCCR"",$J,DFN,""MEDICATIONS"")")
+    I 'TESTMEDS D PUSH^GPLXPATH(TAB,"EXTRACT;GPLMEDS;//ContinuityOfCareRecord/Body/Medications;^TMP(""GPLCCR"",$J,DFN,""MEDICATIONS"")")
     D PUSH^GPLXPATH(TAB,"EXTRACT;GPLVITAL;//ContinuityOfCareRecord/Body/VitalSigns;^TMP(""GPLCCR"",$J,DFN,""VITALS"")")
     I TESTLAB D PUSH^GPLXPATH(TAB,"EXTRACT;GPLLABS;//ContinuityOfCareRecord/Body/Results;^TMP(""GPLCCR"",$J,DFN,""RESULTS"")")

ccr/trunk/p/GPLMEDS.m

@@ -34 +34 @@
    ; I DEBUG ZWR MEDRSLT
    M GPLMEDS=MEDRSLT
-   S MEDTVMAP=$NA(^TMP("GPLCCR",$J,"MEDICATIONS"))
+   S MEDTVMAP=$NA(^TMP("GPLCCR",$J,"MEDMAP"))
    S MEDTARYTMP=$NA(^TMP("GPLCCR",$J,"MEDARYTMP"))
    K @MEDTVMAP,@MEDTARYTMP

ccr/trunk/p/GPLRIMA.m

@@ -63 +63 @@
     . I $D(^TMP("GPLCCR",$J,"VITALS",1)) D  ; VITALS VARS EXISTS
     . . M @RIMBASE@("VARS",RIMDFN,"VITALS")=^TMP("GPLCCR",$J,"VITALS")
-    . I $D(^TMP("GPLCCR",$J,"MEDICATIONS",1)) D  ; MEDS VARS EXISTS
+    . I $D(^TMP("GPLCCR",$J,"MEDMAP",1)) D  ; MEDS VARS EXISTS
     . . M @RIMBASE@("VARS",RIMDFN,"MEDS")=^TMP("GPLCCR",$J,"MEDICATIONS")
     . K ^TMP("GPLCCR",$J) ; KILL WORK AREA FOR CCR BUILDING