iSharkFly-Open
/
VistA-ccr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tiny corrections: Change @@PROBLEM@@ in meds section to @@MEDPROBLEMTYPETXT@@

This commit is contained in:
sam 2008-09-22 02:37:13 +00:00
parent d8b6612b03
commit 07405275b2
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
p/CCRMEDS.m
View File

@ -84,6 +84,8 @@ EXTRACT(INXML,DFN,OUTXML) ; EXTRACT MEDICATIONS INTO PROVIDED XML TEMPLATE
. N NDFIEN S NDFIEN=$P(NDFDATA(20),U) . N NDFIEN S NDFIEN=$P(NDFDATA(20),U)
. N VAPROD S VAPROD=$P(NDFDATA(22),U) . N VAPROD S VAPROD=$P(NDFDATA(22),U)
. N CONCDATA . 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="" . I NDFIEN="" S CONCDATA=""
. E S CONCDATA=$$CPRS^PSNAPIS(NDFIEN,VAPROD) . E S CONCDATA=$$CPRS^PSNAPIS(NDFIEN,VAPROD)
. S @MAP@("MEDFORMTEXT")=$P(CONCDATA,U,1) . S @MAP@("MEDFORMTEXT")=$P(CONCDATA,U,1)
@ -142,6 +144,7 @@ EXTRACT(INXML,DFN,OUTXML) ; EXTRACT MEDICATIONS INTO PROVIDED XML TEMPLATE
. S @MAP@("MEDDURATIONUNIT")="" . S @MAP@("MEDDURATIONUNIT")=""
. S @MAP@("MEDPRNFLAG")=$P(SIGDATA,U,8)["PRN" . S @MAP@("MEDPRNFLAG")=$P(SIGDATA,U,8)["PRN"
. S @MAP@("MEDPROBLEMOBJECTID")="" . S @MAP@("MEDPROBLEMOBJECTID")=""
. S @MAP@("MEDPROBLEMTYPETXT")=""
. S @MAP@("MEDPROBLEMDESCRIPTION")="" . S @MAP@("MEDPROBLEMDESCRIPTION")=""
. S @MAP@("MEDPROBLEMCODEVALUE")="" . S @MAP@("MEDPROBLEMCODEVALUE")=""
. S @MAP@("MEDPROBLEMCODINGSYSTEM")="" . S @MAP@("MEDPROBLEMCODINGSYSTEM")=""

2
p/GPLCCR0.m
View File

@ -385,7 +385,7 @@ LOAD(ARY) ; LOAD A CCR TEMPLATE INTO ARY PASSED BY NAME
;;<Problem> ;;<Problem>
;;<CCRDataObjectID>@@MEDPROBLEMOBJECTID@@</CCRDataObjectID> ;;<CCRDataObjectID>@@MEDPROBLEMOBJECTID@@</CCRDataObjectID>
;;<Type> ;;<Type>
;;<Text>@@PROBLEM@@</Text> ;;<Text>@@MEDPROBLEMTYPETXT@@</Text>
;;</Type> ;;</Type>
;;<Description> ;;<Description>
;;<Text>@@MEDPROBLEMDESCRIPTION@@</Text> ;;<Text>@@MEDPROBLEMDESCRIPTION@@</Text>