Changeset 88 for ccr/trunk

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:

• GPLPROBS.m (modified) (3 diffs)
• GPLVITALS.m (modified) (1 diff)

ccr/trunk/p/GPLPROBS.m

@@ -41 +41 @@
           . S VMAP=$NA(@TVMAP@(J))
           . K @VMAP
-          . I DEBUG W "VMAP= ",VMAP,!
+          . W "VMAP= ",VMAP,!
           . S PTMP=RPCRSLT(J) ; PULL OUT PROBLEM FROM RPC RETURN ARRAY
           . S @VMAP@("PROBLEMOBJECTID")="PROBLEM"_J ; UNIQUE OBJID FOR PROBLEM
@@ -78 +78 @@
           ; GENERATE THE NARITIVE HTML FOR THE CCD
           I CCD D  ; IF THIS IS FOR A CCD
-          . N HTMP,HOUT,HTMLO,I,ZX
-          . F I=1:1:RPCRSLT(0) D  ; FOR EACH PROBLEM
-          . . S VMAP=$NA(@TVMAP@(I))
+          . N HTMP,HOUT,HTMLO,GPLPROBI,ZX
+          . F GPLPROBI=1:1:RPCRSLT(0) D  ; FOR EACH PROBLEM
+          . . S VMAP=$NA(@TVMAP@(GPLPROBI))
+          . . W "VMAP =",VMAP,!
           . . D QUERY^GPLXPATH(TGLOBAL,"//ContinuityOfCareRecord/Body/PROBLEMS-HTML","HTMP") ; GET THE HTML FROM THE TEMPLATE
           . . D UNMARK^GPLXPATH("HTMP") ; REMOVE <PROBLEMS-HTML> MARKUP
@@ -86 +87 @@
           . . D MAP^GPLXPATH("HTMP",VMAP,"HOUT") ; MAP THE VARIABLES
           . . ; D PARY^GPLXPATH("HOUT") ; PRINT IT AGAIN
-          . . I I=1 D  ; FIRST ONE IS JUST A COPY
+          . . I GPLPROBI=1 D  ; FIRST ONE IS JUST A COPY
           . . . D CP^GPLXPATH("HOUT","HTMLO")
-          . . I I>1 D  ; AFTER THE FIRST, INSERT INNER HTML
-          . . . D INSINNER^GPLXPATH("HOUT","HTMLO","//")
+          . . I GPLPROBI>1 D  ; AFTER THE FIRST, INSERT INNER HTML
+          . . . W "DOING INNER",!
+          . . . N HTMLBLD,HTMLTMP
+          . . . D QUEUE^GPLXPATH("HTMLBLD","HTMLO",1,HTMLO(0)-1)
+          . . . D QUEUE^GPLXPATH("HTMLBLD","HOUT",2,HOUT(0)-1)
+          . . . D QUEUE^GPLXPATH("HTMLBLD","HTMLO",HTMLO(0),HTMLO(0))
+          . . . D BUILD^GPLXPATH("HTMLBLD","HTMLTMP")
+          . . . D CP^GPLXPATH("HTMLTMP","HTMLO")
+          . . . ; D INSINNER^GPLXPATH("HOUT","HTMLO","//")
+          . D PARY^GPLXPATH("HTMLO")
           . D INSB4^GPLXPATH(OUTXML,"HTMLO") ; INSERT AT TOP OF SECTION
           N PROBSTMP,I

ccr/trunk/p/GPLVITALS.m

@@ -28 +28 @@
           N VITRSLT,J,K,VITPTMP,X,VITVMAP,TBUF
           D VITALS^ORQQVI(.VITRSLT,DFN,"","")
-          I '$D(VITRSLT(1)) D  ; NULL RESULT FROM RPC
-          . W "NULL RESULT FROM VITALS RPC",!
+          I $P(VITRSLT(1),U,2)="No vitals found." D  ; NULL RESULT FROM RPC
+          . W "NO VITALS FOUND FROM VITALS RPC",!
           . S @VITOUTXML@(0)=0
           . Q