Changeset 165 for ccr/trunk


Ignore:
Timestamp:
Sep 22, 2008, 12:25:53 AM (16 years ago)
Author:
George Lilly
Message:

fixes to CCRMEDS

Location:
ccr/trunk/p
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • ccr/trunk/p/CCRMEDS.m

    r164 r165  
    2121          Q
    2222          ;
    23 EXTRACT(INXML,DFN,OUTXML)       ; EXTRACT MEDICATIONS INTO PROVIDED XML TEMPLATE
     23EXTRACT(MINXML,DFN,OUTXML)      ; EXTRACT MEDICATIONS INTO PROVIDED XML TEMPLATE
    2424          ;
    2525          ; INXML AND OUTXML ARE PASSED BY NAME SO GLOBALS CAN BE USED
     
    3535          ; http://www.va.gov/vdl/documents/Clinical/Pharm-Outpatient_Pharmacy/phar_1_api_r0807.pdf
    3636          ; Output of API is ^TMP($J,"SUBSCRIPT",DFN,RXIENS).
    37        
     37          ; D PARY^GPLXPATH(MINXML)
    3838          N MEDS,MAP
    3939          K ^TMP($J)
     
    164164          . N RESULT S RESULT=$NA(^TMP("GPLCCR",$J,"RESULT"))
    165165          . K @RESULT
    166           . D MAP^GPLXPATH($NA(INXML),MAP,RESULT)
     166          . ; D MAP^GPLXPATH($NA(INXML),MAP,RESULT)
     167          . D MAP^GPLXPATH(MINXML,MAP,RESULT)
     168          . ; D PARY^GPLXPATH(RESULT)
    167169          . D:MEDCOUNT=1 CP^GPLXPATH(RESULT,OUTXML) ; First one is a copy
    168170          . D:MEDCOUNT>1 INSINNER^GPLXPATH(OUTXML,RESULT) ; AFTER THE FIRST, INSERT INNER XML
  • ccr/trunk/p/GPLCCR.m

    r159 r165  
    130130    D PUSH^GPLXPATH(TAB,"EXTRACT;GPLPROBS;//ContinuityOfCareRecord/Body/Problems;^TMP(""GPLCCR"",$J,DFN,""PROBLEMS"")")
    131131    I TESTMEDS D PUSH^GPLXPATH(TAB,"EXTRACT;CCRMEDS;//ContinuityOfCareRecord/Body/Medications;^TMP(""GPLCCR"",$J,DFN,""MEDICATIONS"")")
    132     E D PUSH^GPLXPATH(TAB,"EXTRACT;GPLMEDS;//ContinuityOfCareRecord/Body/Medications;^TMP(""GPLCCR"",$J,DFN,""MEDICATIONS"")")
     132    I 'TESTMEDS D PUSH^GPLXPATH(TAB,"EXTRACT;GPLMEDS;//ContinuityOfCareRecord/Body/Medications;^TMP(""GPLCCR"",$J,DFN,""MEDICATIONS"")")
    133133    D PUSH^GPLXPATH(TAB,"EXTRACT;GPLVITAL;//ContinuityOfCareRecord/Body/VitalSigns;^TMP(""GPLCCR"",$J,DFN,""VITALS"")")
    134134    I TESTLAB D PUSH^GPLXPATH(TAB,"EXTRACT;GPLLABS;//ContinuityOfCareRecord/Body/Results;^TMP(""GPLCCR"",$J,DFN,""RESULTS"")")
  • ccr/trunk/p/GPLMEDS.m

    r146 r165  
    3434   ; I DEBUG ZWR MEDRSLT
    3535   M GPLMEDS=MEDRSLT
    36    S MEDTVMAP=$NA(^TMP("GPLCCR",$J,"MEDICATIONS"))
     36   S MEDTVMAP=$NA(^TMP("GPLCCR",$J,"MEDMAP"))
    3737   S MEDTARYTMP=$NA(^TMP("GPLCCR",$J,"MEDARYTMP"))
    3838   K @MEDTVMAP,@MEDTARYTMP
  • ccr/trunk/p/GPLRIMA.m

    r160 r165  
    6363    . I $D(^TMP("GPLCCR",$J,"VITALS",1)) D  ; VITALS VARS EXISTS
    6464    . . M @RIMBASE@("VARS",RIMDFN,"VITALS")=^TMP("GPLCCR",$J,"VITALS")
    65     . I $D(^TMP("GPLCCR",$J,"MEDICATIONS",1)) D  ; MEDS VARS EXISTS
     65    . I $D(^TMP("GPLCCR",$J,"MEDMAP",1)) D  ; MEDS VARS EXISTS
    6666    . . M @RIMBASE@("VARS",RIMDFN,"MEDS")=^TMP("GPLCCR",$J,"MEDICATIONS")
    6767    . K ^TMP("GPLCCR",$J) ; KILL WORK AREA FOR CCR BUILDING
Note: See TracChangeset for help on using the changeset viewer.