Changeset 277 for ccr/trunk

Timestamp:

Nov 12, 2008, 2:09:42 PM (16 years ago)

Author:

George Lilly

Message:

repairs to Lab processing

Location:

ccr/trunk/p

Files:

• GPLACTOR.m (modified) (3 diffs)
• GPLLABS.m (modified) (4 diffs)

ccr/trunk/p/GPLACTOR.m

@@ -67 +67 @@
  . . D ORG("ATMP",AIEN,AOID,"ATMP2")
  . ;
+ . ;W "PROCESSING:",ATYP,!
  . D INSINNER^GPLXPATH(AXML,"ATMP2") ; INSERT INTO ROOT
- . K ATYP,AIEN,AOID ; BE SURE TO GET THE NEXT ONE
+ . K ATYP,AIEN,AOID,ATMP,ATMP2 ; BE SURE TO GET THE NEXT ONE
  ;
  N ACTTMP
@@ -136 +137 @@
      S @AMAP@("ACTOROBJECTID")=AOID ;ACTOR OBJECT ID
      S @AMAP@("ACTORINFOSYSNAME")=$$SYSNAME^CCRSYS
-         S @AMAP@("ACTORINFOSYSVER")=$$SYSVER^CCRSYS
+     S @AMAP@("ACTORINFOSYSVER")=$$SYSVER^CCRSYS
      S @AMAP@("ACTORINFOSYSSOURCEID")=AOID
      D MAP^GPLXPATH(INXML,AMAP,OUTXML) ; MAP THE VARIABLE
@@ -174 +175 @@
      S @AMAP@("ACTORMIDDLENAME")=$$MIDDLE^CCRVA200(AIEN)
      S @AMAP@("ACTORFAMILYNAME")=$$FAMILY^CCRVA200(AIEN)
-         S @AMAP@("ACTORTITLE")=$$TITLE^CCRVA200(AIEN)
-         S @AMAP@("IDTYPE")=$P($$NPI^CCRVA200(AIEN),U,1)
-         S @AMAP@("ID")=$P($$NPI^CCRVA200(AIEN),U,2)
-         S @AMAP@("IDDESC")=$P($$NPI^CCRVA200(AIEN),U,3)
+     S @AMAP@("ACTORTITLE")=$$TITLE^CCRVA200(AIEN)
+     S @AMAP@("IDTYPE")=$P($$NPI^CCRVA200(AIEN),U,1)
+     S @AMAP@("ID")=$P($$NPI^CCRVA200(AIEN),U,2)
+     S @AMAP@("IDDESC")=$P($$NPI^CCRVA200(AIEN),U,3)
      S @AMAP@("ACTORSPECIALITY")=$$SPEC^CCRVA200(AIEN)
      S @AMAP@("ACTORADDRESSTYPE")=$$ADDTYPE^CCRVA200(AIEN)

ccr/trunk/p/GPLLABS.m

@@ -59 +59 @@
  . W "DFN:",DFN,!
  . ;D PARY^GPLXPATH("C0CT") ; SECTION TEMPLATE
- . D PARY^GPLXPATH("C0CRT") ;REQUEST TEMPLATE (OCR)
- . D PARY^GPLXPATH("C0CTT") ;TEST TEMPLATE (OCX)
+ . ;D PARY^GPLXPATH("C0CRT") ;REQUEST TEMPLATE (OCR)
+ . ;D PARY^GPLXPATH("C0CTT") ;TEST TEMPLATE (OCX)
  D EXTRACT("C0CT",DFN,) ; FIRST CALL EXTRACT
  I '$D(@C0CV@(0)) D  Q  ; NO VARS THERE
  . S @C0CO@(0)=0 ; PASS BACK NO RESULTS INDICATOR
+ S RIMVARS=$NA(^TMP("GPLRIM","VARS",DFN,"RESULTS"))
+ K @RIMVARS
+ M @RIMVARS=@C0CV ; UPDATE RIMVARS SO THEY STAY IN SYNCH
  N C0CI,C0CJ,C0CMAP,C0CTMAP,C0CTMP
  S C0CIN=@C0CV@(0) ; COUNT OF RESULTS (OBR)
@@ -86 +89 @@
  . . . ;
  . . . D PUSHA^GPLXPATH("C0CTO","C0CTMP") ;ADD THE TEST TO BUFFER
- . . I 'C0CQT D PARY^GPLXPATH("C0CTO")
+ . . ; I 'C0CQT D PARY^GPLXPATH("C0CTO")
  . . D INSINNER^GPLXPATH("C0CRTMP","C0CTO","//Results/Result/Test") ;INSERT TST
  . I C0CI=1 D  ; FIRST TIME, COPY INSTEAD OF INSERT
@@ -143 +146 @@
  . . S @C0CLB@(0)=@C0CLB@(0)+1 ; INCREMENT COUNT
  . . S C0CLI=@C0CLB@(0) ; INDEX FOR THIS RESULT
- . . M @C0CLB@(C0CLI)=C0CVAR ; PERSIST THE OBR VARS
- . . S @C0CLB@(C0CLI,"RESULTOBJECTID")="RESULT_"_C0CLI
+ . . ;M @C0CLB@(C0CLI)=C0CVAR ; PERSIST THE OBR VARS
+ . . S XV("RESULTOBJECTID")="RESULT_"_C0CLI
+ . . S C0CX1=XV("RESULTSOURCEACTORID") ; SOURCE FROM OBR
+ . . 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
+ . . 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
@@ -171 +180 @@
  . . S @C0CLB2@(0)=C0CLOBX ; STORE THE TEST COUNT
  . . S XV("RESULTTESTOBJECTID")="RESULTTEST_"_C0CLI_"_"_C0CLOBX
- . . I 'C0CQT ZWR XV
+ . . S C0CX1=XV("RESULTTESTSOURCEACTORID") ; TEST SOURCE
+ . . S C0CX2=$P($P(C0CX1,"^",1),"-",1) ; PULL OUT STATION NUMBER
+ . . S XV("RESULTTESTSOURCEACTORID")="ACTORORGANIZATION_"_C0CX2
+ . . 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
+ . . ; I 'C0CQT ZWR XV
  . . M @C0CLB2@(C0CLOBX)=XV ; PERSIST THE TEST RESULT VARIABLES
  . I 'C0CQT D  ;