Index: ccr/trunk/p/C0CMED6.m
===================================================================
--- ccr/trunk/p/C0CMED6.m	(revision 685)
+++ ccr/trunk/p/C0CMED6.m	(revision 687)
@@ -1,3 +1,3 @@
-C0CMED6	; WV/CCDCCR/SMH - Meds from RPMS: Outpatient Meds;01/10/09
+C0CMED6 ; WV/CCDCCR/SMH - Meds from RPMS: Outpatient Meds;01/10/09
  ;;1.0;C0C;;May 19, 2009;
  ; Copyright 2008 WorldVistA.  Licensed under the terms of the GNU
@@ -21,8 +21,9 @@
  Q
  ;
-EXTRACT(MINXML,DFN,OUTXML,FLAGS)	 ; EXTRACT MEDICATIONS INTO PROVIDED XML TEMPLATE
+EXTRACT(MINXML,DFN,OUTXML,MEDCOUNT,FLAGS)  ; EXTRACT MEDICATIONS INTO PROVIDED XML TEMPLATE
  ;
  ; MINXML and OUTXML are passed by name so globals can be used
  ; MINXML will contain only the medications skeleton of the overall template
+ ; MEDCOUNT is a counter passed by Reference.
  ; FLAGS are: MEDALL(bool)^MEDLIMIT(int)^MEDACTIVE(bool)^MEDPENDING(bool)
  ; FLAGS are set-up in C0CMED.
@@ -41,10 +42,8 @@
  ; -- DAYS is passed by value (optional; if not passed defaults to 365)
  ; 
- ; Return:  
- ;    ~Type(1)^PharmID(2)^Drug(3)^InfRate(4)^StopDt(5)^RefRem(6)^
- ;    TotDose(7)^UnitDose(8)^OrderID(9)^Status(10)^LastFill(11)^
- ;    Days Supply(12)^Quantity(13)^Chronic(14)^Issued(15)^
- ;    Rx #(16)^Provider(17)^Status Reason(18)^DEA Handling(19)^
- ;    Pharmacy Site(20)
+ ; Return:
+ ; ~Type^PharmID^Drug^InfRate^StopDt^RefRem^TotDose^UnitDose^OrderID 
+ ; ^Status^LastFill^Chronic^Issued^Rx #^Provider^ 
+ ; Status Reason^DEA Handling
  ; 
  N MEDS,MEDS1,MAP
@@ -76,9 +75,9 @@
  . S @MAP@("MEDOBJECTID")="MED"_MEDCNT ; MEDCNT FOR ID
  . S @MAP@("MEDISSUEDATETXT")="Issue Date"
- . S @MAP@("MEDISSUEDATE")=$$FMDTOUTC^C0CUTIL($P(MEDS(MEDCNT),U,15))
+ . S @MAP@("MEDISSUEDATE")=$$FMDTOUTC^C0CUTIL($P(MEDS(MEDCNT),U,15),"DT")
  . S @MAP@("MEDLASTFILLDATETXT")="Last Fill Date"
- . S @MAP@("MEDLASTFILLDATE")=$$FMDTOUTC^C0CUTIL($P(MEDS(MEDCNT),U,11))
+ . S @MAP@("MEDLASTFILLDATE")=$$FMDTOUTC^C0CUTIL($P(MEDS(MEDCNT),U,11),"DT")
  . S @MAP@("MEDRXNOTXT")="Prescription Number"
- . S @MAP@("MEDRXNO")=$P(MEDS(MEDCNT),U,16)
+ . S @MAP@("MEDRXNO")=$P(MEDS(MEDCNT),U,14)
  . S @MAP@("MEDTYPETEXT")="Medication"
  . S @MAP@("MEDDETAILUNADORNED")=""  ; Leave blank, field has its uses
@@ -299,4 +298,5 @@
  . D:MEDCNT=1 CP^C0CXPATH(RESULT,OUTXML) ; First one is a copy
  . D:MEDCNT>1 INSINNER^C0CXPATH(OUTXML,RESULT) ; AFTER THE FIRST, INSERT INNER XML
+ . S MEDCOUNT=MEDCNT
  N MEDTMP,MEDI
  D MISSING^C0CXPATH(OUTXML,"MEDTMP") ; SEARCH XML FOR MISSING VARS