diff --git a/p/CCRMEDS3.m b/p/CCRMEDS3.m index 94a6d55..d4bc039 100644 --- a/p/CCRMEDS3.m +++ b/p/CCRMEDS3.m @@ -47,7 +47,7 @@ EXTRACT(MINXML,DFN,OUTXML) ; EXTRACT MEDICATIONS INTO PROVIDED XML TEM ; I DEBUG ZWR MEDS N FDAIEN S FDAIEN=0 ; For use in $Order in the MEDS array. - S MEDMAP=$NA(^TMP("GPLCCR",$J,"MEDMAP")) + S MEDMAP=$NA(^TMP("GPLCCR",$J,"MEDMAP")) N MEDCOUNT S MEDCOUNT=@MEDMAP@(0) ; We already have meds in the array F S FDAIEN=$O(MEDS(FDAIEN)) Q:RXIEN="" D ; FOR EACH MEDICATION IN THE LIST . N MED M MED=MEDS(FDAIEN) @@ -83,7 +83,7 @@ EXTRACT(MINXML,DFN,OUTXML) ; EXTRACT MEDICATIONS INTO PROVIDED XML TEM . I $L(MEDIEN) D DOSE^PSS50(MEDIEN,,,,,"DOSE") . I $L(MEDIEN) N DOSEDATA M DOSEDATA=^TMP($J,"DOSE",MEDIEN) . S @MAP@("MEDSTRENGTHVALUE")=$S($L(MEDIEN):DOSEDATA(901),1:"") - . S @MAP@("MEDSTRENGTHUNIT")=$S($P(DOSEDATA(902),U,2),1:"") + . ; S @MAP@("MEDSTRENGTHUNIT")=$S($P(DOSEDATA(902),U,2),1:"") SAM PLEASE FIX . ; Units, concentration, etc, come from another call . ; $$CPRS^PSNAPIS which returns dosage-form^va class^strengh^unit . ; This call takes nodes 1 and 3 of ^PSDRUG(D0,"ND") as parameters @@ -126,9 +126,9 @@ EXTRACT(MINXML,DFN,OUTXML) ; EXTRACT MEDICATIONS INTO PROVIDED XML TEM . S @MAP@("M","DIRECTIONS",1,"MEDDELIVERYMETHOD")="" . S @MAP@("M","DIRECTIONS",1,"MEDDOSEVALUE")="" . S @MAP@("M","DIRECTIONS",1,"MEDDOSEUNIT")="" - . S @MAP@("M","DIRECTIONS",1,"MEDRATEVALUE")="" - . S @MAP@("M","DIRECTIONS",1,"MEDRATEUNIT")="" - . S @MAP@("M","DIRECTIONS",1,"MEDVEHICLETEXT")="" + . S @MAP@("M","DIRECTIONS",1,"MEDRATEVALUE")="" + . S @MAP@("M","DIRECTIONS",1,"MEDRATEUNIT")="" + . S @MAP@("M","DIRECTIONS",1,"MEDVEHICLETEXT")="" . S @MAP@("M","DIRECTIONS",1,"MEDDIRECTIONROUTETEXT")="" . S @MAP@("M","DIRECTIONS",1,"MEDFREQUENCYVALUE")="" . S @MAP@("M","DIRECTIONS",1,"MEDINTERVALVALUE")="" @@ -143,7 +143,7 @@ EXTRACT(MINXML,DFN,OUTXML) ; EXTRACT MEDICATIONS INTO PROVIDED XML TEM . S @MAP@("M","DIRECTIONS",1,"MEDPROBLEMCODINGSYSTEM")="" . S @MAP@("M","DIRECTIONS",1,"MEDPROBLEMCODINGVERSION")="" . S @MAP@("M","DIRECTIONS",1,"MEDPROBLEMSOURCEACTORID")="" - . S @MAP@("M","DIRECTIONS",1,"MEDSTOPINDICATOR")="" + . S @MAP@("M","DIRECTIONS",1,"MEDSTOPINDICATOR")="" . S @MAP@("M","DIRECTIONS",1,"MEDDIRSEQ")="" . S @MAP@("M","DIRECTIONS",1,"MEDMULDIRMOD")="" . ;