Index: ccr/trunk/p/C0CCCR.m
===================================================================
--- ccr/trunk/p/C0CCCR.m	(revision 973)
+++ ccr/trunk/p/C0CCCR.m	(revision 974)
@@ -41,5 +41,5 @@
  N C0CRTN  ; RETURN ARRAY
  D CCRRPC(.C0CRTN,DFN,XPARMS,"CCR")
- S OARY=$NA(^TMP("C0CCCR",$J,DFN,"CCR",1))
+ S OARY=$NA(^TMP("C0CCUR",$J,DFN,"CCR",1))
  S ONAM=UFN
  I UFN="" S ONAM="PAT_"_DFN_"_CCR_V1_0_0.xml"
@@ -62,5 +62,5 @@
  ;
  N G1
- S G1=$NA(^TMP("C0CCCR",$J,DFN,"CCR"))
+ S G1=$NA(^TMP("C0CCUR",$J,DFN,"CCR"))
  I $D(@G1@(0)) D  ; CCR EXISTS
  . D PARY^C0CXPATH(G1)
@@ -78,4 +78,6 @@
  ; SEE C0CPARMS FOR A COMPLETE LIST OF SUPPORTED PARAMETERS
  K ^TMP("C0CCCR",$J) ; CLEAN UP THE GLOBAL BEFORE WE USE IT
+ M ^TMP("C0CSAV",$J)=^TMP($J) ; SAVING CALLER'S TMP SETTINGS
+ K ^TMP($J) ; START CLEAN
  I '$D(DEBUG) S DEBUG=0
  S CCD=0 ; NEED THIS FLAG TO DISTINGUISH FROM CCD
@@ -89,5 +91,5 @@
  I '$D(TESTMEDS) S TESTMEDS=0 ; FLAG FOR TESTING C0CMED SECTION
  S TGLOBAL=$NA(^TMP("C0CCCR",$J,"TEMPLATE")) ; GLOBAL FOR STORING TEMPLATE
- S CCRGLO=$NA(^TMP("C0CCCR",$J,DFN,"CCR")) ; GLOBAL FOR BUILDING THE CCR
+ S CCRGLO=$NA(^TMP("C0CCUR",$J,DFN,"CCR")) ; GLOBAL FOR BUILDING THE CCR
  S ACTGLO=$NA(^TMP("C0CCCR",$J,DFN,"ACTORS")) ; GLOBAL FOR ALL ACTORS
  ; TO GET PART OF THE CCR RETURNED, PASS CCRPART="PROBLEMS" ETC
@@ -142,7 +144,10 @@
  . I J=0 S DONE=1 ; DONE WHEN TRIM RETURNS FALSE
  ;S CCRGRTN=$NA(^TMP("C0CCCR",$J,DFN,CCRPART)) ; RTN GLOBAL OF PART OR ALL
- M CCRGRTN=^TMP("C0CCCR",$J,DFN,CCRPART) ; RTN GLOBAL OF PART OR ALL
+ I CCRPART="CCR" M CCRGRTN=@CCRGLO ; ENTIRE CCR
+ E  M CCRGRTN=^TMP("C0CCCR",$J,DFN,CCRPART) ; RTN GLOBAL OF PART
  I '$D(C0CNRPC) S ^TMP("C0CRPC",$H,"RESULT",CCRGRTN(0))=""
- ;K ^TMP("C0CCCR",$J) ; BEGIN TO CLEAN UP
+ K ^TMP("C0CCCR",$J) ; BEGIN TO CLEAN UP
+ K ^TMP($J) ; REALLY CLEAN UP
+ M ^TMP($J)=^TMP("C0CSAV",$J) ; RESTORE CALLER'S $J
  Q
  ;
Index: ccr/trunk/p/C0CMED.m
===================================================================
--- ccr/trunk/p/C0CMED.m	(revision 973)
+++ ccr/trunk/p/C0CMED.m	(revision 974)
@@ -76,4 +76,5 @@
  N PEND S PEND=$NA(^TMP($J,"MED","PEND")) ; Pending Meds
  N NVA S NVA=$NA(^TMP($J,"MED","NVA")) ; non-VA Meds
