Index: ccr/trunk/p/CCRMEDS.m
===================================================================
--- ccr/trunk/p/CCRMEDS.m	(revision 332)
+++ ccr/trunk/p/CCRMEDS.m	(revision 335)
@@ -38,5 +38,5 @@
  S MEDTARYTMP=$NA(^TMP("GPLCCR",$J,"MEDARYTMP"))
  K @MEDTARYTMP ; KILL XML ARRAY
- I $D(^TMP("GPLCCR","RPMS")) G USERPC ; FOR RPMS, USE THE RPC FOR MEDS
+ I $G(DUZ("AG"))="I" G USERPC ; FOR RPMS, USE THE RPC FOR MEDS
  D EXTRACT^CCRMEDS1(MEDXML,DFN,MEDOUTXML) ; FIRST EXTRACT OUTPATIENT MEDS
  I @MEDOUTXML@(0)>0 D  ; CCRMEDS FOUND ACTIVE OP MEDS
Index: ccr/trunk/p/CCRUNIT.m
===================================================================
--- ccr/trunk/p/CCRUNIT.m	(revision 332)
+++ ccr/trunk/p/CCRUNIT.m	(revision 335)
@@ -4,6 +4,6 @@
         ;
 MEDS
-        N DEBUG S DEBUG=0
-        N DFN S DFN=1
+        N DEBUG S DEBUG=1
+        N DFN S DFN=5685
         K ^TMP($J)
         W "Loading CCR Template into T using LOAD^GPLCCR0($NA(^TMP($J,""CCR"")))",!!
@@ -17,4 +17,4 @@
         W "OUTXML will be ^TMP($J,""OUT"")",!
         N OUTXML S OUTXML=$NA(^TMP($J,"OUT"))
-        D EXTRACT^CCRMEDS($NA(MINXML),DFN,OUTXML)
+        D EXTRACT^CCRMEDS6($NA(MINXML),DFN,OUTXML)
         Q