From 771afac3ad1b901eea6c96430755a59e29f5f78d Mon Sep 17 00:00:00 2001 From: sam Date: Mon, 16 Mar 2009 00:14:48 +0000 Subject: [PATCH] Changed CCRUTIL to C0CUTIL --- p/C0CALERT.m | 2 +- p/C0CCCD.m | 2 +- p/C0CCCR.m | 2 +- p/C0CIMMU.m | 2 +- p/C0CLABS.m | 4 ++-- p/C0CPROBS.m | 8 ++++---- p/C0CRPMS.m | 6 +++--- p/{CCRUTIL.m => C0CUTIL.m} | 11 +++++++---- p/C0CVITAL.m | 20 ++++++++++---------- p/CCRDPT.m | 2 +- p/CCRMEDS.m | 2 +- p/CCRMEDS1.m | 4 ++-- p/CCRMEDS2.m | 2 +- p/CCRMEDS3.m | 2 +- p/CCRMEDS4.m | 2 +- p/CCRMEDS6.m | 4 ++-- p/CCRVA200.m | 6 +++--- 17 files changed, 42 insertions(+), 39 deletions(-) rename p/{CCRUTIL.m => C0CUTIL.m} (93%) diff --git a/p/C0CALERT.m b/p/C0CALERT.m index 872f2af..4433e64 100644 --- a/p/C0CALERT.m +++ b/p/C0CALERT.m @@ -109,7 +109,7 @@ EXTRACT(ALTXML,DFN,ALTOUTXML) ; EXTRACT ALERTS INTO PROVIDED XML TEMPLATE . N C0CG1,C0CT ; ARRAY FOR VALUES FROM GLOBAL . D GETN1^C0CRNF("C0CG1",120.8,DFN,"B") ;GET VALUES BY NAME . S C0CT=$$ZVALUEI^C0CRNF("ORIGINATION DATE/TIME","C0CG1") - . S @ALTVMAP@("ALERTDATETIME")=$$FMDTOUTC^CCRUTIL(C0CT) + . S @ALTVMAP@("ALERTDATETIME")=$$FMDTOUTC^C0CUTIL(C0CT) . K @ALTARYTMP . D MAP^C0CXPATH(ALTXML,ALTVMAP,ALTARYTMP) . I ALTCNT=1 D CP^C0CXPATH(ALTARYTMP,ALTOUTXML) diff --git a/p/C0CCCD.m b/p/C0CCCD.m index dc83d7a..ec4c376 100644 --- a/p/C0CCCD.m +++ b/p/C0CCCD.m @@ -183,7 +183,7 @@ UNSHAVE(ORIGXML,SHXML) ; REPLACES THE 2-6 AND N-1 AND N-2 LINES FROM TEMPLATE HDRMAP(CXML,DFN,IHDR) ; MAP HEADER VARIABLES: FROM, TO ECT N VMAP S VMAP=$NA(^TMP("C0CCCR",$J,DFN,"HEADER")) ; K @VMAP - S @VMAP@("DATETIME")=$$FMDTOUTC^CCRUTIL($$NOW^XLFDT,"DT") + S @VMAP@("DATETIME")=$$FMDTOUTC^C0CUTIL($$NOW^XLFDT,"DT") I IHDR="" D ; HEADER ARRAY IS NOT PROVIDED, USE DEFAULTS . S @VMAP@("ACTORPATIENT")="ACTORPATIENT_"_DFN . S @VMAP@("ACTORFROM")="ACTORORGANIZATION_"_DUZ ; FROM DUZ - ??? diff --git a/p/C0CCCR.m b/p/C0CCCR.m index 1fc923c..959631e 100644 --- a/p/C0CCCR.m +++ b/p/C0CCCR.m @@ -144,7 +144,7 @@ INITSTPS(TAB) ; INITIALIZE CCR PROCESSING STEPS HDRMAP(CXML,DFN) ; MAP HEADER VARIABLES: FROM, TO ECT N VMAP S VMAP=$NA(^TMP("C0CCCR",$J,DFN,"HEADER")) ; K @VMAP - S @VMAP@("DATETIME")=$$FMDTOUTC^CCRUTIL($$NOW^XLFDT,"DT") + S @VMAP@("DATETIME")=$$FMDTOUTC^C0CUTIL($$NOW^XLFDT,"DT") ; I IHDR="" D ; HEADER ARRAY IS NOT PROVIDED, USE DEFAULTS D ; ALWAYS MAP THESE VARIABLES . S @VMAP@("ACTORPATIENT")="ACTORPATIENT_"_DFN diff --git a/p/C0CIMMU.m b/p/C0CIMMU.m index 1ed977d..356e973 100644 --- a/p/C0CIMMU.m +++ b/p/C0CIMMU.m @@ -78,7 +78,7 @@ EXTRACT(IPXML,DFN,OUTXML) ; EXTRACT IMMUNIZATIONS INTO VARIABLES . . S C0CIEN=$O(@IMMA@(C0CIM,C0CIMD,"")) ;IEN OF IMMUNE RECORD . . D GETN^C0CRNF("C0CI",9000010.11,C0CIEN) ; GET THE FILEMAN RECORD FOR IENS . . W C0CIEN,"_",C0CIMD - . . S C0CT=$$FMDTOUTC^CCRUTIL(9999999-C0CIMD,"DT") ; FORMAT DATE/TIME + . . S C0CT=$$FMDTOUTC^C0CUTIL(9999999-C0CIMD,"DT") ; FORMAT DATE/TIME . . W C0CT,! . . S @VMAP@("IMMUNEOBJECTID")="IMMUNIZATION_"_C0CC ;UNIQUE OBJECT ID . . S @VMAP@("IMMUNEDATETIMETYPETEXT")="Immunization Date" ; ALL ARE THE SAME diff --git a/p/C0CLABS.m b/p/C0CLABS.m index 765ddbf..c2695dc 100644 --- a/p/C0CLABS.m +++ b/p/C0CLABS.m @@ -182,7 +182,7 @@ LIST ; LIST THE HL7 MESSAGE; ALSO, EXTRACT THE RESULT VARIABLES TO C0CLB . . S XV("RESULTSOURCEACTORID")="ACTORPROVIDER_"_$P($P(C0CX1,"^",1),"-",1) . . S C0CX1=XV("RESULTASSESSMENTDATETIME") ;DATE TIME IN HL7 FORMAT . . S C0CX2=$$HL7TFM^XLFDT(C0CX1,"L") ;FM DT LOCAL - . . S XV("RESULTASSESSMENTDATETIME")=$$FMDTOUTC^CCRUTIL(C0CX2,"DT") ;UTC TIME + . . S XV("RESULTASSESSMENTDATETIME")=$$FMDTOUTC^C0CUTIL(C0CX2,"DT") ;UTC TIME . . M @C0CLB@(C0CLI)=XV ; PERSIST THE OBR VARS . . S C0CLOBX=0 ; MARK THE BEGINNING OF A NEW SECTION . I C0CTYP="OBX" D ; SPECIAL CASE FOR OBX3 @@ -220,7 +220,7 @@ LIST ; LIST THE HL7 MESSAGE; ALSO, EXTRACT THE RESULT VARIABLES TO C0CLB . . S XV("RESULTTESTNORMALSOURCEACTORID")=XV("RESULTTESTSOURCEACTORID") . . S C0CX1=XV("RESULTTESTDATETIME") ;DATE TIME IN HL7 FORMAT . . S C0CX2=$$HL7TFM^XLFDT(C0CX1,"L") ;FM DT LOCAL - . . S XV("RESULTTESTDATETIME")=$$FMDTOUTC^CCRUTIL(C0CX2,"DT") ;UTC TIME + . . S XV("RESULTTESTDATETIME")=$$FMDTOUTC^C0CUTIL(C0CX2,"DT") ;UTC TIME . . ; I 'C0CQT ZWR XV . . M @C0CLB2@(C0CLOBX)=XV ; PERSIST THE TEST RESULT VARIABLES . I 'C0CQT D ; diff --git a/p/C0CPROBS.m b/p/C0CPROBS.m index 66d1984..ffbe3d0 100644 --- a/p/C0CPROBS.m +++ b/p/C0CPROBS.m @@ -53,8 +53,8 @@ EXTRACT(IPXML,DFN,OUTXML) ; EXTRACT PROBLEMS INTO PROVIDED XML TEMPLATE . S @VMAP@("PROBLEMDESCRIPTION")=$P(PTMP,U,3) . S @VMAP@("PROBLEMCODINGVERSION")="" . S @VMAP@("PROBLEMCODEVALUE")=$P(PTMP,U,4) - . S @VMAP@("PROBLEMDATEOFONSET")=$$FMDTOUTC^CCRUTIL($P(PTMP,U,5),"DT") - . S @VMAP@("PROBLEMDATEMOD")=$$FMDTOUTC^CCRUTIL($P(PTMP,U,6),"DT") + . S @VMAP@("PROBLEMDATEOFONSET")=$$FMDTOUTC^C0CUTIL($P(PTMP,U,5),"DT") + . S @VMAP@("PROBLEMDATEMOD")=$$FMDTOUTC^C0CUTIL($P(PTMP,U,6),"DT") . S @VMAP@("PROBLEMSC")=$P(PTMP,U,7) . S @VMAP@("PROBLEMSE")=$P(PTMP,U,8) . S @VMAP@("PROBLEMCONDITION")=$P(PTMP,U,9) @@ -65,8 +65,8 @@ EXTRACT(IPXML,DFN,OUTXML) ; EXTRACT PROBLEMS INTO PROVIDED XML TEMPLATE . S @VMAP@("PROBLEMSOURCEACTORID")="ACTORPROVIDER_"_$P(X,";",1) . S @VMAP@("PROBLEMSERVICE")=$P(PTMP,U,13) . S @VMAP@("PROBLEMHASCMT")=$P(PTMP,U,14) - . S @VMAP@("PROBLEMDTREC")=$$FMDTOUTC^CCRUTIL($P(PTMP,U,15),"DT") - . S @VMAP@("PROBLEMINACT")=$$FMDTOUTC^CCRUTIL($P(PTMP,U,16),"DT") + . S @VMAP@("PROBLEMDTREC")=$$FMDTOUTC^C0CUTIL($P(PTMP,U,15),"DT") + . S @VMAP@("PROBLEMINACT")=$$FMDTOUTC^C0CUTIL($P(PTMP,U,16),"DT") . S ARYTMP=$NA(@TARYTMP@(J)) . ; W "ARYTMP= ",ARYTMP,! . K @ARYTMP diff --git a/p/C0CRPMS.m b/p/C0CRPMS.m index 944e236..2de8ffa 100644 --- a/p/C0CRPMS.m +++ b/p/C0CRPMS.m @@ -36,7 +36,7 @@ VISITS(C0CDFN,C0CCNT) ;LIST VISIT DATES FOR PATIENT DFN S G="" S GN=0 F S G=$O(^AUPNVSIT("AA",C0CDFN,G)) Q:(G="")!(GN>C0CCNT) D ; . S GN=GN+1 - . W $$FMDTOUTC^CCRUTIL(9999999-G),! + . W $$FMDTOUTC^C0CUTIL(9999999-G),! Q ; VISITS2(C0CDFN,C0CCNT) ;SECOND VERSION USING NEXTV @@ -47,7 +47,7 @@ VISITS2(C0CDFN,C0CCNT) ;SECOND VERSION USING NEXTV I '$D(C0CCNT) S C0CCNT=99999999 F S C0CG=$$NEXTV(C0CDFN,C0CG) Q:(C0CG="")!(GN'