Index: /ccr/trunk/p/C0CRNF.m
===================================================================
--- /ccr/trunk/p/C0CRNF.m	(revision 308)
+++ /ccr/trunk/p/C0CRNF.m	(revision 309)
@@ -117,5 +117,6 @@
  . . I C0CVALUE["C0CTMP" D  ; WP FIELD
  . . . N ZT,ZWP S ZWP=0 ;ITERATOR
- . . . S C0CVALUE="" ; INITIALIZE
+ . . . S ZWP=$O(C0CTMP(C0CJ,C0CREF,C0CI,ZWP)) ; INIT TO FIRST LINE
+ . . . S C0CVALUE=C0CTMP(C0CJ,C0CREF,C0CI,ZWP) ; INIT TO FIRST LINE
  . . . F  S ZWP=$O(C0CTMP(C0CJ,C0CREF,C0CI,ZWP)) Q:'ZWP  D  ;
  . . . . S ZT=" "_C0CTMP(C0CJ,C0CREF,C0CI,ZWP) ;LINE OF WP
Index: /ccr/trunk/p/C0CRXN.m
===================================================================
--- /ccr/trunk/p/C0CRXN.m	(revision 308)
+++ /ccr/trunk/p/C0CRXN.m	(revision 309)
@@ -86,8 +86,13 @@
  ; CROSS CHECKS THE NATIONAL DRUG FILE AND THE VA MAPPING FILE AGAINST
  ; THE UMLS RXNORM DATABASE
+ ; THIS ROUTINE HAS BEEN ENHANCED TO ALSO CHECK THE 50.416 DRUG INGREDIENT
+ ; FILE AND TREAT VUIDS FOUND THERE LIKE THE ONES BEING FOUND IN THE NDF
  ; IF THE VUID EXISISTS IN ALL THREE FILES, THE RXNORM CODE MATCHES IN
  ; THE VA MAPPING FILE AND THE TEXT STRINGS ARE THE SAME, THE VUID IS INCLUDED
  ; IN THE FILE BUT NO FLAGS ARE SET
  ; IF THE VUID IS MISSING FROM THE NATIONAL DRUG FILE NDF=N
+ ; (IF THE VUID IS MISSING FROM THE NDF, IT IS CHECKED IN THE DRUG INGREDIENT
+ ; FILE, AND IF FOUND, THE FLAG IS NOT SET. IN THIS CASE THE TEXT FROM THE
+ ; DRUG INGREDIENT FILE IS USED FOR COMPARISONS)
  ; IF THE VUID IS MISSING FROM THE VA MAPPING FILE VAMAP=N
  ; IF THE VUID IS PRESENT IN THE VA MAPPING FILE, BUT THE RXNORM
@@ -115,4 +120,5 @@
  . D GETN1^C0CRNF("C0CB",176.111,C0CZX,"B","ALL") ;GET FROM VA MAPPING FILE
  . D GETN1^C0CRNF("C0CD",50.68,C0CZX,"AVUID","ALL") ;GET FROM NDF
+ . D GETN1^C0CRNF("C0CE",50.416,C0CZX,"AVUID","ALL") ;GET FROM DRUG INGREDIENTS
  . ;D SETFDA("VUID",$$ZVALUE("CODE")) ;SET THE VUID CODE
  . D SETFDA("RXNORM",$$ZVALUE("RXCUI")) ;SET THE RXNORM CODE
@@ -129,10 +135,13 @@
  . . D SETFDA("VAMAP","N") ;MARK AS MISSING FROM VA MAPPING FILE
  . ; NATIONAL DRUG FILE TESTS
- . I $$ZVALUE("VUID","C0CD")=C0CZX D  ; FOUND IN NATIONAL DRUG FILE
+ . I ($$ZVALUE("VUID","C0CD")=C0CZX)!($$ZVALUE("VUID","C0CE")=C0CZX) D  ; 
+ . . ;FOUND IN NATIONAL DRUG FILE OR DRUG INGREDIENT FILE
  . . S NDFVCNT=NDFVCNT+1 ;INCREMENT VUID FOUND COUNT
  . . I $$ZVALUE("NAME","C0CD")'=$$ZVALUE("STR") D  ;NDF TEXT DOESN'T MATCH
- . . . S NDFTCNT=NDFTCNT+1 ; INCREMENT MISMATCHED NDF TEXT COUNT
- . . . D SETFDA("TXTM","N") ; SET TEXT MATCH FLAG TO N
- . . . D SETFDA("NDF TEXT",$$ZVALUE("NAME","C0CD")) ;POST THE TEXT
+ . . . I $$ZVALUE("NAME","C0CE")'=$$ZVALUE("STR") D  ;DRUG ING FILE ALSO
+ . . . . S NDFTCNT=NDFTCNT+1 ; INCREMENT MISMATCHED NDF TEXT COUNT
+ . . . . D SETFDA("TXTM","N") ; SET TEXT MATCH FLAG TO N
+ . . . . D SETFDA("NDF TEXT",$$ZVALUE("NAME","C0CD")) ;POST THE TEXT
+ . . . . D SETFDA("NAT DRUG TEXT",$$ZVALUE("NAME","C0CE")) ;POST TEXT
  . E  D  ;
  . . D SETFDA("NDF","N") ;MARK AS MISSING