Index: ccr/trunk/p/GPLCCD1.m =================================================================== --- ccr/trunk/p/GPLCCD1.m (revision 84) +++ ccr/trunk/p/GPLCCD1.m (revision 85) @@ -208,4 +208,11 @@ ;; ;; + ;; + ;; + ;; + ;; + ;; + ;;
ConditionEffective DatesCondition Status
@@PROBLEMDESCRIPTION@@@@PROBLEMDATEOFONSET@@Active
 + ;; ;; ;; Index: ccr/trunk/p/GPLPROBS.m =================================================================== --- ccr/trunk/p/GPLPROBS.m (revision 84) +++ ccr/trunk/p/GPLPROBS.m (revision 85) @@ -75,22 +75,17 @@ ; GENERATE THE NARITIVE HTML FOR THE CCD I CCD D ; IF THIS IS FOR A CCD - . N HTMP,I,ZX - . S ZX="" - . D PUSH^GPLXPATH("HTMP",ZX) ; HEADER OF THE TABLE + . N HTMP,HOUT,HTMLO,I,ZX . F I=1:1:RPCRSLT(0) D ; FOR EACH PROBLEM . . S VMAP=$NA(@TVMAP@(I)) - . . S ZX="" ; END OF COL AND ROW - . . D PUSH^GPLXPATH("HTMP",ZX) - . D PUSH^GPLXPATH("HTMP","
ConditionEffective DatesCondition Status
" ; BEGIN ROW AND COL - . . S ZX=ZX_@VMAP@("PROBLEMDESCRIPTION") - . . S ZX=ZX_"" ; NEXT COL - . . D PUSH^GPLXPATH("HTMP",ZX) ; ADD TO BUFFER - . . S ZX=@VMAP@("PROBLEMDATEOFONSET") - . . I ZX="" S ZX="Unknown" ; SET TO UNKNOWN - . . D PUSH^GPLXPATH("HTMP",ZX) - . . S ZX="" ; NEXT COL - . . S ZX=ZX_"Active" ; WE ONLY DO ACTIVE - . . S ZX=ZX_"
") ; END TABLE - . D INSB4^GPLXPATH(OUTXML,"HTMP") ; INSERT AT TOP OF SECTION + . . D QUERY^GPLXPATH(TGLOBAL,"//ContinuityOfCareRecord/Body/PROBLEMS-HTML","HTMP") ; GET THE HTML FROM THE TEMPLATE + . . D UNMARK^GPLXPATH("HTMP") ; REMOVE MARKUP + . . ; D PARY^GPLXPATH("HTMP") ; PRINT IT + . . 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 + . . . D CP^GPLXPATH("HOUT","HTMLO") + . . I I>1 D ; AFTER THE FIRST, INSERT INNER HTML + . . . D INSINNER^GPLXPATH("HOUT","HTMLO","//") + . D INSB4^GPLXPATH(OUTXML,"HTMLO") ; INSERT AT TOP OF SECTION N PROBSTMP,I D MISSING^GPLXPATH(ARYTMP,"PROBSTMP") ; SEARCH XML FOR MISSING VARS Index: ccr/trunk/p/GPLUNIT.m =================================================================== --- ccr/trunk/p/GPLUNIT.m (revision 84) +++ ccr/trunk/p/GPLUNIT.m (revision 85) @@ -69,5 +69,5 @@ ; ZTEST(ZARY,WHICH) ; try out the tests using a passed array ZTEST - N I,ZX,ZR,ZP + N ZI,ZX,ZR,ZP S DEBUG=0 ; I WHICH="ALL" D Q ; RUN ALL THE TESTS @@ -85,7 +85,7 @@ S FIRST=$P(ZARY(WHICH),"^",1) S LAST=$P(ZARY(WHICH),"^",2) - F I=FIRST:1:LAST D - . I ZARY(I)?1">"1.E D ; NOT A TEST, JUST RUN THE STATEMENT - . . S ZP=$E(ZARY(I),2,$L(ZARY(I))) + F ZI=FIRST:1:LAST D + . I ZARY(ZI)?1">"1.E D ; NOT A TEST, JUST RUN THE STATEMENT + . . S ZP=$E(ZARY(ZI),2,$L(ZARY(ZI))) . . ; W ZP,! . . S ZX=ZP @@ -93,6 +93,6 @@ . . X ZX . . W "..SUCCESS: ",WHICH,! - . I ZARY(I)?1"?"1.E D ; THIS IS A TEST - . . S ZP=$E(ZARY(I),2,$L(ZARY(I))) + . I ZARY(ZI)?1"?"1.E D ; THIS IS A TEST + . . S ZP=$E(ZARY(ZI),2,$L(ZARY(ZI))) . . S ZX="S ZR="_ZP . . W "TRYING: "_ZP