adding back the unmapped codes

CDCgov · Jan 13, 2025 · c6460a1 · c6460a1
1 parent 2ae5856
commit c6460a1
Showing 1 changed file with 38 additions and 21 deletions.
diff --git a/prime-router/src/main/kotlin/azure/ConditionMapper.kt b/prime-router/src/main/kotlin/azure/ConditionMapper.kt
@@ -100,34 +100,51 @@ class ConditionStamper(private val conditionMapper: IConditionMapper) {
         val memberOidMap = conditionMapper.lookupMemberOid(codeSourcesMap.values.flatten())
 
         var mappedSomething = false
+        val failures = mutableListOf<ObservationMappingFailure>()
+
+        codeSourcesMap.forEach { (key, codings) ->
+            // keep track of codes that have no mapped conditions
+            val unmappedCodings = mutableListOf<Coding>()
 
-        codeSourcesMap.forEach { (_, codings) ->
             codings.forEach { originalCoding ->
                 val mappedConditions = conditionsToCode[originalCoding].orEmpty()
-                mappedConditions.forEach { conditionCoding ->
-                    val snomedCoding = Coding().apply {
-                        system = conditionCoding.system
-                        code = conditionCoding.code
-                        display = conditionCoding.display
-                    }
-                    // If we have an OID, add it as a sub-extension on this SNOMED coding
-                    memberOidMap[conditionCoding.code]?.let { memberOid ->
-                        val memberOidExtension = Extension(MEMBER_OID_EXTENSION_URL).apply {
-                            setValue(StringType(memberOid))
+                if (mappedConditions.isEmpty()) {
+                    // No mapped conditions => unmapped
+                    unmappedCodings.add(originalCoding)
+                } else {
+                    // We do have mapped conditions => build all the SNOMED codings
+                    mappedConditions.forEach { conditionCoding ->
+                        val snomedCoding = Coding().apply {
+                            system = conditionCoding.system
+                            code = conditionCoding.code
+                            display = conditionCoding.display
+                        }
+
+                        // If we have an OID for this code, add as sub-extension
+                        memberOidMap[conditionCoding.code]?.let { memberOid ->
+                            val memberOidExtension = Extension(MEMBER_OID_EXTENSION_URL).apply {
+                                setValue(StringType(memberOid))
+                            }
+                            snomedCoding.addExtension(memberOidExtension)
                         }
-                        snomedCoding.addExtension(memberOidExtension)
-                    }
-                    // Create the top-level condition-code extension
-                    val conditionExtension = Extension(CONDITION_CODE_EXTENSION_URL, snomedCoding)
-                    observation.code.coding
-                        .firstOrNull()
-                        ?.addExtension(conditionExtension)
 
-                    mappedSomething = true
+                        // Create the top-level condition-code extension
+                        val conditionExtension = Extension(CONDITION_CODE_EXTENSION_URL, snomedCoding)
+                        observation.code
+                            .coding
+                            .firstOrNull()
+                            ?.addExtension(conditionExtension)
+
+                        mappedSomething = true
+                    }
                 }
             }
-        }
 
-        return ObservationStampingResult(mappedSomething)
+            // If there's any unmapped codes for this key, record them
+            if (unmappedCodings.isNotEmpty()) {
+                failures.add(ObservationMappingFailure(key, unmappedCodings))
+            }
+        }
+        return ObservationStampingResult(mappedSomething, failures)
     }
 }