Index: /ccr/trunk/p/CCRMEDS.m
===================================================================
--- /ccr/trunk/p/CCRMEDS.m	(revision 164)
+++ /ccr/trunk/p/CCRMEDS.m	(revision 165)
@@ -21,5 +21,5 @@
 	  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,5 +35,5 @@
 	  ; 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,5 +164,7 @@
 	  . 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
Index: /ccr/trunk/p/GPLCCR.m
===================================================================
--- /ccr/trunk/p/GPLCCR.m	(revision 164)
+++ /ccr/trunk/p/GPLCCR.m	(revision 165)
@@ -130,5 +130,5 @@
     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"")")
Index: /ccr/trunk/p/GPLMEDS.m
===================================================================
--- /ccr/trunk/p/GPLMEDS.m	(revision 164)
+++ /ccr/trunk/p/GPLMEDS.m	(revision 165)
@@ -34,5 +34,5 @@
    ; 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
Index: /ccr/trunk/p/GPLRIMA.m
===================================================================
--- /ccr/trunk/p/GPLRIMA.m	(revision 164)
+++ /ccr/trunk/p/GPLRIMA.m	(revision 165)
@@ -63,5 +63,5 @@
     . 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