@precisa-saude/fhir-ocr-utils 0.38.1 → 0.38.3

package/dist/cli.js

@@ -33,6 +33,9 @@ var UNAMBIGUOUS_SHORT_NAMES = /* @__PURE__ */ new Set([
   "alt",
   "ast",
   "bun",
+  // Creatina quinase: Fleury e a Quest imprimem só "CK", e sem a sigla o
+  // modelo ficava sem âncora e encaixava o valor em outro exame (PRE-486).
+  "ck",
   "wbc",
   "rbc",
   "mcv",
@@ -163,6 +166,9 @@ var GENETIC_CONTEXT_PATTERNS = [
   /\bhomozigot/,
   /\bsequence change\b/
 ];
+var SUBTYPE_AFTER = {
+  CK: /^[\s-]*mb\b/i
+};
 
 // src/body-region.ts
 var WHOLE_BODY_COMPOSITION_CODES = /* @__PURE__ */ new Set([
@@ -287,18 +293,30 @@ function mentionsUrinalysisHeader(normalizedText) {
   return ANY_HEADER.test(normalizedText);
 }
 var URINALYSIS_SECTION_NAMES = /* @__PURE__ */ new Map([
+  // "Aspecto", "Densidade" e "Corpos Cetônicos" são as grafias dos laudos
+  // brasileiros, e "Leukocytes", "Erythrocytes" e "Eritrócitos" as do
+  // sedimento. Fora deste mapa, "Corpos Cetônicos" e "Leukocytes" casam
+  // exames de outro painel (o beta-hidroxibutirato, o leucograma), a linha
+  // conta como `foreign` e a seção acabava ali, levando junto todas as linhas
+  // de baixo, que voltavam para os códigos do sangue (PRE-486).
+  ["aspecto", "Appearance_Urine"],
   ["bacteria", "Bacteria_Urine"],
   ["bacterias", "Bacteria_Urine"],
   ["bilirrubina", "Bilirubin_Urine"],
   ["bilirubin", "Bilirubin_Urine"],
   ["cetonas", "Ketones_Urine"],
   ["color", "Color_Urine"],
+  ["corpos cetonicos", "Ketones_Urine"],
   ["cor", "Color_Urine"],
+  ["densidade", "SpecificGravity_Urine"],
+  ["eritrocitos", "RBC_Urine"],
+  ["erythrocytes", "RBC_Urine"],
   ["glicose", "Glucose_Urine"],
   ["glucose", "Glucose_Urine"],
   ["hemacias", "RBC_Urine"],
   ["ketones", "Ketones_Urine"],
   ["leucocitos", "Leukocytes_Urine"],
+  ["leukocytes", "Leukocytes_Urine"],
   ["nitrite", "Nitrite_Urine"],
   ["nitrito", "Nitrite_Urine"],
   ["ph", "pH_Urine"],
@@ -681,6 +699,9 @@ function findBiomarkersInText(ocrText) {
       if (qualifiedByBodyRegion(entry.code, before) || followedByPercent(entry.code, after)) {
         continue;
       }
+      if (SUBTYPE_AFTER[entry.code]?.test(after)) {
+        continue;
+      }
       if (girth && SKINFOLD_SITE_CODES.has(entry.code)) {
         continue;
       }
@@ -1239,7 +1260,7 @@ async function main() {
     strict: false
   });
   if (values.version) {
-    process.stdout.write(`${"0.38.1"}
+    process.stdout.write(`${"0.38.3"}
 `);
     return;
   }

package/dist/index.cjs

@@ -17,6 +17,9 @@ var UNAMBIGUOUS_SHORT_NAMES = /* @__PURE__ */ new Set([
   "alt",
   "ast",
   "bun",
+  // Creatina quinase: Fleury e a Quest imprimem só "CK", e sem a sigla o
+  // modelo ficava sem âncora e encaixava o valor em outro exame (PRE-486).
+  "ck",
   "wbc",
   "rbc",
   "mcv",
@@ -147,6 +150,9 @@ var GENETIC_CONTEXT_PATTERNS = [
   /\bhomozigot/,
   /\bsequence change\b/
 ];
+var SUBTYPE_AFTER = {
+  CK: /^[\s-]*mb\b/i
+};
 
 // src/body-region.ts
 var WHOLE_BODY_COMPOSITION_CODES = /* @__PURE__ */ new Set([
@@ -271,18 +277,30 @@ function mentionsUrinalysisHeader(normalizedText) {
   return ANY_HEADER.test(normalizedText);
 }
 var URINALYSIS_SECTION_NAMES = /* @__PURE__ */ new Map([
+  // "Aspecto", "Densidade" e "Corpos Cetônicos" são as grafias dos laudos
+  // brasileiros, e "Leukocytes", "Erythrocytes" e "Eritrócitos" as do
+  // sedimento. Fora deste mapa, "Corpos Cetônicos" e "Leukocytes" casam
+  // exames de outro painel (o beta-hidroxibutirato, o leucograma), a linha
+  // conta como `foreign` e a seção acabava ali, levando junto todas as linhas
+  // de baixo, que voltavam para os códigos do sangue (PRE-486).
+  ["aspecto", "Appearance_Urine"],
   ["bacteria", "Bacteria_Urine"],
   ["bacterias", "Bacteria_Urine"],
   ["bilirrubina", "Bilirubin_Urine"],
   ["bilirubin", "Bilirubin_Urine"],
   ["cetonas", "Ketones_Urine"],
   ["color", "Color_Urine"],
+  ["corpos cetonicos", "Ketones_Urine"],
   ["cor", "Color_Urine"],
+  ["densidade", "SpecificGravity_Urine"],
+  ["eritrocitos", "RBC_Urine"],
+  ["erythrocytes", "RBC_Urine"],
   ["glicose", "Glucose_Urine"],
   ["glucose", "Glucose_Urine"],
   ["hemacias", "RBC_Urine"],
   ["ketones", "Ketones_Urine"],
   ["leucocitos", "Leukocytes_Urine"],
+  ["leukocytes", "Leukocytes_Urine"],
   ["nitrite", "Nitrite_Urine"],
   ["nitrito", "Nitrite_Urine"],
   ["ph", "pH_Urine"],
@@ -665,6 +683,9 @@ function findBiomarkersInText(ocrText) {
       if (qualifiedByBodyRegion(entry.code, before) || followedByPercent(entry.code, after)) {
         continue;
       }
+      if (_optionalChain([SUBTYPE_AFTER, 'access', _7 => _7[entry.code], 'optionalAccess', _8 => _8.test, 'call', _9 => _9(after)])) {
+        continue;
+      }
       if (girth && SKINFOLD_SITE_CODES.has(entry.code)) {
         continue;
       }
@@ -892,8 +913,8 @@ function allowedKeys(anchors) {
 }
 function withScannedMethod(biomarker, anchors) {
   const code = biomarker.loinc ? _fhir.loincToCode.call(void 0, biomarker.loinc) : void 0;
-  if (!code || !_optionalChain([_fhir.getDefinitionByCode.call(void 0, code), 'optionalAccess', _7 => _7.methodVariants, 'optionalAccess', _8 => _8.length])) return biomarker;
-  const scanned = _optionalChain([anchors, 'access', _9 => _9.matches, 'access', _10 => _10.find, 'call', _11 => _11((m) => m.code === code), 'optionalAccess', _12 => _12.methodLoinc]);
+  if (!code || !_optionalChain([_fhir.getDefinitionByCode.call(void 0, code), 'optionalAccess', _10 => _10.methodVariants, 'optionalAccess', _11 => _11.length])) return biomarker;
+  const scanned = _optionalChain([anchors, 'access', _12 => _12.matches, 'access', _13 => _13.find, 'call', _14 => _14((m) => m.code === code), 'optionalAccess', _15 => _15.methodLoinc]);
   const loinc = _nullishCoalesce(scanned, () => ( _fhir.codeToLoinc.call(void 0, code)));
   return loinc && loinc !== biomarker.loinc ? { ...biomarker, loinc } : biomarker;
 }
@@ -983,7 +1004,7 @@ function buildPrompt(text, allowed) {
 }
 function stripFence(raw) {
   const fenced = /```(?:json)?\s*([\s\S]*?)```/.exec(raw);
-  return (_nullishCoalesce(_optionalChain([fenced, 'optionalAccess', _13 => _13[1]]), () => ( raw))).trim();
+  return (_nullishCoalesce(_optionalChain([fenced, 'optionalAccess', _16 => _16[1]]), () => ( raw))).trim();
 }
 async function extractWithModel(text, options) {
   const { apiKey, baseUrl, headers = {}, model, responseFormat, timeoutMs = 3e5 } = options;
@@ -1023,7 +1044,7 @@ async function extractWithModel(text, options) {
     throw new Error(`${String(response.status)} de ${baseUrl}: ${await response.text()}`);
   }
   const body = await response.json();
-  const raw = _nullishCoalesce(_optionalChain([body, 'access', _14 => _14.choices, 'optionalAccess', _15 => _15[0], 'optionalAccess', _16 => _16.message, 'optionalAccess', _17 => _17.content]), () => ( ""));
+  const raw = _nullishCoalesce(_optionalChain([body, 'access', _17 => _17.choices, 'optionalAccess', _18 => _18[0], 'optionalAccess', _19 => _19.message, 'optionalAccess', _20 => _20.content]), () => ( ""));
   const tookMs = Date.now() - startedAt;
   try {
     return { payload: JSON.parse(stripFence(raw)), raw, tookMs };