Index: ccr/trunk/p/CCRMEDS.m
===================================================================
--- ccr/trunk/p/CCRMEDS.m	(revision 191)
+++ ccr/trunk/p/CCRMEDS.m	(revision 192)
@@ -34,6 +34,8 @@
  ; ALL OTHERS HERE
  S MEDTVMAP=$NA(^TMP("GPLCCR",$J,"MEDMAP"))
+ K @MEDTVMAP ; CLEAR VARIABLE ARRAY
  S @MEDTVMAP@(0)=0 ; INITIALIZE NUMBER OF MEDS PROCESSED
  S MEDTARYTMP=$NA(^TMP("GPLCCR",$J,"MEDARYTMP"))
+ K @MEDTARYTMP ; KILL XML ARRAY
  D EXTRACT^CCRMEDS1(MEDXML,DFN,MEDOUTXML) ; FIRST EXTRACT OUTPATIENT MEDS
  I @MEDOUTXML@(0)>0 D  ; CCRMEDS FOUND ACTIVE OP MEDS
@@ -88,4 +90,5 @@
  . S MEDPTMP=MEDRSLT(ZJ) ; PULL OUT FIRST LINE OF MED
  . I $P(MEDPTMP,U,1)?1"~OP" Q  ; SKIP OP ACTIVE AND PENDING
+ . S @MEDTVMAP@(0)=@MEDTVMAP@(0)+1 ; ADDING A MED HERE
  . S @MEDVMAP@("MEDOBJECTID")="MED"_(ZI+MEDCNT) ; UNIQUE OBJID FOR MEDS
  . I $P(MEDPTMP,"^",11)="" S @MEDVMAP@("MEDISSUEDATETXT")=""
Index: ccr/trunk/p/CCRMEDS1.m
===================================================================
--- ccr/trunk/p/CCRMEDS1.m	(revision 191)
+++ ccr/trunk/p/CCRMEDS1.m	(revision 192)
@@ -46,12 +46,16 @@
  N RXIEN S RXIEN=0
  N MEDCOUNT S MEDCOUNT=0
+ S MEDMAP=$NA(^TMP("GPLCCR",$J,"MEDMAP")) ; THIS IS THE VARIABLE MAP
+ S MEDCOUNT=@MEDMAP@(0) ; ACCOUNT FOR MEDS ALREADY IN ARRAY
  F  S RXIEN=$O(MEDS(RXIEN)) Q:RXIEN=""  D  ; FOR EACH MEDICATION IN THE LIST
  . S MEDCOUNT=MEDCOUNT+1
  . I DEBUG W "RXIEN IS ",RXIEN,!
  . S MAP=$NA(^TMP("GPLCCR",$J,"MEDMAP",MEDCOUNT))
- . K @MAP
+ . ; K @MAP DO NOT KILL HERE, WAS CLEARED IN CCRMEDS
+ . S @MEDMAP@(0)=@MEDMAP@(0)+1 ; INCREMENT TOTAL MEDS IN VAR ARRAY
  . I DEBUG W "MAP= ",MAP,!
  . N MED M MED=MEDS(RXIEN) ; PULL OUT MEDICATION FROM
- . S @MAP@("MEDOBJECTID")="MED"_MED(.01) ;Rx Number
+ . S @MAP@("MEDOBJECTID")="MED"_MEDCOUNT ; MEDCOUNT FOR ID
+ . ; S @MAP@("MEDOBJECTID")="MED"_MED(.01) ;Rx Number
  . S @MAP@("MEDISSUEDATETXT")="Issue Date"
  . S @MAP@("MEDISSUEDATE")=$$FMDTOUTC^CCRUTIL($P(MED(1),U))
Index: ccr/trunk/p/CCRMEDS2.m
===================================================================
--- ccr/trunk/p/CCRMEDS2.m	(revision 191)
+++ ccr/trunk/p/CCRMEDS2.m	(revision 192)
@@ -49,4 +49,6 @@
  N RXIEN S RXIEN=0
  N MEDCOUNT S MEDCOUNT=0
+ S MEDMAP=$NA(^TMP("GPLCCR",$J,"MEDMAP")) ; THIS IS THE VARIABLE MAP
+ S MEDCOUNT=@MEDMAP@(0) ; ACCOUNT FOR MEDS ALREADY IN ARRAY
  F  S RXIEN=$O(MEDS(RXIEN)) Q:RXIEN="B"  D  ; FOR EACH MEDICATION IN THE LIST
  . I $$GET1^DIQ(52.41,RXIEN,2,"I")="RF" QUIT  ; Dont' want refill request as a "pending" order
@@ -54,8 +56,10 @@
  . I DEBUG W "RXIEN IS ",RXIEN,!
  . S MAP=$NA(^TMP("GPLCCR",$J,"MEDMAP",MEDCOUNT))
- . K @MAP
+ . ; K @MAP DON'T KILL MAP HERE, IT IS DONE IN CCRMEDS
+ . S @MEDMAP@(0)=@MEDMAP@(0)+1 ; INCREMENT TOTAL MEDS IN VAR ARRAY
  . I DEBUG W "MAP= ",MAP,!
  . N MED M MED=MEDS(RXIEN) ; PULL OUT MEDICATION FROM
- . S @MAP@("MEDOBJECTID")="MED_PENDING"_MED(.01) ;Pending IEN
+ . S @MAP@("MEDOBJECTID")="MED_PENDING"_MEDCOUNT ; MEDCOUNT FOR ID
+ . ; S @MAP@("MEDOBJECTID")="MED_PENDING"_MED(.01) ;Pending IEN
  . S @MAP@("MEDISSUEDATETXT")="Issue Date"
  . ; Field 6 is "Effective date", and we pull it in timson format w/ I