Changeset 51 for ccr/trunk


Ignore:
Timestamp:
Jul 7, 2008, 9:51:27 AM (16 years ago)
Author:
Christopher Edwards
Message:

Added Providers to Vitals section
Fixed hanging : in CCRUTIL (thanks to Skip for more optimized code)
Fixed GPLCCR to write correct time

Location:
ccr/trunk/p
Files:
3 edited

Legend:

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

    r40 r51  
    2121          ; In this case, set H, MM and S to "00"
    2222          S:('$L(H)&'$L(MM)&'$L(S)) (H,MM,S)="00"
    23           I S="" S UTC=Y_"-"_M_"-"_D_"T"_H_":"_MM_OFF
    24           E  S UTC=Y_"-"_M_"-"_D_"T"_H_":"_MM_":"_S_OFF
     23          S UTC=Y_"-"_M_"-"_D_"T"_H_":"_MM_$S(S="":"",1:":"_S)_OFF ; Skip's code to fix hanging colon if no seconds
    2524          I $L($G(FORMAT)),FORMAT="DT" Q UTC ; Date with time.
    2625          E  Q $P(UTC,"T")
  • ccr/trunk/p/GPLCCR.m

    r50 r51  
    1313       S OARY=$NA(^TMP("GPLCCR",$J,DFN,"CCR",1))
    1414       S ONAM="PAT_"_DFN_"_CCR_V1.xml"
    15        S ODIR="/home/glilly/CCROUT"
    16        ;S ODIR="/home/cedwards/"
     15       ;S ODIR="/home/glilly/CCROUT"
     16       S ODIR="/home/cedwards/"
    1717           ;S ODIR="/opt/wv/p/"
    1818       D OUTPUT^GPLXPATH(OARY,ONAM,ODIR)
     
    8383    N VMAP S VMAP=$NA(^TMP("GPLCCR",$J,DFN,"HEADER"))
    8484    ; K @VMAP
    85     S @VMAP@("DATETIME")=$$FMDTOUTC^CCRUTIL($$FMTHL7^XLFDT($$NOW^XLFDT),"DT")
     85    S @VMAP@("DATETIME")=$$FMDTOUTC^CCRUTIL($$NOW^XLFDT,"DT")
    8686    I IHDR="" D  ; HEADER ARRAY IS NOT PROVIDED, USE DEFAULTS
    8787    . S @VMAP@("ACTORPATIENT")="ACTORPATIENT_"_DFN
  • ccr/trunk/p/GPLVITALS.m

    r50 r51  
    2222          . . . S @VITVMAP@("VITALSIGNSDATETIMETYPETEXT")="OBSERVED"
    2323          . . . S @VITVMAP@("VITALSIGNSEXACTDATETIME")=$$FMDTOUTC^CCRUTIL($P(VITPTMP,U,4),"DT")
    24           . . . W "CONVERTED DATE TIME: ",@VITVMAP@("VITALSIGNSEXACTDATETIME"),!
    2524          . . . S @VITVMAP@("VITALSIGNSDESCRIPTIONTEXT")="HEIGHT"
    26           . . . ;S @VITVMAP@("VITALSIGNSSOURCEACTORID")=""
     25          . . . S @VITVMAP@("VITALSIGNSSOURCEACTORID")="ACTORPROVIDER_"_$P(^GMR(120.5,$P(VITPTMP,U,1),0),U,6)
    2726          . . . S @VITVMAP@("VITALSIGNSTESTOBJECTID")="VITALTEST"_J
    2827          . . . S @VITVMAP@("VITALSIGNSTESTTYPETEXT")="OBSERVED"
     
    3130          . . . ;S @VITVMAP@("VITALSIGNSDESCRIPTIONCODINGSYSTEM")=""
    3231          . . . ;S @VITVMAP@("VITALSIGNSDESCRIPTIONCODEVERSION")=""
    33           . . . ;S @VITVMAP@("VITALSIGNSTESTSOURCEACTORID")=""
     32          . . . S @VITVMAP@("VITALSIGNSTESTSOURCEACTORID")="ACTORPROVIDER_"_$P(^GMR(120.5,$P(VITPTMP,U,1),0),U,6)
    3433          . . . S @VITVMAP@("VITALSIGNSTESTRESULTVALUE")=$P(VITPTMP,U,3)
    3534          . . . S @VITVMAP@("VITALSIGNSTESTRESULTUNIT")="in"
     
    3938          . . . S @VITVMAP@("VITALSIGNSEXACTDATETIME")=$$FMDTOUTC^CCRUTIL($P(VITPTMP,U,4),"DT")
    4039          . . . S @VITVMAP@("VITALSIGNSDESCRIPTIONTEXT")="WEIGHT"
    41           . . . ;S @VITVMAP@("VITALSIGNSSOURCEACTORID")=""
     40          . . . S @VITVMAP@("VITALSIGNSSOURCEACTORID")="ACTORPROVIDER_"_$P(^GMR(120.5,$P(VITPTMP,U,1),0),U,6)
    4241          . . . S @VITVMAP@("VITALSIGNSTESTOBJECTID")="VITALTEST"_J
    4342          . . . S @VITVMAP@("VITALSIGNSTESTTYPETEXT")="OBSERVED"
     
    4645          . . . ;S @VITVMAP@("VITALSIGNSDESCRIPTIONCODINGSYSTEM")=""
    4746          . . . ;S @VITVMAP@("VITALSIGNSDESCRIPTIONCODEVERSION")=""
    48           . . . ;S @VITVMAP@("VITALSIGNSTESTSOURCEACTORID")=""
     47          . . . S @VITVMAP@("VITALSIGNSTESTSOURCEACTORID")="ACTORPROVIDER_"_$P(^GMR(120.5,$P(VITPTMP,U,1),0),U,6)
    4948          . . . S @VITVMAP@("VITALSIGNSTESTRESULTVALUE")=$P(VITPTMP,U,3)
    5049          . . . S @VITVMAP@("VITALSIGNSTESTRESULTUNIT")="lbs"
     
    5453          . . . S @VITVMAP@("VITALSIGNSEXACTDATETIME")=$$FMDTOUTC^CCRUTIL($P(VITPTMP,U,4),"DT")
    5554          . . . S @VITVMAP@("VITALSIGNSDESCRIPTIONTEXT")="OTHER VITAL"
    56           . . . S @VITVMAP@("VITALSIGNSSOURCEACTORID")=""
     55          . . . S @VITVMAP@("VITALSIGNSSOURCEACTORID")="ACTORPROVIDER_"_$P(^GMR(120.5,$P(VITPTMP,U,1),0),U,6)
    5756          . . . S @VITVMAP@("VITALSIGNSTESTOBJECTID")="VITALTEST"_J
    5857          . . . S @VITVMAP@("VITALSIGNSTESTTYPETEXT")="OBSERVED"
    5958          . . . S @VITVMAP@("VITALSIGNSDESCRIPTIONTEXT")="OTHER"
    60           . . . S @VITVMAP@("VITALSIGNSDESCRIPTIONCODEVALUE")=""
    61           . . . S @VITVMAP@("VITALSIGNSDESCRIPTIONCODINGSYSTEM")=""
    62           . . . S @VITVMAP@("VITALSIGNSDESCRIPTIONCODEVERSION")=""
    63           . . . S @VITVMAP@("VITALSIGNSTESTSOURCEACTORID")=""
     59          . . . ;S @VITVMAP@("VITALSIGNSDESCRIPTIONCODEVALUE")=""
     60          . . . ;S @VITVMAP@("VITALSIGNSDESCRIPTIONCODINGSYSTEM")=""
     61          . . . ;S @VITVMAP@("VITALSIGNSDESCRIPTIONCODEVERSION")=""
     62          . . . S @VITVMAP@("VITALSIGNSTESTSOURCEACTORID")="ACTORPROVIDER_"_$P(^GMR(120.5,$P(VITPTMP,U,1),0),U,6)
    6463          . . . S @VITVMAP@("VITALSIGNSTESTRESULTVALUE")=$P(VITPTMP,U,3)
    6564          . . . S @VITVMAP@("VITALSIGNSTESTRESULTUNIT")="UNKNOWN"
Note: See TracChangeset for help on using the changeset viewer.