Changeset 676


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • ccr/trunk/p/C0CCCR.m

    r674 r676  
    137137 M CCRGRTN=^TMP("C0CCCR",$J,DFN,CCRPART) ; RTN GLOBAL OF PART OR ALL
    138138 I '$D(C0CNRPC) S ^TMP("C0CRPC",$H,"RESULT",CCRGRTN(0))=""
     139 ;K ^TMP("C0CCCR",$J) ; BEGIN TO CLEAN UP
    139140 Q
    140141 ;
  • ccr/trunk/p/C0CPROC.m

    r674 r676  
    4444 ; NEED TO ADD START AND END DATES FROM PARAMETERS
    4545 N ZI S ZI=""
     46 N PREVCPT,PREVDT S (PREVCPT,PREVDT)=""
    4647 F  S ZI=$O(VISIT(ZI),-1) Q:ZI=""  D  ; REVERSE TIME ORDER - MOST RECENT FIRST
    4748 . N ZDATE
     
    5657 . . N ZCPT S ZCPT=$$CPT(VISIT(ZI,"CPT",ZJ)) ;GET CPT CODE AND TEXT
    5758 . . I ZCPT'="" D  ;IF CPT CODE IS PRESENT
     59 . . . I (ZCPT=PREVCPT)&(ZDATE=PREVDT) Q  ; NO DUPS ALLOWED
    5860 . . . W !,ZCPT," ",ZDATE," ",ZPRV
    5961 . . . S ZRNF("PROCACTOROBJID")=ZPRV
     
    7375 . . . S ZRNF("PROCTYPE")=$P(ZCPT,U,2) ; NEED TO ADD THIS TO TEMPLATE
    7476 . . . D RNF1TO2^C0CRNF(C0CPRC,"ZRNF") ; ADD THIS ROW TO THE ARRAY
     77 . . . S PREVCPT=ZCPT
     78 . . . S PREVDT=ZDATE
    7579 N ZRIM S ZRIM=$NA(^TMP("C0CRIM","VARS",DFN,"PROCEDURES"))
    7680 M @ZRIM=@C0CPRC@("V")
     
    9195 ; CPT^CATEGORY^TEXT
    9296 N Z1,Z2,Z3,ZRTN
    93  I ISTR["(CPT-4 " D  ; IF THERE IS A CPT CODE IN THERE
    94  . S Z1=$P($P(ISTR,"(CPT-4 ",2),")",1)
     97 I $P(ISTR,U,1)'="" D  ; IF THERE IS A CPT CODE IN THERE
     98 . S Z1=$P(ISTR,U,1)
    9599 . S Z2=$P(ISTR,U,2)
    96100 . S Z3=$P(ISTR,U,3)
     
    118122 N ZZTMP
    119123 D BUILD^C0CXPATH(ZBLD,PROCOUT) ;BUILD FINAL XML
    120  K @ZTEMP,@ZBLD
     124 K @ZTEMP,@ZBLD,@C0CPRC
    121125 Q
    122126 ; 
Note: See TracChangeset for help on using the changeset viewer.