diff --git a/p/C0CCCR.m b/p/C0CCCR.m index 0945005..3342e0a 100644 --- a/p/C0CCCR.m +++ b/p/C0CCCR.m @@ -40,7 +40,7 @@ XPAT(DFN,XPARMS,DIR,FN) ; EXPORT ONE PATIENT TO A FILE D CCRRPC(.CCRGLO,DFN,XPARMS,"CCR") S OARY=$NA(^TMP("C0CCCR",$J,DFN,"CCR",1)) S ONAM=UFN - I UFN="" S ONAM="PAT_"_DFN_"_CCR_V1_0_20.xml" + I UFN="" S ONAM="PAT_"_DFN_"_CCR_V1_0_21.xml" S ODIRGLB=$NA(^TMP("C0CCCR","ODIR")) I $D(^TMP("GPLCCR","ODIR")) S @ODIRGLB=^TMP("GPLCCR","ODIR") I '$D(@ODIRGLB) D ; IF NOT ODIR HAS BEEN SET diff --git a/p/C0CRNF.m b/p/C0CRNF.m index 2eaa05a..93fbeba 100644 --- a/p/C0CRNF.m +++ b/p/C0CRNF.m @@ -36,7 +36,8 @@ FIELDS(C0CFRTN,C0CF) ; RETURNS AN ARRAY OF THE FIELDS IN FILE C0CF, . . ;W "N: ",C0CFN,! . . ;I C0CFN="STR" W C0CFN," ",C0CFJ,! . . I $D(@C0CFRTN@(C0CFN)) D ; IS THIS A DUPLICATE? - . . . W "DUPLICATE FOUND! ",C0CFJ," ",C0CFI," ",C0CFN,!,@C0CFRTN@(C0CFN),! + . . . I DEBUG D ; + . . . . W "DUPLICATE FOUND! ",C0CFJ," ",C0CFI," ",C0CFN,!,@C0CFRTN@(C0CFN),! . . . S @C0CFRTN@(C0CFN_"_"_C0CFJ)=C0CFJ_"^"_C0CFI . . E S @C0CFRTN@(C0CFN)=C0CFJ_"^"_C0CFI . S C0CFJ=$O(^DD(C0CFJ)) ; NEXT SUBFILE