honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't create designation of all components are empty (#2891) 

* Don't create designation of all components are empty

* Fixed typo
This commit is contained in:
Frank Tao 2021-08-13 11:01:50 -04:00 committed by GitHub
parent e355e96457
commit 4920f0a15d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincLinguisticVariantHandler.java
View File

@ -62,20 +62,25 @@ public class LoincLinguisticVariantHandler implements IZipContentsHandlerCsv {
// LinguisticVariantDisplayName
//-- add formalName designation
StringBuilder formalName = new StringBuilder();
formalName.append(trimToEmpty(theRecord.get("COMPONENT") + ":"));
formalName.append(trimToEmpty(theRecord.get("PROPERTY") + ":"));
formalName.append(trimToEmpty(theRecord.get("TIME_ASPCT") + ":"));
formalName.append(trimToEmpty(theRecord.get("SYSTEM") + ":"));
formalName.append(trimToEmpty(theRecord.get("SCALE_TYP") + ":"));
formalName.append(trimToEmpty(theRecord.get("METHOD_TYP")));
StringBuilder fullySpecifiedName = new StringBuilder();
fullySpecifiedName.append(trimToEmpty(theRecord.get("COMPONENT") + ":"));
fullySpecifiedName.append(trimToEmpty(theRecord.get("PROPERTY") + ":"));
fullySpecifiedName.append(trimToEmpty(theRecord.get("TIME_ASPCT") + ":"));
fullySpecifiedName.append(trimToEmpty(theRecord.get("SYSTEM") + ":"));
fullySpecifiedName.append(trimToEmpty(theRecord.get("SCALE_TYP") + ":"));
fullySpecifiedName.append(trimToEmpty(theRecord.get("METHOD_TYP")));
concept.addDesignation()
.setLanguage(myLanguageCode)
.setUseSystem(ITermLoaderSvc.LOINC_URI)
.setUseCode("FullySpecifiedName")
.setUseDisplay("FullySpecifiedName")
.setValue(formalName.toString());
String fullySpecifiedNameStr = fullySpecifiedName.toString();
// skip if COMPONENT, PROPERTY, TIME_ASPCT, SYSTEM, SCALE_TYP and METHOD_TYP are all empty
if (!fullySpecifiedNameStr.equals(":::::")) {
concept.addDesignation()
.setLanguage(myLanguageCode)
.setUseSystem(ITermLoaderSvc.LOINC_URI)
.setUseCode("FullySpecifiedName")
.setUseDisplay("FullySpecifiedName")
.setValue(fullySpecifiedNameStr);
}
//-- other designations
addDesignation(theRecord, concept, "SHORTNAME");

4
hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/TerminologyLoaderSvcLoincTest.java
View File

@ -484,7 +484,7 @@ public class TerminologyLoaderSvcLoincTest extends BaseLoaderTest {
verifyLinguisticVariant(code.getDesignations(), "fr-CA", "Cellules de Purkinje cytoplasmique type 2 , IgG","Titre","Temps ponctuel","Sérum","Quantitatif","Immunofluorescence","Sérologie","","","","");
verifyLinguisticVariant(code.getDesignations(), "zh-CN", "血流速度.收缩期.最大值","速度","时间点","大脑中动脉","定量型","超声.多普勒","产科学检查与测量指标.超声","","", "Cereb 动态 可用数量表示的;定量性;数值型;数量型;连续数值型标尺 大脑（Cerebral） 时刻;随机;随意;瞬间 术语\"cerebral\"指的是主要由中枢半球（大脑皮质和基底神经节）组成的那部分脑结构 流 流量;流速;流体 血;全血 血流量;血液流量 速度(距离/时间);速率;速率(距离/时间)","");
code = concepts.get("17787-3");
assertEquals(6, code.getDesignations().size());
assertEquals(5, code.getDesignations().size());
verifyConsumerName(code.getDesignations(), "Consumer Name 17787-3");
verifyLinguisticVariant(code.getDesignations(), "de-AT", "","","","","","","","","","CoV OC43 RNA ql/SM P","Coronavirus OC43 RNA ql. /Sondermaterial PCR");
verifyLinguisticVariant(code.getDesignations(), "fr-CA", "Virus respiratoire syncytial bovin","Présence-Seuil","Temps ponctuel","XXX","Ordinal","Culture spécifique à un microorganisme","Microbiologie","","","","");
@ -986,7 +986,7 @@ public class TerminologyLoaderSvcLoincTest extends BaseLoaderTest {
private static void verifyDesignation(TermConceptDesignation theDesignation, String theUseSystem, String theUseCode, String theValue) {
if (theDesignation == null)
return;
return;
assertEquals(theUseSystem, theDesignation.getUseSystem());
assertEquals(theUseCode, theDesignation.getUseCode());
assertEquals(theValue, theDesignation.getValue());