fhirsmith 0.4.2 → 0.5.0

package/tx/cs/cs-lang.js

@@ -89,7 +89,7 @@ class IETFLanguageCodeProvider extends CodeSystemProvider {
   // ========== Code Information Methods ==========
 
   async code(code) {
-    
+
     const ctxt = await this.#ensureContext(code);
     if (ctxt instanceof Language) {
       return ctxt.code;
@@ -98,13 +98,26 @@ class IETFLanguageCodeProvider extends CodeSystemProvider {
   }
 
   async display(code) {
-    
+
     const ctxt = await this.#ensureContext(code);
     if (!ctxt) {
       return null;
     }
-    if (this.opContext.langs.isEnglishOrNothing()) {
-      return this.languageDefinitions.present(ctxt).trim();
+    if (!this.opContext.langs.isEnglishOrNothing()) {
+      // Try translated display for the primary requested language
+      const primaryLang = this.opContext.langs.getPrimary();
+      if (primaryLang && primaryLang.language) {
+        const langTranslation = this.languageDefinitions.getTranslatedDisplayForLang(ctxt.language, primaryLang.language);
+        if (langTranslation && langTranslation !== ctxt.language) {
+          if (ctxt.isLangRegion()) {
+            const regionTranslation = this.languageDefinitions.getTranslatedDisplayForRegion(ctxt.region, primaryLang.language);
+            if (regionTranslation && regionTranslation !== ctxt.region) {
+              return `${langTranslation} (${regionTranslation})`;
+            }
+          }
+          return langTranslation;
+        }
+      }
     }
     let disp = this._displayFromSupplements(ctxt.code);
     if (disp) {
@@ -114,31 +127,26 @@ class IETFLanguageCodeProvider extends CodeSystemProvider {
   }
 
   async definition(code) {
-    
     await this.#ensureContext(code);
     return null; // No definitions for language codes
   }
 
   async isAbstract(code) {
-    
     await this.#ensureContext(code);
     return false; // Language codes are not abstract
   }
 
   async isInactive(code) {
-    
     await this.#ensureContext(code);
     return false; // We don't track inactive language codes
   }
 
   async isDeprecated(code) {
-    
     await this.#ensureContext(code);
     return false; // We don't track deprecated language codes
   }
 
   async designations(code, displays) {
-    
     const ctxt = await this.#ensureContext(code);
     const designations = [];
     if (ctxt != null) {
@@ -149,8 +157,12 @@ class IETFLanguageCodeProvider extends CodeSystemProvider {
         const regionDisplay = this.languageDefinitions.getDisplayForRegion(ctxt.region);
         const regionVariant = `${langDisplay} (${regionDisplay})`;
         const regionVariant2 = `${langDisplay} (Region=${regionDisplay})`;
-        displays.addDesignation(false, 'active', 'en', CodeSystem.makeUseForDisplay(), regionVariant);
+        const regionVariant3 = `${langDisplay}-${regionDisplay}`;
+        const regionVariant4 = `${langDisplay}-${regionDisplay.toUpperCase()}`;
         displays.addDesignation(false, 'active', 'en', CodeSystem.makeUseForDisplay(), regionVariant2);
+        displays.addDesignation(false, 'active', 'en', CodeSystem.makeUseForDisplay(), regionVariant3);
+        displays.addDesignation(false, 'active', 'en', CodeSystem.makeUseForDisplay(), regionVariant4);
+        displays.addDesignation(false, 'active', 'en', CodeSystem.makeUseForDisplay(), regionVariant);
       }
       // add alternative displays if available
       const displayCount = this.languageDefinitions.displayCount(ctxt);
@@ -167,6 +179,32 @@ class IETFLanguageCodeProvider extends CodeSystemProvider {
           }
         }
       }
+      // add translated designations from CSV data
+      const translationLangs = ['fr', 'de', 'es', 'ar', 'zh', 'ru', 'ja', 'sw'];
+      // languages that don't have upper/lower case distinction
+      const caselessLangs = new Set(['ar', 'zh', 'ja']);
+
+      for (const tLang of translationLangs) {
+        const langTranslation = this.languageDefinitions.getTranslatedDisplayForLang(ctxt.language, tLang);
+        if (langTranslation && langTranslation !== ctxt.language) {
+          if (ctxt.isLangRegion()) {
+            const regionTranslation = this.languageDefinitions.getTranslatedDisplayForRegion(ctxt.region, tLang);
+            if (regionTranslation && regionTranslation !== ctxt.region) {
+              const translatedDisplay = `${langTranslation} (${regionTranslation})`;
+              displays.addDesignation(false, 'active', tLang, CodeSystem.makeUseForDisplay(), translatedDisplay);
+              displays.addDesignation(false, 'active', tLang, CodeSystem.makeUseForDisplay(), `${langTranslation} (Region=${regionTranslation})`);
+              displays.addDesignation(false, 'active', tLang, CodeSystem.makeUseForDisplay(), `${langTranslation}-${regionTranslation}`);
+              if (!caselessLangs.has(tLang)) {
+                displays.addDesignation(false, 'active', tLang, CodeSystem.makeUseForDisplay(), `${langTranslation}-${regionTranslation.toUpperCase()}`);
+              }
+            } else {
+              displays.addDesignation(false, 'active', tLang, CodeSystem.makeUseForDisplay(), langTranslation);
+            }
+          } else {
+            displays.addDesignation(false, 'active', tLang, CodeSystem.makeUseForDisplay(), langTranslation);
+          }
+        }
+      }
       this._listSupplementDesignations(ctxt.code, displays);
     }
     return designations;
@@ -194,7 +232,7 @@ class IETFLanguageCodeProvider extends CodeSystemProvider {
   // ========== Lookup Methods ==========
 
   async locate(code) {
-    
+
     assert(!code || typeof code === 'string', 'code must be string');
     if (!code) return { context: null, message: 'Empty code' };
 
@@ -209,7 +247,7 @@ class IETFLanguageCodeProvider extends CodeSystemProvider {
   // ========== Filter Methods ==========
 
   async doesFilter(prop, op, value) {
-    
+
     assert(prop != null && typeof prop === 'string', 'prop must be a non-null string');
     assert(op != null && typeof op === 'string', 'op must be a non-null string');
     assert(value != null && typeof value === 'string', 'value must be a non-null string');
@@ -222,7 +260,7 @@ class IETFLanguageCodeProvider extends CodeSystemProvider {
   }
 
   async searchFilter(filterContext, filter, sort) {
-    
+
     assert(filterContext && filterContext instanceof FilterExecutionContext, 'filterContext must be a FilterExecutionContext');
     assert(filter && typeof filter === 'string', 'filter must be a non-null string');
     assert(typeof sort === 'boolean', 'sort must be a boolean');
@@ -232,7 +270,7 @@ class IETFLanguageCodeProvider extends CodeSystemProvider {
 
 
   async filter(filterContext, prop, op, value) {
-    
+
     assert(filterContext && filterContext instanceof FilterExecutionContext, 'filterContext must be a FilterExecutionContext');
     assert(prop != null && typeof prop === 'string', 'prop must be a non-null string');
     assert(op != null && typeof op === 'string', 'op must be a non-null string');
@@ -258,13 +296,13 @@ class IETFLanguageCodeProvider extends CodeSystemProvider {
   }
 
   async executeFilters(filterContext) {
-    
+
     assert(filterContext && filterContext instanceof FilterExecutionContext, 'filterContext must be a FilterExecutionContext');
     return filterContext.filters;
   }
 
   async filterSize(filterContext, set) {
-    
+
     assert(filterContext && filterContext instanceof FilterExecutionContext, 'filterContext must be a FilterExecutionContext');
     assert(set && set instanceof IETFLanguageCodeFilter, 'set must be a IETFLanguageCodeFilter');
 
@@ -272,27 +310,27 @@ class IETFLanguageCodeProvider extends CodeSystemProvider {
   }
 
   async filtersNotClosed(filterContext) {
-    
+
     assert(filterContext && filterContext instanceof FilterExecutionContext, 'filterContext must be a FilterExecutionContext');
     return true; // Grammar-based system is not closed
   }
 
   async filterMore(filterContext, set) {
-    
+
     assert(filterContext && filterContext instanceof FilterExecutionContext, 'filterContext must be a FilterExecutionContext');
     assert(set && set instanceof IETFLanguageCodeFilter, 'set must be a IETFLanguageCodeFilter');
     throw new Error('Language valuesets cannot be expanded as they are based on a grammar');
   }
 
   async filterConcept(filterContext, set) {
-    
+
     assert(filterContext && filterContext instanceof FilterExecutionContext, 'filterContext must be a FilterExecutionContext');
     assert(set && set instanceof IETFLanguageCodeFilter, 'set must be a IETFLanguageCodeFilter');
     throw new Error('Language valuesets cannot be expanded as they are based on a grammar');
   }
 
   async filterLocate(filterContext, set, code) {
-    
+
     assert(filterContext && filterContext instanceof FilterExecutionContext, 'filterContext must be a FilterExecutionContext');
     assert(set && set instanceof IETFLanguageCodeFilter, 'set must be a IETFLanguageCodeFilter');
     assert(typeof code === 'string', 'code must be non-null string');
@@ -341,7 +379,7 @@ class IETFLanguageCodeProvider extends CodeSystemProvider {
   }
 
   async filterCheck(filterContext, set, concept) {
-    
+
     assert(filterContext && filterContext instanceof FilterExecutionContext, 'filterContext must be a FilterExecutionContext');
     assert(set && set instanceof IETFLanguageCodeFilter, 'set must be a IETFLanguageCodeFilter');
     const ctxt = await this.#ensureContext(concept);
@@ -386,7 +424,7 @@ class IETFLanguageCodeProvider extends CodeSystemProvider {
   // ========== Additional Methods ==========
 
   async sameConcept(a, b) {
-    
+
     const codeA = await this.code(a);
     const codeB = await this.code(b);
     return codeA === codeB;

package/tx/cs/cs-loinc.js

@@ -2,8 +2,9 @@ const sqlite3 = require('sqlite3').verbose();
 const assert = require('assert');
 const { CodeSystem } = require('../library/codesystem');
 const { Language, Languages} = require('../../library/languages');
-const { CodeSystemProvider, CodeSystemFactoryProvider} = require('./cs-api');
+const { CodeSystemFactoryProvider} = require('./cs-api');
 const { validateOptionalParameter, validateArrayParameter} = require("../../library/utilities");
+const {BaseCSServices} = require("./cs-base");
 
 // Context kinds matching Pascal enum
 const LoincProviderContextKind = {
@@ -13,6 +14,17 @@ const LoincProviderContextKind = {
   ANSWER: 3   // lpckAnswer
 };
 
+const classTypes = {
+  '1': 'Laboratory class',
+  '2': 'Clinical class',
+  '3': 'Claims attachments',
+  '4': 'Surveys',
+  'Laboratory class' : '1',
+  'Clinical class' : '2',
+  'Claims attachments' : '3',
+  'Surveys' : '4'
+};
+
 class DescriptionCacheEntry {
   constructor(display, lang, value, dtype) {
     this.display = display;
@@ -96,7 +108,7 @@ class LoincPrep {
   }
 }
 
-class LoincServices extends CodeSystemProvider {
+class LoincServices extends BaseCSServices {
   constructor(opContext, supplements, db, sharedData) {
     super(opContext, supplements);
     this.db = db;
@@ -293,10 +305,10 @@ class LoincServices extends CodeSystemProvider {
 
     // Run all property queries in parallel — they're independent reads on the same key
     await Promise.all([
-      this.#addRelationshipProperties(ctxt, params),
-      this.#addConceptProperties(ctxt, params),
-      this.#addStatusProperty(ctxt, params),
-      this.#addRelatedNames(ctxt, params)
+      this.#addRelationshipProperties(ctxt, props, params),
+      this.#addConceptProperties(ctxt, props,params),
+      this.#addStatusProperty(ctxt, props,params),
+      this.#addRelatedNames(ctxt, props,params)
     ]);
   }
 
@@ -311,7 +323,7 @@ class LoincServices extends CodeSystemProvider {
     }
   }
 
-  async #addRelationshipProperties(ctxt, params) {
+  async #addRelationshipProperties(ctxt, props, params) {
     return new Promise((resolve, reject) => {
       const sql = `
           SELECT RelationshipTypes.Description as Relationship, Codes.Code, Codes.Description as Value
@@ -326,7 +338,9 @@ class LoincServices extends CodeSystemProvider {
           reject(err);
         } else {
           for (const row of rows) {
-            this.#addCodeProperty(params, 'property', row.Relationship, row.Code);
+            if (this._hasProp(props, row.Relationship, true)) {
+              this._addCodeProperty(params, 'property', row.Relationship, row.Code);
+            }
           }
           resolve();
         }
@@ -334,7 +348,7 @@ class LoincServices extends CodeSystemProvider {
     });
   }
 
-  async #addConceptProperties(ctxt, params) {
+  async #addConceptProperties(ctxt, props, params) {
     return new Promise((resolve, reject) => {
       const sql = `
           SELECT PropertyTypes.Description, PropertyValues.Value
@@ -349,7 +363,14 @@ class LoincServices extends CodeSystemProvider {
           reject(err);
         } else {
           for (const row of rows) {
-            this.#addStringProperty(params, 'property', row.Description, row.Value);
+            if (this._hasProp(props, row.Description, true)) {
+              if (row.Description == 'CLASSTYPE') {
+                this._addStringProperty(params, 'property', row.Description, classTypes[row.Value])
+                  .part.push({name: 'description', valueString: row.Value});
+              } else {
+                this._addStringProperty(params, 'property', row.Description, row.Value);
+              }
+            }
           }
           resolve();
         }
@@ -357,7 +378,7 @@ class LoincServices extends CodeSystemProvider {
     });
   }
 
-  async #addStatusProperty(ctxt, params) {
+  async #addStatusProperty(ctxt, props, params) {
     return new Promise((resolve, reject) => {
       const sql = 'SELECT StatusKey FROM Codes WHERE CodeKey = ? AND StatusKey != 0';
 
@@ -367,7 +388,9 @@ class LoincServices extends CodeSystemProvider {
         } else if (row) {
           const statusDesc = this.statusCodes.get(row.StatusKey.toString());
           if (row.StatusKey && statusDesc) {
-            this.#addStringProperty(params, 'property', 'STATUS', statusDesc);
+            if (this._hasProp(props, 'STATUS', true)) {
+              this._addStringProperty(params, 'property', 'STATUS', statusDesc);
+            }
           }
           resolve();
         } else {
@@ -377,14 +400,20 @@ class LoincServices extends CodeSystemProvider {
     });
   }
 
-  async #addRelatedNames(ctxt, params) {
+  async #addRelatedNames(ctxt, props, params) {
     const loaded = await this.#loadRelatedNames(ctxt);
     for (let d of loaded) {
-      this.#addProperty(params, 'property', 'RELATEDNAMES2', d.value, d.lang);
+      if (this._hasProp(props, 'RELATEDNAMES2', true)) {
+        this._addProperty(params, 'property', 'RELATEDNAMES2', d.value, d.lang);
+      }
     }
   }
 
-  async #addAllDesignations(ctxt, params) {
+  async #addAllDesignations(ctxt, props, params) {
+    if (!this._hasProp(props, 'designation', true)) {
+      return;
+    }
+
     return new Promise((resolve, reject) => {
       const sql = `
           SELECT Languages.Code as Lang, DescriptionTypes.Description as DType, Descriptions.Value
@@ -400,7 +429,7 @@ class LoincServices extends CodeSystemProvider {
           reject(err);
         } else {
           for (const row of rows) {
-            this.#addProperty(params, 'designation', row.dtype, row.value, row.lang);
+            this._addProperty(params, 'designation', row.dtype, row.value, row.lang);
           }
           resolve();
         }
@@ -408,57 +437,6 @@ class LoincServices extends CodeSystemProvider {
     });
   }
 
-  #addProperty(params, type, name, value, language = null) {
-
-    const property = {
-      name: type,
-      part: [
-        { name: 'code', valueCode: name },
-        { name: 'value', valueString: value }
-      ]
-    };
-
-    if (language) {
-      property.part.push({ name: 'language', valueCode: language });
-    }
-
-    params.push(property);
-  }
-
-  #addCodeProperty(params, type, name, value, language = null) {
-
-    const property = {
-      name: type,
-      part: [
-        { name: 'code', valueCode: name },
-        { name: 'value', valueCode: value }
-      ]
-    };
-
-    if (language) {
-      property.part.push({ name: 'language', valueCode: language });
-    }
-
-    params.push(property);
-  }
-
-  #addStringProperty(params, type, name, value, language = null) {
-
-    const property = {
-      name: type,
-      part: [
-        { name: 'code', valueCode: name },
-        { name: 'value', valueString: value }
-      ]
-    };
-
-    if (language) {
-      property.part.push({ name: 'language', valueCode: language });
-    }
-
-    params.push(property);
-  }
-
   async #getDisplaysForContext(ctxt, langs) {
     validateOptionalParameter(langs, "langs", Languages);
     const displays = [new LoincDisplay('en-US', ctxt.desc)];
@@ -689,11 +667,11 @@ class LoincServices extends CodeSystemProvider {
 
     // LIST filter
     if (prop === 'LIST' && op === '=' && this.codes.has(value)) {
-      sql = `SELECT TargetKey as Key FROM Relationships
+      sql = `SELECT DISTINCT TargetKey as Key FROM Relationships
              WHERE RelationshipTypeKey = ${this.relationships.get('Answer')}
                AND SourceKey IN (SELECT CodeKey FROM Codes WHERE Code = '${this.#sqlWrapString(value)}')
              ORDER BY SourceKey ASC`;
-      lsql = `SELECT COUNT(TargetKey) FROM Relationships
+      lsql = `SELECT COUNT(DISTINCT TargetKey) FROM Relationships
               WHERE RelationshipTypeKey = ${this.relationships.get('Answer')}
                 AND SourceKey IN (SELECT CodeKey FROM Codes WHERE Code = '${this.#sqlWrapString(value)}')
                 AND TargetKey = `;
@@ -701,16 +679,16 @@ class LoincServices extends CodeSystemProvider {
     // answers-for filter
     else if (prop === 'answers-for' && op === '=') {
       if (value.startsWith('LL')) {
-        sql = `SELECT TargetKey as Key FROM Relationships
+        sql = `SELECT DISTINCT TargetKey as Key FROM Relationships
                WHERE RelationshipTypeKey = ${this.relationships.get('Answer')}
                  AND SourceKey IN (SELECT CodeKey FROM Codes WHERE Code = '${this.#sqlWrapString(value)}')
                ORDER BY SourceKey ASC`;
-        lsql = `SELECT COUNT(TargetKey) FROM Relationships
+        lsql = `SELECT COUNT(DISTINCT TargetKey) FROM Relationships
                 WHERE RelationshipTypeKey = ${this.relationships.get('Answer')}
                   AND SourceKey IN (SELECT CodeKey FROM Codes WHERE Code = '${this.#sqlWrapString(value)}')
                   AND TargetKey = `;
       } else {
-        sql = `SELECT TargetKey as Key FROM Relationships
+        sql = `SELECT DISTINCT TargetKey as Key FROM Relationships
                WHERE RelationshipTypeKey = ${this.relationships.get('Answer')}
                  AND SourceKey IN (
                    SELECT SourceKey FROM Relationships
@@ -718,7 +696,7 @@ class LoincServices extends CodeSystemProvider {
                  AND TargetKey IN (SELECT CodeKey FROM Codes WHERE Code = '${this.#sqlWrapString(value)}')
                    )
                ORDER BY SourceKey ASC`;
-        lsql = `SELECT COUNT(TargetKey) FROM Relationships
+        lsql = `SELECT COUNT(DISTINCT TargetKey) FROM Relationships
                 WHERE RelationshipTypeKey = ${this.relationships.get('Answer')}
                   AND SourceKey IN (SELECT SourceKey FROM Relationships
                                     WHERE RelationshipTypeKey = ${this.relationships.get('answers-for')}
@@ -729,20 +707,20 @@ class LoincServices extends CodeSystemProvider {
     // Relationship equal filter
     else if (this.relationships.has(prop) && op === '=') {
       if (this.codes.has(value)) {
-        sql = `SELECT SourceKey as Key FROM Relationships
+        sql = `SELECT DISTINCT SourceKey as Key FROM Relationships
                WHERE RelationshipTypeKey = ${this.relationships.get(prop)}
                  AND TargetKey IN (SELECT CodeKey FROM Codes WHERE Code = '${this.#sqlWrapString(value)}')
                ORDER BY SourceKey ASC`;
-        lsql = `SELECT COUNT(SourceKey) FROM Relationships
+        lsql = `SELECT COUNT(DISTINCT SourceKey) FROM Relationships
                 WHERE RelationshipTypeKey = ${this.relationships.get(prop)}
                   AND TargetKey IN (SELECT CodeKey FROM Codes WHERE Code = '${this.#sqlWrapString(value)}')
                   AND SourceKey = `;
       } else {
-        sql = `SELECT SourceKey as Key FROM Relationships
+        sql = `SELECT DISTINCT SourceKey as Key FROM Relationships
                WHERE RelationshipTypeKey = ${this.relationships.get(prop)}
                  AND TargetKey IN (SELECT CodeKey FROM Codes WHERE Description = '${this.#sqlWrapString(value)}' COLLATE NOCASE)
                ORDER BY SourceKey ASC`;
-        lsql = `SELECT COUNT(SourceKey) FROM Relationships
+        lsql = `SELECT COUNT(DISTINCT SourceKey) FROM Relationships
                 WHERE RelationshipTypeKey = ${this.relationships.get(prop)}
                   AND TargetKey IN (SELECT CodeKey FROM Codes WHERE Description = '${this.#sqlWrapString(value)}' COLLATE NOCASE)
                   AND SourceKey = `;
@@ -751,11 +729,11 @@ class LoincServices extends CodeSystemProvider {
     // Relationship 'in' filter
     else if (this.relationships.has(prop) && op === 'in') {
       const codes = this.#commaListOfCodes(value);
-      sql = `SELECT SourceKey as Key FROM Relationships
+      sql = `SELECT DISTINCT SourceKey as Key FROM Relationships
              WHERE RelationshipTypeKey = ${this.relationships.get(prop)}
                AND TargetKey IN (SELECT CodeKey FROM Codes WHERE Code IN (${codes}))
              ORDER BY SourceKey ASC`;
-      lsql = `SELECT COUNT(SourceKey) FROM Relationships
+      lsql = `SELECT COUNT(DISTINCT SourceKey) FROM Relationships
               WHERE RelationshipTypeKey = ${this.relationships.get(prop)}
                 AND TargetKey IN (SELECT CodeKey FROM Codes WHERE Code IN (${codes}))
                 AND SourceKey = `;
@@ -763,20 +741,20 @@ class LoincServices extends CodeSystemProvider {
     // Relationship 'exists' filter
     else if (this.relationships.has(prop) && op === 'exists') {
       if (this.codes.has(value)) {
-        sql = `SELECT SourceKey as Key FROM Relationships
+        sql = `SELECT DISTINCT SourceKey as Key FROM Relationships
                WHERE RelationshipTypeKey = ${this.relationships.get(prop)}
                  AND EXISTS (SELECT CodeKey FROM Codes WHERE Code = '${this.#sqlWrapString(value)}')
                ORDER BY SourceKey ASC`;
-        lsql = `SELECT COUNT(SourceKey) FROM Relationships
+        lsql = `SELECT COUNT(DISTINCT SourceKey) FROM Relationships
                 WHERE RelationshipTypeKey = ${this.relationships.get(prop)}
                   AND EXISTS (SELECT CodeKey FROM Codes WHERE Code = '${this.#sqlWrapString(value)}')
                   AND SourceKey = `;
       } else {
-        sql = `SELECT SourceKey as Key FROM Relationships
+        sql = `SELECT DISTINCT SourceKey as Key FROM Relationships
                WHERE RelationshipTypeKey = ${this.relationships.get(prop)}
                  AND EXISTS (SELECT CodeKey FROM Codes WHERE Description = '${this.#sqlWrapString(value)}' COLLATE NOCASE)
                ORDER BY SourceKey ASC`;
-        lsql = `SELECT COUNT(SourceKey) FROM Relationships
+        lsql = `SELECT COUNT(DISTINCT SourceKey) FROM Relationships
                 WHERE RelationshipTypeKey = ${this.relationships.get(prop)}
                   AND EXISTS (SELECT CodeKey FROM Codes WHERE Description = '${this.#sqlWrapString(value)}' COLLATE NOCASE)
                   AND SourceKey = `;
@@ -791,11 +769,11 @@ class LoincServices extends CodeSystemProvider {
         'Description'
       );
       if (matchingKeys.length > 0) {
-        sql = `SELECT SourceKey as Key FROM Relationships
+        sql = `SELECT DISTINCT SourceKey as Key FROM Relationships
                WHERE RelationshipTypeKey = ${this.relationships.get(prop)}
                  AND TargetKey IN (${matchingKeys.join(',')})
                ORDER BY SourceKey ASC`;
-        lsql = `SELECT COUNT(SourceKey) FROM Relationships
+        lsql = `SELECT COUNT(DISTINCT SourceKey) FROM Relationships
                 WHERE RelationshipTypeKey = ${this.relationships.get(prop)}
                   AND TargetKey IN (${matchingKeys.join(',')})
                   AND SourceKey = `;
@@ -805,20 +783,14 @@ class LoincServices extends CodeSystemProvider {
     else if (this.propertyList.has(prop) && op === '=') {
       let actualValue = value;
       if (prop === 'CLASSTYPE' && ['1', '2', '3', '4'].includes(value)) {
-        const classTypes = {
-          '1': 'Laboratory class',
-          '2': 'Clinical class',
-          '3': 'Claims attachments',
-          '4': 'Surveys'
-        };
         actualValue = classTypes[value];
       }
-      sql = `SELECT CodeKey as Key FROM Properties, PropertyValues
+      sql = `SELECT DISTINCT CodeKey as Key FROM Properties, PropertyValues
              WHERE Properties.PropertyTypeKey = ${this.propertyList.get(prop)}
                AND Properties.PropertyValueKey = PropertyValues.PropertyValueKey
                AND PropertyValues.Value = '${this.#sqlWrapString(actualValue)}' COLLATE NOCASE
              ORDER BY CodeKey ASC`;
-      lsql = `SELECT COUNT(CodeKey) FROM Properties, PropertyValues
+      lsql = `SELECT COUNT(DISTINCT CodeKey) FROM Properties, PropertyValues
               WHERE Properties.PropertyTypeKey = ${this.propertyList.get(prop)}
                 AND Properties.PropertyValueKey = PropertyValues.PropertyValueKey
                 AND PropertyValues.Value = '${this.#sqlWrapString(actualValue)}' COLLATE NOCASE
@@ -827,12 +799,12 @@ class LoincServices extends CodeSystemProvider {
     // Property 'in' filter
     else if (this.propertyList.has(prop) && op === 'in') {
       const codes = this.#commaListOfCodes(value);
-      sql = `SELECT CodeKey as Key FROM Properties, PropertyValues
+      sql = `SELECT DISTINCT CodeKey as Key FROM Properties, PropertyValues
              WHERE Properties.PropertyTypeKey = ${this.propertyList.get(prop)}
                AND Properties.PropertyValueKey = PropertyValues.PropertyValueKey
                AND PropertyValues.Value IN (${codes}) COLLATE NOCASE
              ORDER BY CodeKey ASC`;
-      lsql = `SELECT COUNT(CodeKey) FROM Properties, PropertyValues
+      lsql = `SELECT COUNT(DISTINCT CodeKey) FROM Properties, PropertyValues
               WHERE Properties.PropertyTypeKey = ${this.propertyList.get(prop)}
                 AND Properties.PropertyValueKey = PropertyValues.PropertyValueKey
                 AND PropertyValues.Value IN (${codes}) COLLATE NOCASE
@@ -857,11 +829,11 @@ class LoincServices extends CodeSystemProvider {
         'PropertyValueKey'
       );
       if (matchingKeys.length > 0) {
-        sql = `SELECT CodeKey as Key FROM Properties
+        sql = `SELECT DISTINCT CodeKey as Key FROM Properties
                WHERE PropertyTypeKey = ${this.propertyList.get(prop)}
                  AND PropertyValueKey IN (${matchingKeys.join(',')})
                ORDER BY CodeKey ASC`;
-        lsql = `SELECT COUNT(CodeKey) FROM Properties
+        lsql = `SELECT COUNT(DISTINCT CodeKey) FROM Properties
                 WHERE PropertyTypeKey = ${this.propertyList.get(prop)}
                   AND PropertyValueKey IN (${matchingKeys.join(',')})
                   AND CodeKey = `;
@@ -1000,7 +972,6 @@ class LoincServices extends CodeSystemProvider {
   }
 
   async filterSize(filterContext, set) {
-
     return set.keys.length;
   }
 

package/tx/cs/cs-mimetypes.js

@@ -184,6 +184,10 @@ class MimeTypeServices extends CodeSystemProvider {
     return null;
   }
 
+  isNotClosed() {
+    return true;
+  }
+
 }
 
 class MimeTypeServicesFactory extends CodeSystemFactoryProvider {

package/tx/cs/cs-ndc.js

@@ -109,6 +109,12 @@ class NdcServices extends CodeSystemProvider {
     return ctxt ? !ctxt.active : false;
   }
 
+  async getStatus(code) {
+
+    const ctxt = await this.#ensureContext(code);
+    return ctxt.active ? "active" : "inactive";
+  }
+
   async isDeprecated(code) {
     await this.#ensureContext(code);
     return false; // NDC doesn't track deprecated status separately