Index: /ccr/trunk/p/CCRMEDS.m =================================================================== --- /ccr/trunk/p/CCRMEDS.m (revision 165) +++ /ccr/trunk/p/CCRMEDS.m (revision 166) @@ -1,177 +1,177 @@ -CCRMEDS ; WV/CCDCCR/SMH - CCR/CCD PROCESSING FOR MEDICATIONS ;08/24/08 - ;;0.1;CCDCCR;;JUL 16,2008; - ; Copyright 2008 WorldVistA. Licensed under the terms of the GNU - ; General Public License See attached copy of the License. - ; - ; This program is free software; you can redistribute it and/or modify - ; it under the terms of the GNU General Public License as published by - ; the Free Software Foundation; either version 2 of the License, or - ; (at your option) any later version. - ; - ; This program is distributed in the hope that it will be useful, - ; but WITHOUT ANY WARRANTY; without even the implied warranty of - ; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - ; GNU General Public License for more details. - ; - ; You should have received a copy of the GNU General Public License along - ; with this program; if not, write to the Free Software Foundation, Inc., - ; 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - ; - W "NO ENTRY FROM TOP",! - Q - ; -EXTRACT(MINXML,DFN,OUTXML) ; EXTRACT MEDICATIONS INTO PROVIDED XML TEMPLATE - ; - ; INXML AND OUTXML ARE PASSED BY NAME SO GLOBALS CAN BE USED - ; INXML WILL CONTAIN ONLY THE MEDICATIONS SECTION OF THE OVERALL TEMPLATE - ; - ; MEDS is return array from RPC. - ; MAP is a mapping variable map (store result) for each med - ; MED is holds each array element from MEDS(J), one medicine - ; J is a counter. - ; - ; RX^PSO52API is a Pharmacy Re-Enginnering (PRE) API to get all - ; med data available. - ; http://www.va.gov/vdl/documents/Clinical/Pharm-Outpatient_Pharmacy/phar_1_api_r0807.pdf - ; Output of API is ^TMP($J,"SUBSCRIPT",DFN,RXIENS). - ; D PARY^GPLXPATH(MINXML) - N MEDS,MAP - K ^TMP($J) - D RX^PSO52API(DFN,"CCDCCR") - M MEDS=^TMP($J,"CCDCCR",DFN) - ; @(0) contains the number of meds or -1^NO DATA FOUND - ; If it is -1, we quit. - I $P(MEDS(0),U)=-1 S @OUTXML@(0)=0 QUIT - I DEBUG ZWR MEDS - N RXIEN S RXIEN=0 - N MEDCOUNT S MEDCOUNT=0 - 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")) - . K @MAP - . 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@("MEDISSUEDATETXT")="Issue Date" - . S @MAP@("MEDISSUEDATE")=$$FMDTOUTC^CCRUTIL($P(MED(1),U)) - . S @MAP@("MEDLASTFILLDATETXT")="Last Fill Date" - . S @MAP@("MEDLASTFILLDATE")=$$FMDTOUTC^CCRUTIL($P(MED(101),U)) - . S @MAP@("MEDRXNOTXT")="Prescription Number" - . S @MAP@("MEDRXNO")=MED(.01) - . S @MAP@("MEDTYPETEXT")="Medication" - . S @MAP@("MEDDETAILUNADORNED")="" ; Leave blank, field has its uses - . S @MAP@("MEDSTATUSTEXT")=$P(MED(100),U,2) - . S @MAP@("MEDSOURCEACTORID")="ACTORPROVIDER_"_$P(MED(4),U) - . S @MAP@("MEDPRODUCTNAMETEXT")=$P(MED(6),U,2) - . S @MAP@("MEDPRODUCTNAMECODEVALUE")=MED(27) - . S @MAP@("MEDPRODUCTNAMECODINGINGSYSTEM")="NDC" - . S @MAP@("MEDPRODUCTNAMECODEVERSION")="none" - . S @MAP@("MEDBRANDNAMETEXT")=MED(6.5) - . N MEDIEN S MEDIEN=$P(MED(6),U) - . D DOSE^PSS50(MEDIEN,,,,,"DOSE") - . N DOSEDATA M DOSEDATA=^TMP($J,"DOSE",MEDIEN) - . S @MAP@("MEDSTRENGTHVALUE")=DOSEDATA(901) - . S @MAP@("MEDSTRENGTHUNIT")=$P(DOSEDATA(902),U,2) - . ; 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 - . ; NDF Entry IEN, and VA Product Name - . ; These can be obtained using NDF^PSS50 (IEN,,,,,"SUBSCRIPT") - . ; Documented in the same manual. - . D NDF^PSS50(MEDIEN,,,,,"CONC") - . N NDFDATA M NDFDATA=^TMP($J,"CONC",MEDIEN) - . N NDFIEN S NDFIEN=$P(NDFDATA(20),U) - . N VAPROD S VAPROD=$P(NDFDATA(22),U) - . N CONCDATA - . ; If a drug was not matched to NDF, then the NDFIEN is gonna be "" - . ; and this will crash the call. So... - . I NDFIEN="" S CONCDATA="" - . E S CONCDATA=$$CPRS^PSNAPIS(NDFIEN,VAPROD) - . S @MAP@("MEDFORMTEXT")=$P(CONCDATA,U,1) - . S @MAP@("MEDCONCVALUE")=$P(CONCDATA,U,3) - . S @MAP@("MEDCONCUNIT")=$P(CONCDATA,U,4) - . S @MAP@("MEDSIZETEXT")=$P(NDFDATA(23),U,2)_" "_$P(NDFDATA(24),U,2) - . S @MAP@("MEDQUANTITYVALUE")=MED(7) - . ; Oddly, there is no easy place to find the dispense unit. - . ; It's not included in the original call, so we have to go to the drug file. - . ; That would be DATA^PSS50(IEN,,,,,"SUBSCRIPT") - . ; Node 14.5 is the Dispense Unit - . D DATA^PSS50(MEDIEN,,,,,"QTY") - . N QTYDATA M QTYDATA=^TMP($J,"QTY",MEDIEN) - . S @MAP@("MEDQUANTITYUNIT")=QTYDATA(14.5) - . ; - . ; --- START OF DIRECTIONS --- - . ; - . S @MAP@("MEDDIRECTIONDESCRIPTIONTEXT")="" ; This is reserved for systems not able to generate the sig in components. - . S @MAP@("MEDDOSEINDICATOR")="1" ; means that we are specifying it. See E2369-05. - . ; Sig data not in any API :-( Oh yes, you can get the whole thing, but... - . ; we want the compoenents. - . ; It's in node 6 of ^PSRX(IEN) - . ; So, here we go again - . ; ^PSRX(D0,6,D1,0)= (#.01) DOSAGE ORDERED [1F] ^ (#1) DISPENSE UNITS PER DOSE - . ; ==>[2N] ^ (#2) UNITS [3P:50.607] ^ (#3) NOUN [4F] ^ (#4) - . ; ==>DURATION [5F] ^ (#5) CONJUNCTION [6S] ^ (#6) ROUTE - . ; ==>[7P:51.2] ^ (#7) SCHEDULE [8F] ^ (#8) VERB [9F] ^ - . N SIGDATA S SIGDATA=^PSRX(RXIEN,6,1,0) - . S @MAP@("MEDDELIVERYMETHOD")=$P(SIGDATA,U,9) - . S @MAP@("MEDDOSEVALUE")=$P(SIGDATA,U,1) - . S @MAP@("MEDDOSEUNIT")=@MAP@("MEDCONCUNIT") - . S @MAP@("MEDRATEVALUE")="" ; For inpatient - . S @MAP@("MEDRATEUNIT")="" ; For inpatient - . S @MAP@("MEDVEHICLETEXT")="" ; For inpatient - . S @MAP@("MEDDIRECTIONROUTETEXT")=$$GET1^DIQ(51.2,$P(SIGDATA,U,7),.01) - . S @MAP@("MEDFREQUENCYVALUE")=$P(SIGDATA,U,8) - . ; Invervals... again another call. - . ; In the wisdom of the original programmers, the schedule is a free text field - . ; However, it gets translated by a call to the administration schedule file - . ; to see if that schedule exists. - . ; That's the same thing I am going to do. - . ; The call is AP^PSS51P1(PSSPP,PSSFT,PSSWDIEN,PSSSTPY,LIST,PSSFREQ). - . ; PSSPP is "PSJ" (for some reason, schedules are stored as PSJ, not PSO-- - . ; I looked), PSSFT is the name, and list is the ^TMP name to store the data in. - . ; So... - . D AP^PSS51P1("PSJ",$P(SIGDATA,U,8),,,"SCHEDULE") - . N SCHEDATA M SCHEDATA=^TMP($J,"SCHEDULE") - . N INTERVAL - . I $P(SCHEDATA(0),U)=-1 S INTERVAL="" - . E D - . . N SUB S SUB=$O(SCHEDATA(0)) - . . S INTERVAL=SCHEDATA(SUB,2) - . S @MAP@("MEDINTERVALVALUE")=INTERVAL - . S @MAP@("MEDINTERVALUNIT")="Minute" - . S @MAP@("MEDDURATIONVALUE")=$P(SIGDATA,U,5) - . S @MAP@("MEDDURATIONUNIT")="" - . S @MAP@("MEDPRNFLAG")=$P(SIGDATA,U,8)["PRN" - . S @MAP@("MEDPROBLEMOBJECTID")="" - . S @MAP@("MEDPROBLEMTYPETXT")="" - . S @MAP@("MEDPROBLEMDESCRIPTION")="" - . S @MAP@("MEDPROBLEMCODEVALUE")="" - . S @MAP@("MEDPROBLEMCODINGSYSTEM")="" - . S @MAP@("MEDPROBLEMCODINGVERSION")="" - . S @MAP@("MEDPROBLEMSOURCEACTORID")="" - . S @MAP@("MEDSTOPINDICATOR")="" - . S @MAP@("MEDDIRSEQ")="" - . S @MAP@("MEDMULDIRMOD")="" - . ; - . ; --- END OF DIRECTIONS --- - . ; - . ; ^PSRX(22,"INS1",1,0)="FOR BLOOD PRESSURE" - . S @MAP@("MEDPTINSTRUCTIONS")=$G(^PSRX(RXIEN,"INS1",1,0)) - . ; ^PSRX(22,"PRC",1,0)="Pharmacist: you must obey my command" - . S @MAP@("MEDFULLFILLMENTINSTRUCTIONS")=$G(^PSRX(RXIEN,"PRC",1,0)) - . S @MAP@("MEDRFNO")=MED(9) - . N RESULT S RESULT=$NA(^TMP("GPLCCR",$J,"RESULT")) - . K @RESULT - . ; D MAP^GPLXPATH($NA(INXML),MAP,RESULT) - . D MAP^GPLXPATH(MINXML,MAP,RESULT) - . ; D PARY^GPLXPATH(RESULT) - . D:MEDCOUNT=1 CP^GPLXPATH(RESULT,OUTXML) ; First one is a copy - . D:MEDCOUNT>1 INSINNER^GPLXPATH(OUTXML,RESULT) ; AFTER THE FIRST, INSERT INNER XML - N MEDTMP,MEDI - D MISSING^GPLXPATH(OUTXML,"MEDTMP") ; SEARCH XML FOR MISSING VARS - I MEDTMP(0)>0 D ; IF THERE ARE MISSING VARS - MARKED AS @@X@@ - . W "MEDICATION MISSING ",! - . F MEDI=1:1:MEDTMP(0) W MEDTMP(MEDI),! - Q - ; +CCRMEDS ; WV/CCDCCR/SMH - CCR/CCD PROCESSING FOR MEDICATIONS ;08/24/08 + ;;0.1;CCDCCR;;JUL 16,2008; + ; Copyright 2008 WorldVistA. Licensed under the terms of the GNU + ; General Public License See attached copy of the License. + ; + ; This program is free software; you can redistribute it and/or modify + ; it under the terms of the GNU General Public License as published by + ; the Free Software Foundation; either version 2 of the License, or + ; (at your option) any later version. + ; + ; This program is distributed in the hope that it will be useful, + ; but WITHOUT ANY WARRANTY; without even the implied warranty of + ; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + ; GNU General Public License for more details. + ; + ; You should have received a copy of the GNU General Public License along + ; with this program; if not, write to the Free Software Foundation, Inc., + ; 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + ; + W "NO ENTRY FROM TOP",! + Q + ; +EXTRACT(MINXML,DFN,OUTXML) ; EXTRACT MEDICATIONS INTO PROVIDED XML TEMPLATE + ; + ; INXML AND OUTXML ARE PASSED BY NAME SO GLOBALS CAN BE USED + ; INXML WILL CONTAIN ONLY THE MEDICATIONS SECTION OF THE OVERALL TEMPLATE + ; + ; MEDS is return array from RPC. + ; MAP is a mapping variable map (store result) for each med + ; MED is holds each array element from MEDS(J), one medicine + ; J is a counter. + ; + ; RX^PSO52API is a Pharmacy Re-Enginnering (PRE) API to get all + ; med data available. + ; http://www.va.gov/vdl/documents/Clinical/Pharm-Outpatient_Pharmacy/phar_1_api_r0807.pdf + ; Output of API is ^TMP($J,"SUBSCRIPT",DFN,RXIENS). + ; D PARY^GPLXPATH(MINXML) + N MEDS,MAP + K ^TMP($J) + D RX^PSO52API(DFN,"CCDCCR") + M MEDS=^TMP($J,"CCDCCR",DFN) + ; @(0) contains the number of meds or -1^NO DATA FOUND + ; If it is -1, we quit. + I $P(MEDS(0),U)=-1 S @OUTXML@(0)=0 QUIT + I DEBUG ZWR MEDS + N RXIEN S RXIEN=0 + N MEDCOUNT S MEDCOUNT=0 + 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 + . 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@("MEDISSUEDATETXT")="Issue Date" + . S @MAP@("MEDISSUEDATE")=$$FMDTOUTC^CCRUTIL($P(MED(1),U)) + . S @MAP@("MEDLASTFILLDATETXT")="Last Fill Date" + . S @MAP@("MEDLASTFILLDATE")=$$FMDTOUTC^CCRUTIL($P(MED(101),U)) + . S @MAP@("MEDRXNOTXT")="Prescription Number" + . S @MAP@("MEDRXNO")=MED(.01) + . S @MAP@("MEDTYPETEXT")="Medication" + . S @MAP@("MEDDETAILUNADORNED")="" ; Leave blank, field has its uses + . S @MAP@("MEDSTATUSTEXT")=$P(MED(100),U,2) + . S @MAP@("MEDSOURCEACTORID")="ACTORPROVIDER_"_$P(MED(4),U) + . S @MAP@("MEDPRODUCTNAMETEXT")=$P(MED(6),U,2) + . S @MAP@("MEDPRODUCTNAMECODEVALUE")=MED(27) + . S @MAP@("MEDPRODUCTNAMECODINGINGSYSTEM")="NDC" + . S @MAP@("MEDPRODUCTNAMECODEVERSION")="none" + . S @MAP@("MEDBRANDNAMETEXT")=MED(6.5) + . N MEDIEN S MEDIEN=$P(MED(6),U) + . D DOSE^PSS50(MEDIEN,,,,,"DOSE") + . N DOSEDATA M DOSEDATA=^TMP($J,"DOSE",MEDIEN) + . S @MAP@("MEDSTRENGTHVALUE")=DOSEDATA(901) + . S @MAP@("MEDSTRENGTHUNIT")=$P(DOSEDATA(902),U,2) + . ; 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 + . ; NDF Entry IEN, and VA Product Name + . ; These can be obtained using NDF^PSS50 (IEN,,,,,"SUBSCRIPT") + . ; Documented in the same manual. + . D NDF^PSS50(MEDIEN,,,,,"CONC") + . N NDFDATA M NDFDATA=^TMP($J,"CONC",MEDIEN) + . N NDFIEN S NDFIEN=$P(NDFDATA(20),U) + . N VAPROD S VAPROD=$P(NDFDATA(22),U) + . N CONCDATA + . ; If a drug was not matched to NDF, then the NDFIEN is gonna be "" + . ; and this will crash the call. So... + . I NDFIEN="" S CONCDATA="" + . E S CONCDATA=$$CPRS^PSNAPIS(NDFIEN,VAPROD) + . S @MAP@("MEDFORMTEXT")=$P(CONCDATA,U,1) + . S @MAP@("MEDCONCVALUE")=$P(CONCDATA,U,3) + . S @MAP@("MEDCONCUNIT")=$P(CONCDATA,U,4) + . S @MAP@("MEDSIZETEXT")=$P(NDFDATA(23),U,2)_" "_$P(NDFDATA(24),U,2) + . S @MAP@("MEDQUANTITYVALUE")=MED(7) + . ; Oddly, there is no easy place to find the dispense unit. + . ; It's not included in the original call, so we have to go to the drug file. + . ; That would be DATA^PSS50(IEN,,,,,"SUBSCRIPT") + . ; Node 14.5 is the Dispense Unit + . D DATA^PSS50(MEDIEN,,,,,"QTY") + . N QTYDATA M QTYDATA=^TMP($J,"QTY",MEDIEN) + . S @MAP@("MEDQUANTITYUNIT")=QTYDATA(14.5) + . ; + . ; --- START OF DIRECTIONS --- + . ; + . S @MAP@("MEDDIRECTIONDESCRIPTIONTEXT")="" ; This is reserved for systems not able to generate the sig in components. + . S @MAP@("MEDDOSEINDICATOR")="1" ; means that we are specifying it. See E2369-05. + . ; Sig data not in any API :-( Oh yes, you can get the whole thing, but... + . ; we want the compoenents. + . ; It's in node 6 of ^PSRX(IEN) + . ; So, here we go again + . ; ^PSRX(D0,6,D1,0)= (#.01) DOSAGE ORDERED [1F] ^ (#1) DISPENSE UNITS PER DOSE + . ; ==>[2N] ^ (#2) UNITS [3P:50.607] ^ (#3) NOUN [4F] ^ (#4) + . ; ==>DURATION [5F] ^ (#5) CONJUNCTION [6S] ^ (#6) ROUTE + . ; ==>[7P:51.2] ^ (#7) SCHEDULE [8F] ^ (#8) VERB [9F] ^ + . N SIGDATA S SIGDATA=^PSRX(RXIEN,6,1,0) + . S @MAP@("MEDDELIVERYMETHOD")=$P(SIGDATA,U,9) + . S @MAP@("MEDDOSEVALUE")=$P(SIGDATA,U,1) + . S @MAP@("MEDDOSEUNIT")=@MAP@("MEDCONCUNIT") + . S @MAP@("MEDRATEVALUE")="" ; For inpatient + . S @MAP@("MEDRATEUNIT")="" ; For inpatient + . S @MAP@("MEDVEHICLETEXT")="" ; For inpatient + . S @MAP@("MEDDIRECTIONROUTETEXT")=$$GET1^DIQ(51.2,$P(SIGDATA,U,7),.01) + . S @MAP@("MEDFREQUENCYVALUE")=$P(SIGDATA,U,8) + . ; Invervals... again another call. + . ; In the wisdom of the original programmers, the schedule is a free text field + . ; However, it gets translated by a call to the administration schedule file + . ; to see if that schedule exists. + . ; That's the same thing I am going to do. + . ; The call is AP^PSS51P1(PSSPP,PSSFT,PSSWDIEN,PSSSTPY,LIST,PSSFREQ). + . ; PSSPP is "PSJ" (for some reason, schedules are stored as PSJ, not PSO-- + . ; I looked), PSSFT is the name, and list is the ^TMP name to store the data in. + . ; So... + . D AP^PSS51P1("PSJ",$P(SIGDATA,U,8),,,"SCHEDULE") + . N SCHEDATA M SCHEDATA=^TMP($J,"SCHEDULE") + . N INTERVAL + . I $P(SCHEDATA(0),U)=-1 S INTERVAL="" + . E D + . . N SUB S SUB=$O(SCHEDATA(0)) + . . S INTERVAL=SCHEDATA(SUB,2) + . S @MAP@("MEDINTERVALVALUE")=INTERVAL + . S @MAP@("MEDINTERVALUNIT")="Minute" + . S @MAP@("MEDDURATIONVALUE")=$P(SIGDATA,U,5) + . S @MAP@("MEDDURATIONUNIT")="" + . S @MAP@("MEDPRNFLAG")=$P(SIGDATA,U,8)["PRN" + . S @MAP@("MEDPROBLEMOBJECTID")="" + . S @MAP@("MEDPROBLEMTYPETXT")="" + . S @MAP@("MEDPROBLEMDESCRIPTION")="" + . S @MAP@("MEDPROBLEMCODEVALUE")="" + . S @MAP@("MEDPROBLEMCODINGSYSTEM")="" + . S @MAP@("MEDPROBLEMCODINGVERSION")="" + . S @MAP@("MEDPROBLEMSOURCEACTORID")="" + . S @MAP@("MEDSTOPINDICATOR")="" + . S @MAP@("MEDDIRSEQ")="" + . S @MAP@("MEDMULDIRMOD")="" + . ; + . ; --- END OF DIRECTIONS --- + . ; + . ; ^PSRX(22,"INS1",1,0)="FOR BLOOD PRESSURE" + . S @MAP@("MEDPTINSTRUCTIONS")=$G(^PSRX(RXIEN,"INS1",1,0)) + . ; ^PSRX(22,"PRC",1,0)="Pharmacist: you must obey my command" + . S @MAP@("MEDFULLFILLMENTINSTRUCTIONS")=$G(^PSRX(RXIEN,"PRC",1,0)) + . S @MAP@("MEDRFNO")=MED(9) + . N RESULT S RESULT=$NA(^TMP("GPLCCR",$J,"RESULT")) + . K @RESULT + . ; D MAP^GPLXPATH($NA(INXML),MAP,RESULT) + . D MAP^GPLXPATH(MINXML,MAP,RESULT) + . ; D PARY^GPLXPATH(RESULT) + . D:MEDCOUNT=1 CP^GPLXPATH(RESULT,OUTXML) ; First one is a copy + . D:MEDCOUNT>1 INSINNER^GPLXPATH(OUTXML,RESULT) ; AFTER THE FIRST, INSERT INNER XML + N MEDTMP,MEDI + D MISSING^GPLXPATH(OUTXML,"MEDTMP") ; SEARCH XML FOR MISSING VARS + I MEDTMP(0)>0 D ; IF THERE ARE MISSING VARS - MARKED AS @@X@@ + . W "MEDICATION MISSING ",! + . F MEDI=1:1:MEDTMP(0) W MEDTMP(MEDI),! + Q + ; Index: /ccr/trunk/p/GPLMEDS.m =================================================================== --- /ccr/trunk/p/GPLMEDS.m (revision 165) +++ /ccr/trunk/p/GPLMEDS.m (revision 166) @@ -81,5 +81,5 @@ . S @MEDVMAP@("MEDPRNFLAG")="" . S @MEDVMAP@("MEDPROBLEMOBJECTID")="" - . S @MEDVMAP@("PROBLEM")="" + . S @MEDVMAP@("MEDPROBLEMTYPETXT")="" . S @MEDVMAP@("MEDPROBLEMDESCRIPTION")="" . S @MEDVMAP@("MEDPROBLEMCODEVALUE")="" Index: /ccr/trunk/p/GPLRIMA.m =================================================================== --- /ccr/trunk/p/GPLRIMA.m (revision 165) +++ /ccr/trunk/p/GPLRIMA.m (revision 166) @@ -64,5 +64,5 @@ . . M @RIMBASE@("VARS",RIMDFN,"VITALS")=^TMP("GPLCCR",$J,"VITALS") . I $D(^TMP("GPLCCR",$J,"MEDMAP",1)) D ; MEDS VARS EXISTS - . . M @RIMBASE@("VARS",RIMDFN,"MEDS")=^TMP("GPLCCR",$J,"MEDICATIONS") + . . M @RIMBASE@("VARS",RIMDFN,"MEDS")=^TMP("GPLCCR",$J,"MEDMAP") . K ^TMP("GPLCCR",$J) ; KILL WORK AREA FOR CCR BUILDING . ; @@ -404,4 +404,5 @@ N GTMP D ANALYZE(DFN,1) ; REFRESH THE RIM VARIABLES + I '$D(IWHICH) S IWHICH="ALL" D RPCGV(.GTMP,DFN,IWHICH) D PARY^GPLXPATH("GTMP")