Changeset 106 for ccr/trunk

Timestamp:

Aug 28, 2008, 11:53:50 AM (16 years ago)

Author:

George Lilly

Message:

fixed variable displays for Meds RPC interface

File:

• ccr/trunk/p/GPLMEDS.m (modified) (2 diffs)

ccr/trunk/p/GPLMEDS.m

@@ -42 +42 @@
    . I DEBUG W "VMAP= ",MEDVMAP,!
    . S MEDPTMP=MEDRSLT(J) ; PULL OUT MEDICATION FROM RPC RETURN ARRAY
-   . S @MEDVMAP@("MEDICATIONOBJECTID")="MED"_J ; UNIQUE OBJID FOR MEDS
+   . S @MEDVMAP@("MEDOBJECTID")="MED"_J ; UNIQUE OBJID FOR MEDS
    . ; PROCESSING FOR MEDS GOES HERE
    . S @MEDVMAP@("MEDISSUEDATETXT")=$$FMDTOUTC^CCRUTIL($P(MEDPTMP,"^",11),"DT") ; GETS LAST FILL DATE
-   . S @MEDVMAP@("MEDICATIONDATETIMEAGE")=""
-   . S @MEDVMAP@("MEDICATIONDATETIMEAGEUNITS")=""
+   . S @MEDVMAP@("MEDDATETIMEAGE")=""
+   . S @MEDVMAP@("MEDDATETIMEAGEUNITS")=""
    . S @MEDVMAP@("MEDTYPETEXT")="Medication"
    . S @MEDVMAP@("MEDSTATUSTEXT")=$P(MEDPTMP,"^",10) ; STATUS FROM RPC
    . S @MEDVMAP@("MEDSOURCEACTORID")="ACTORSYSTEM_1"
    . S @MEDVMAP@("MEDPRODUCTNAMETEXT")=$P(MEDPTMP,"^",3)
-   . S @MEDVMAP@("MEDICATIONPRODUCTNAMECODEVALUE")=""
-   . S @MEDVMAP@("MEDICATIONPRODUCTNAMECODINGINGSYSTEM")=""
-   . S @MEDVMAP@("MEDICATIONPRODUCTNAMECODEVERSION")=""
+   . S @MEDVMAP@("MEDPRODUCTNAMECODEVALUE")=""
+   . S @MEDVMAP@("MEDPRODUCTNAMECODINGINGSYSTEM")=""
+   . S @MEDVMAP@("MEDPRODUCTNAMECODEVERSION")=""
    . S @MEDVMAP@("MEDBRANDNAMETEXT")=""
-   . S @MEDVMAP@("MEDICATIONBRANDNAMECODEVALUE")=""
-   . S @MEDVMAP@("MEDICATIONBRANDNAMECODINGSYSTEM")=""
-   . S @MEDVMAP@("MEDICATIONBRANDNAMECODEVERSION")=""
+   . S @MEDVMAP@("MEDBRANDNAMECODEVALUE")=""
+   . S @MEDVMAP@("MEDBRANDNAMECODINGSYSTEM")=""
+   . S @MEDVMAP@("MEDBRANDNAMECODEVERSION")=""
    . S @MEDVMAP@("MEDSTRENGTHVALUE")=""
    . S @MEDVMAP@("MEDSTRENGTHUNIT")=""
@@ -65 +65 @@
    . S @MEDVMAP@("MEDRFNO")=""
    . I $D(MEDRSLT(J+1)) D  ; IF SECOND LINE EXISTS
-   . . S @MEDVMAP@("MEDICATIONDESCRIPTIONTEXT")=$P(MEDRSLT(J+1)," *",2)
+   . . S @MEDVMAP@("MEDDESCRIPTIONTEXT")=$P(MEDRSLT(J+1)," *",2)
    . I $D(MEDRSLT(J+2)) D  ; IF THIRD LINE EXISTS
    . . S @MEDVMAP@("MEDDIRECTIONDESCRIPTIONTEXT")=$P(MEDRSLT(J+2),"\ Sig: ",2)
-   . S @MEDVMAP@("MEDICATIONDIRECTIONDOSEVALUE")=""
-   . S @MEDVMAP@("MEDICATIONDIRECTIONROUTETEXT")=""
-   . S @MEDVMAP@("MEDICATIONDIRECTIONFREQUENCYVALUE")=""
+   . S @MEDVMAP@("MEDDIRECTIONDOSEVALUE")=""
+   . S @MEDVMAP@("MEDDIRECTIONROUTETEXT")=""
+   . S @MEDVMAP@("MEDDIRECTIONFREQUENCYVALUE")=""
    . S MEDARYTMP=$NA(@MEDTARYTMP@(J))
    . K @MEDARYTMP