Changeset 262 for ccr

Timestamp:

Nov 8, 2008, 1:34:13 PM (16 years ago)

Author:

George Lilly

Message:

file names have correct version number

Location:

ccr/trunk/p

Files:

• GPLCCR.m (modified) (1 diff)
• GPLLABS.m (modified) (5 diffs)

ccr/trunk/p/GPLCCR.m

@@ -39 +39 @@
        S OARY=$NA(^TMP("GPLCCR",$J,DFN,"CCR",1))
        S ONAM=UFN
-       I UFN="" S ONAM="PAT_"_DFN_"_CCR_V1_0_5.xml"
+       I UFN="" S ONAM="PAT_"_DFN_"_CCR_V1_0_6.xml"
        S ODIRGLB=$NA(^TMP("GPLCCR","ODIR"))
        I '$D(@ODIRGLB) D  ; IF NOT ODIR HAS BEEN SET

ccr/trunk/p/GPLLABS.m

@@ -40 +40 @@
  ; N C0CI,C0CJ,C0COBT,C0CHB,C0CVAR
  ; D EXTRACT^GPLLABS(,1,)
+ I '$D(C0CSILENT) S C0CSILENT=0
+ I '$D(DFN) S DFN=1 ; DEFAULT TEST PATIENT
+ I '$D(^KVAI(0)) D SETTBL ; INITIALIZE LAB TABLE
+ I ^KBAI(0)'="V1" D SETTBL ; NEED NEWEST VERSION
+ I '$D(^TMP("HLS",$J,1)) D EXTRACT(,DFN,) ;EXTRACT IF NOT ALREADY DONE
  S C0CTAB=$NA(^KBAI) ; BASE OF OBX TABLE
  S C0CHB=$NA(^TMP("HLS",$J))
@@ -46 +51 @@
  . K C0CVAR,XV ; CLEAR OUT VARIABLE VALUES
  . S C0CTYP=$P(@C0CHB@(C0CI),"|",1)
- . D LTYP(@C0CHB@(C0CI),C0CTYP,.C0CVAR)
+ . D LTYP(@C0CHB@(C0CI),C0CTYP,.C0CVAR,C0CSILENT)
  . M XV=C0CVAR ;
  . I C0CTYP="OBX" D  ; SPECIAL CASE FOR OBX3
@@ -67 +72 @@
  . . . S XV("RESULTTESTCODINGSYSTEM")=C0CVAR("C3") ; PRIMARY DISPLAY NAME
  . . . S XV("RESULTTESTDESCRIPTIONTEXT")=C0CVAR("C2") ; USE PRIMARY TEXT
- . . ZWR XV
- . W C0CI," ",C0CTYP,!
+ . . I 'C0CSILENT D  ;
+ . . . ZWR XV
+ . I 'C0CSILENT D  ;
+ . . W C0CI," ",C0CTYP,!
  . ; S C0CI=$O(@C0CHB@(C0CI))
  Q
-LTYP(OSEG,OTYP,OVARA) ;
+LTYP(OSEG,OTYP,OVARA,OC0CSILENT) ;
  S OTAB=$NA(@C0CTAB@(OTYP)) ; TABLE FOR SEGMENT TYPE
+ I '$D(OC0CSILENT) S C0CSILENT=0 ; NOT C0CSILENT IS DEFAULT
+ E  S C0CSILENT=OC0CSILENT ; ACCEPT C0CSILENT FLAG
  I 1 D  ; FOR HL7 SEGMENT TYPE
  . S OI="" ; INDEX INTO FIELDS IN SEG
@@ -83 +92 @@
  . . . S OV=$P(OV,"^",OI2) ; PULL OUT SUB-VALUE
  . . S OVARA(OVAR)=OV ; PASS BACK VARIABLE AND VALUE
- . . I OV'="" W OI_": "_$P(@OTAB@(OI),"^",3),": ",OVAR,": ",OV,!
+ . . I 'C0CSILENT D  ; PRINT OUTPUT IF C0CSILENT IS FALSE
+ . . . I OV'="" W OI_": "_$P(@OTAB@(OI),"^",3),": ",OVAR,": ",OV,!
  Q
 LOBX ;
@@ -212 +222 @@
  S X("OBX","OBX17")="17^00936^Observation Method"
  M ^KBAI=X ; SET VALUES IN ^KBAI
- Q
- ;
+ S ^KBAI(0)="V1"
+ Q
+ ;