fix prompt

Author: genevaneva

js/ai-expand.js

@@ -51,12 +51,18 @@ CRITICAL RULES:
 
     const typeSpecific = {
       dx: `
-You are generating diagnosis search keywords.
-- Include the full disease name AND common abbreviations
-- Include related conditions and subtypes
-- For cancer: include organ-specific terms, staging terms, histology types
-- For chronic diseases: include all stages and complications
-- Example: "type 2 diabetes" should return: diabetes, diabetic, dm2, hyperglycemia, insulin resistance, etc.`,
+You are generating search keywords to match ICD-10-CM code descriptions in a clinical data warehouse.
+The dictionary contains the literal text of ICD-10-CM descriptions (e.g. "Malignant neoplasm of breast").
+Keywords are matched as substrings against those descriptions.
+
+RULES FOR DX KEYWORDS:
+- Use formal ICD-10-CM terminology that uniquely identifies the disease or diagnosis
+- Include the disease name, anatomical site, and histology/morphology terms as they appear in ICD descriptions
+- DO NOT include: laterality (right, left, bilateral), generic qualifiers (unspecified, in situ, acute, chronic, primary, secondary, with complications, without complications), or common words that appear across many unrelated diagnoses
+- Do NOT include abbreviations, clinical slang, or lay terms
+- Focus on the words that distinguish THIS diagnosis from others
+- Example: "breast cancer" → malignant neoplasm, breast, carcinoma, adenocarcinoma, nipple, areola, axillary tail
+- Example: "type 2 diabetes" → diabetes mellitus, type 2, diabetic`,
 
       medication: `
 You are generating medication search keywords.

js/app.js

@@ -208,25 +208,26 @@ const DictApp = (function () {
    */
   function buildMatcher(keyword) {
     const kw = keyword.toLowerCase().trim();
-    const startsWithStar = kw.startsWith('*');
-    const endsWithStar = kw.endsWith('*');
     const core = kw.replace(/^\*+|\*+$/g, '');
 
     if (!core) return () => false;
 
-    if (startsWithStar && endsWithStar) {
-      // *term* → contains
-      return (val) => val.includes(core);
-    } else if (endsWithStar) {
-      // term* → starts with (word-boundary aware: also matches mid-string word starts)
-      return (val) => val.includes(core);
-    } else if (startsWithStar) {
-      // *term → ends with
-      return (val) => val.includes(core);
-    } else {
-      // no wildcard → contains (LIKE '%term%')
-      return (val) => val.includes(core);
+    // Multi-word phrase: split on whitespace and require ALL words to appear
+    // somewhere in the row (AND logic across words, OR logic across cells).
+    // e.g. "neoplasm breast" matches any row containing both words.
+    const words = core.split(/\s+/).filter(w => w);
+    if (words.length > 1) {
+      return function (rowValues) {
+        return words.every(function (word) {
+          return rowValues.some(function (val) { return val.includes(word); });
+        });
+      };
     }
+
+    // Single word — check if any cell in the row contains it
+    return function (rowValues) {
+      return rowValues.some(function (val) { return val.includes(core); });
+    };
   }
 
   /**
@@ -276,10 +277,8 @@ const DictApp = (function () {
       // searchData is an array of the rendered column values (strings)
       const rowText = searchData.map(s => (s || '').toLowerCase());
 
-      // OR logic: match if ANY keyword matches ANY column text
-      return matchers.some(matcher => {
-        return rowText.some(cellText => matcher(cellText));
-      });
+      // OR logic across chips; within a multi-word chip, AND logic across words
+      return matchers.some(matcher => matcher(rowText));
     };
     filterFn._kwFilterType = type;
     $.fn.dataTable.ext.search.push(filterFn);
@@ -324,9 +323,7 @@ const DictApp = (function () {
           return !k.startsWith('_') && k !== 'desired' && k !== 'category' && k !== 'keyword_matched';
         })
         .map(function (k) { return (row[k] || '').toString().toLowerCase(); });
-      return matchers.some(function (matcher) {
-        return rowValues.some(function (val) { return matcher(val); });
-      });
+      return matchers.some(function (matcher) { return matcher(rowValues); });
     });
 
     // Auto-desire every matched row and record which keyword triggered the match
@@ -341,7 +338,7 @@ const DictApp = (function () {
         .map(function (k) { return (row[k] || '').toString().toLowerCase(); });
       var matchedKw = '';
       for (var i = 0; i < kwMatchers.length; i++) {
-        if (rowValues.some(function (val) { return kwMatchers[i].matcher(val); })) {
+        if (kwMatchers[i].matcher(rowValues)) {
           matchedKw = kwMatchers[i].keyword;
           break;
         }
@@ -380,7 +377,7 @@ const DictApp = (function () {
       const rowValues = Object.values(row).map(v => (v || '').toString().toLowerCase());
       let matchedKw = '';
       for (const { keyword, matcher } of matchers) {
-        if (rowValues.some(val => matcher(val))) {
+        if (matcher(rowValues)) {
           matchedKw = keyword;
           break;
         }