Changeset 88 for ccr/trunk


Ignore:
Timestamp:
Aug 12, 2008, 2:45:52 PM (16 years ago)
Author:
George Lilly
Message:

Fixes for CCD narrative and no vitals processing

Location:
ccr/trunk/p
Files:
2 edited

Legend:

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

    r87 r88  
    4141          . S VMAP=$NA(@TVMAP@(J))
    4242          . K @VMAP
    43           . I DEBUG W "VMAP= ",VMAP,!
     43          . W "VMAP= ",VMAP,!
    4444          . S PTMP=RPCRSLT(J) ; PULL OUT PROBLEM FROM RPC RETURN ARRAY
    4545          . S @VMAP@("PROBLEMOBJECTID")="PROBLEM"_J ; UNIQUE OBJID FOR PROBLEM
     
    7878          ; GENERATE THE NARITIVE HTML FOR THE CCD
    7979          I CCD D  ; IF THIS IS FOR A CCD
    80           . N HTMP,HOUT,HTMLO,I,ZX
    81           . F I=1:1:RPCRSLT(0) D  ; FOR EACH PROBLEM
    82           . . S VMAP=$NA(@TVMAP@(I))
     80          . N HTMP,HOUT,HTMLO,GPLPROBI,ZX
     81          . F GPLPROBI=1:1:RPCRSLT(0) D  ; FOR EACH PROBLEM
     82          . . S VMAP=$NA(@TVMAP@(GPLPROBI))
     83          . . W "VMAP =",VMAP,!
    8384          . . D QUERY^GPLXPATH(TGLOBAL,"//ContinuityOfCareRecord/Body/PROBLEMS-HTML","HTMP") ; GET THE HTML FROM THE TEMPLATE
    8485          . . D UNMARK^GPLXPATH("HTMP") ; REMOVE <PROBLEMS-HTML> MARKUP
     
    8687          . . D MAP^GPLXPATH("HTMP",VMAP,"HOUT") ; MAP THE VARIABLES
    8788          . . ; D PARY^GPLXPATH("HOUT") ; PRINT IT AGAIN
    88           . . I I=1 D  ; FIRST ONE IS JUST A COPY
     89          . . I GPLPROBI=1 D  ; FIRST ONE IS JUST A COPY
    8990          . . . D CP^GPLXPATH("HOUT","HTMLO")
    90           . . I I>1 D  ; AFTER THE FIRST, INSERT INNER HTML
    91           . . . D INSINNER^GPLXPATH("HOUT","HTMLO","//")
     91          . . I GPLPROBI>1 D  ; AFTER THE FIRST, INSERT INNER HTML
     92          . . . W "DOING INNER",!
     93          . . . N HTMLBLD,HTMLTMP
     94          . . . D QUEUE^GPLXPATH("HTMLBLD","HTMLO",1,HTMLO(0)-1)
     95          . . . D QUEUE^GPLXPATH("HTMLBLD","HOUT",2,HOUT(0)-1)
     96          . . . D QUEUE^GPLXPATH("HTMLBLD","HTMLO",HTMLO(0),HTMLO(0))
     97          . . . D BUILD^GPLXPATH("HTMLBLD","HTMLTMP")
     98          . . . D CP^GPLXPATH("HTMLTMP","HTMLO")
     99          . . . ; D INSINNER^GPLXPATH("HOUT","HTMLO","//")
     100          . D PARY^GPLXPATH("HTMLO")
    92101          . D INSB4^GPLXPATH(OUTXML,"HTMLO") ; INSERT AT TOP OF SECTION
    93102          N PROBSTMP,I
  • ccr/trunk/p/GPLVITALS.m

    r87 r88  
    2828          N VITRSLT,J,K,VITPTMP,X,VITVMAP,TBUF
    2929          D VITALS^ORQQVI(.VITRSLT,DFN,"","")
    30           I '$D(VITRSLT(1)) D  ; NULL RESULT FROM RPC
    31           . W "NULL RESULT FROM VITALS RPC",!
     30          I $P(VITRSLT(1),U,2)="No vitals found." D  ; NULL RESULT FROM RPC
     31          . W "NO VITALS FOUND FROM VITALS RPC",!
    3232          . S @VITOUTXML@(0)=0
    3333          . Q
Note: See TracChangeset for help on using the changeset viewer.