Changeset 676 for ccr/trunk/p

Timestamp:

Jan 22, 2010, 11:11:36 AM (15 years ago)

Author:

George Lilly

Message:

fixed some bugs in Procedures

Location:

ccr/trunk/p

Files:

• C0CCCR.m (modified) (1 diff)
• C0CPROC.m (modified) (5 diffs)

ccr/trunk/p/C0CCCR.m

@@ -137 +137 @@
  M CCRGRTN=^TMP("C0CCCR",$J,DFN,CCRPART) ; RTN GLOBAL OF PART OR ALL
  I '$D(C0CNRPC) S ^TMP("C0CRPC",$H,"RESULT",CCRGRTN(0))=""
+ ;K ^TMP("C0CCCR",$J) ; BEGIN TO CLEAN UP
  Q
  ;

ccr/trunk/p/C0CPROC.m

@@ -44 +44 @@
  ; NEED TO ADD START AND END DATES FROM PARAMETERS
  N ZI S ZI=""
+ N PREVCPT,PREVDT S (PREVCPT,PREVDT)=""
  F  S ZI=$O(VISIT(ZI),-1) Q:ZI=""  D  ; REVERSE TIME ORDER - MOST RECENT FIRST
  . N ZDATE
@@ -56 +57 @@
  . . N ZCPT S ZCPT=$$CPT(VISIT(ZI,"CPT",ZJ)) ;GET CPT CODE AND TEXT
  . . I ZCPT'="" D  ;IF CPT CODE IS PRESENT
+ . . . I (ZCPT=PREVCPT)&(ZDATE=PREVDT) Q  ; NO DUPS ALLOWED
  . . . W !,ZCPT," ",ZDATE," ",ZPRV
  . . . S ZRNF("PROCACTOROBJID")=ZPRV
@@ -73 +75 @@
  . . . S ZRNF("PROCTYPE")=$P(ZCPT,U,2) ; NEED TO ADD THIS TO TEMPLATE
  . . . D RNF1TO2^C0CRNF(C0CPRC,"ZRNF") ; ADD THIS ROW TO THE ARRAY
+ . . . S PREVCPT=ZCPT
+ . . . S PREVDT=ZDATE
  N ZRIM S ZRIM=$NA(^TMP("C0CRIM","VARS",DFN,"PROCEDURES"))
  M @ZRIM=@C0CPRC@("V")
@@ -91 +95 @@
  ; CPT^CATEGORY^TEXT
  N Z1,Z2,Z3,ZRTN
- I ISTR["(CPT-4 " D  ; IF THERE IS A CPT CODE IN THERE
- . S Z1=$P($P(ISTR,"(CPT-4 ",2),")",1)
+ I $P(ISTR,U,1)'="" D  ; IF THERE IS A CPT CODE IN THERE
+ . S Z1=$P(ISTR,U,1)
  . S Z2=$P(ISTR,U,2)
  . S Z3=$P(ISTR,U,3)
@@ -118 +122 @@
  N ZZTMP
  D BUILD^C0CXPATH(ZBLD,PROCOUT) ;BUILD FINAL XML
- K @ZTEMP,@ZBLD
+ K @ZTEMP,@ZBLD,@C0CPRC
  Q
  ;