+ K @HIST K @PEND K @NVA ; MAKE SURE THEY ARE EMPTY
  S @HIST@(0)=0,@PEND@(0)=0,@NVA@(0)=0 ; At first, they are all empty... (prevent undefined errors)
  ; N IPIV ; Inpatient IV Meds
@@ -94,4 +95,11 @@
  . E  D CP^C0CXPATH(NVA,MEDOUTXML) 
  . W:$G(DEBUG) "HAS NON-VA MEDS",!
+ N ZI
+ S ZI=$NA(^TMP("C0CCCR",$J,"MEDMAP"))
+ M ^TMP("C0CRIM","VARS",DFN,"MEDS")=@ZI ; PERSIST MEDS VARIABLES
+ K @ZI ; CLEAN UP MED MAP AFTER - GPL 10/10
+ K @PEND
+ K @HIST
+ K @NVA
  Q
  
Index: ccr/trunk/p/C0CMED2.m
===================================================================
--- ccr/trunk/p/C0CMED2.m	(revision 973)
+++ ccr/trunk/p/C0CMED2.m	(revision 974)
@@ -258,5 +258,5 @@
  . . S MEDFIRST=0 ; RESET FIRST FLAG
  . . D CP^C0CXPATH(RESULT,OUTXML) ; First one is a copy
- . D:'MEDFIRST INSINNER^C0CXPATH(OUTXML,RESULT) ; AFTER FIRST, INSERT INNER XML
+ . D:'MEDFIRST INSINNER^C0CXPATH(OUTXML,RESULT) ; AFTER FIRST, INSERT INNER
  N MEDTMP,MEDI
  D MISSING^C0CXPATH(OUTXML,"MEDTMP") ; SEARCH XML FOR MISSING VARS
Index: ccr/trunk/p/C0CMED3.m
===================================================================
--- ccr/trunk/p/C0CMED3.m	(revision 973)
+++ ccr/trunk/p/C0CMED3.m	(revision 974)
@@ -105,4 +105,7 @@
  . . . S NDFIEN=$P(NDFDATA(20),U)
  . . . S VAPROD=$P(NDFDATA(22),U)
+ . . . S @MAP@("MEDPRODUCTNAMETEXT")=$$GET1^DIQ(50.68,VAPROD,.01) ;
+ . . ; GPL - RESET THE NAME TO THE REAL NAME OF THE DRUG NOW THAT WE
+ . . ;   HAVE IT. 
  . . ;
  . . ; NDFIEN is not necessarily defined; it won't be if the drug
@@ -256,7 +259,4 @@
  . W "MEDICATION MISSING ",!
  . F MEDI=1:1:MEDTMP(0) W MEDTMP(MEDI),!
- N ZI
- S ZI=$NA(^TMP("C0CCCR",$J,"MEDMAP"))
- M ^TMP("C0CRIM","VARS",DFN,"MEDS")=@ZI ; PERSIST MEDS VARIABLES
  Q
  ;
Index: ccr/trunk/p/C0CPARMS.m
===================================================================
--- ccr/trunk/p/C0CPARMS.m	(revision 973)
+++ ccr/trunk/p/C0CPARMS.m	(revision 974)
@@ -24,5 +24,5 @@
  N PTMP ;
  S C0CPARMS=$NA(^TMP("C0CPARMS",$J)) ;BASE FOR THIS RUN
- ;K @C0CPARMS ;START WITH EMPTY PARMS; MAY NOT WANT TO DO THIS KILL
+ K @C0CPARMS ;START WITH EMPTY PARMS; MAY NOT WANT TO DO THIS KILL
  I $G(INPARMS)'="" D  ; OVERRIDES PROVIDED
  . N C0CI S C0CI=""