Changeset 434 for ccr/trunk/p/C0CLA7Q.m

Timestamp:

Apr 14, 2009, 10:57:24 AM (15 years ago)

Author:

George Lilly

Message:

rollback of Lab for RPMS code

File:

• ccr/trunk/p/C0CLA7Q.m (modified) (5 diffs)

ccr/trunk/p/C0CLA7Q.m

@@ -1 @@
-C0CLA7Q ;WV/JMC - CCD/CCR Lab HL7 Query Utility ;Apr 12, 2009
-        ;;5.2;;****;Sep 27, 1994
+C0CLA7Q ;WV/JMC - CCD/CCR Lab HL7 Query Utility ;Apr 13, 2009
+        ;;n.n;;****;
         ;
         ;
@@ -12 +12 @@
         ;
         ; Check and retrieve lab results from LAB DATA file (#63)
-        D GCPR^LA7QRY(C0CPTID,C0CSDT,C0CEDT,.C0CSC,.C0CSPEC,.C0CERR,C0CDEST,C0CHL7)
+        D GCPR^LA7QRY($G(C0CPTID),$G(C0CSDT),$G(C0CEDT),.C0CSC,.C0CSPEC,.C0CERR,$G(C0CDEST),$G(C0CHL7))
         ;
         ; If V LAB file present then check for lab results that are only in this file
-        I $D(^AUPNVLAB) D VCHECK
-        ;
         ; If results found in V Lab file then build results and add to above results.
-        I $D(^TMP("C0C-VLAB",$J,3)) D VBUILD
+        I $D(^AUPNVLAB) D
+        . D VCHECK
+        . I $D(^TMP("C0C-VLAB",$J,3)) D VBUILD
         ;
         ;K ^TMP("C0C-VLAB",$J)
@@ -84 +84 @@
         I C0CLN'="" D
         . S X=$P(LA7X,"^",3)
-        . S $P(X,"!",3)=C0CLN
+        . I $P(X,"!",3)="" S $P(X,"!",3)=C0CLN
         . S $P(LA7X,"^",3)=X
         ;
@@ -96 +96 @@
         F I=0,12 S C0CVLAB(I)=^AUPNVLAB(C0CDA,I)
         ;
+        ; JMC 04/13/09 - Store anything for now that meets date criteria.
         D VSTORE
         ;
@@ -103 +104 @@
 VSTORE  ; Store entry for building in HL7 message when parent is from V LAB file.
         ;
-        S ^TMP("C0C-VLAB",$J,3,$P(C0CVLAB(12),"^"),$P(C0CVLAB,"^",2))=""
+        N PARENT
+        ;
+        ; Determine parent test to use for OBR segment
+        S PARENT=$P(C0CVLAB(12),"^",8)
+        I PARENT="" S PARENT=$P(C0CVLAB(0),"^")
+        ;
+        ;                                patient ien 
+        ;                                |                 collection date/time
+        ;                                |                 |             parent test (ordered test)
+        ;                                |                 |             |      ien of entry in V LAB file
+        ;                                |                 |             |      |
+        S ^TMP("C0C-VLAB",$J,3,$P(C0CVLAB(0),"^",2),$P(C0CVLAB(12),"^"),PARENT,C0CDA)=""
+        ;
         Q