Skip to content

Commit 795789d

Browse files
committed
Add support for name and UUID
1 parent 1d4a1dc commit 795789d

File tree

3 files changed

+2
-12
lines changed

3 files changed

+2
-12
lines changed

api/src/main/java/org/openmrs/module/initializer/api/fhir/ocm/FhirObservationCategoryMapCsvParser.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,9 @@
1010
import org.openmrs.module.initializer.api.CsvParser;
1111
import org.springframework.beans.factory.annotation.Autowired;
1212
import org.springframework.beans.factory.annotation.Qualifier;
13-
import org.springframework.stereotype.Component;
1413

1514
import static org.openmrs.module.initializer.Domain.FHIR_OBSERVATION_CATEGORY_MAPS;
1615

17-
@Component
1816
@OpenmrsProfile(modules = { "fhir2:1.*" })
1917
public class FhirObservationCategoryMapCsvParser extends CsvParser<FhirObservationCategoryMap, BaseLineProcessor<FhirObservationCategoryMap>> {
2018

@@ -48,8 +46,8 @@ public FhirObservationCategoryMap bootstrap(CsvLine line) throws IllegalArgument
4846
result = (FhirObservationCategoryMap) sessionFactory.getCurrentSession()
4947
.createQuery("from " + FhirObservationCategoryMap.class.getSimpleName()
5048
+ " where observationCategory = :fhirObsCategory and conceptClass = (" + "select cc from "
51-
+ ConceptClass.class.getSimpleName() + " cc where cc.name = :conceptClassName" + ")")
52-
.setParameter("fhirObsCategory", fhirObsCategory).setParameter("conceptClassName", conceptClass)
49+
+ ConceptClass.class.getSimpleName() + " cc where cc.name = :conceptClass or cc.uuid = :conceptClass" + ")")
50+
.setParameter("fhirObsCategory", fhirObsCategory).setParameter("conceptClass", conceptClass)
5351
.uniqueResult();
5452
}
5553

api/src/main/java/org/openmrs/module/initializer/api/fhir/ocm/FhirObservationCategoryMapLineProcessor.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,16 @@
22

33
import org.apache.commons.lang3.StringUtils;
44
import org.openmrs.ConceptClass;
5-
import org.openmrs.ConceptSource;
65
import org.openmrs.annotation.OpenmrsProfile;
76
import org.openmrs.api.ConceptService;
8-
import org.openmrs.module.fhir2.model.FhirConceptSource;
97
import org.openmrs.module.fhir2.model.FhirObservationCategoryMap;
108
import org.openmrs.module.initializer.api.BaseLineProcessor;
119
import org.openmrs.module.initializer.api.CsvLine;
1210
import org.springframework.beans.factory.annotation.Autowired;
13-
import org.springframework.stereotype.Component;
1411

15-
import static org.openmrs.module.initializer.api.fhir.cs.FhirConceptSourceCsvParser.CONCEPT_SOURCE_NAME_HEADER;
1612
import static org.openmrs.module.initializer.api.fhir.ocm.FhirObservationCategoryMapCsvParser.CONCEPT_CLASS_HEADER;
1713
import static org.openmrs.module.initializer.api.fhir.ocm.FhirObservationCategoryMapCsvParser.FHIR_OBS_CATEGORY_HEADER;
1814

19-
@Component
2015
@OpenmrsProfile(modules = { "fhir2:1.*" })
2116
public class FhirObservationCategoryMapLineProcessor extends BaseLineProcessor<FhirObservationCategoryMap> {
2217

api/src/main/java/org/openmrs/module/initializer/api/fhir/ocm/FhirObservationCategoryMapLoader.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
package org.openmrs.module.initializer.api.fhir.ocm;
22

33
import org.openmrs.annotation.OpenmrsProfile;
4-
import org.openmrs.module.fhir2.model.FhirConceptSource;
54
import org.openmrs.module.fhir2.model.FhirObservationCategoryMap;
65
import org.openmrs.module.initializer.api.loaders.BaseCsvLoader;
76
import org.springframework.beans.factory.annotation.Autowired;
8-
import org.springframework.stereotype.Component;
97

10-
@Component
118
@OpenmrsProfile(modules = { "fhir2:1.*" })
129
public class FhirObservationCategoryMapLoader extends BaseCsvLoader<FhirObservationCategoryMap, FhirObservationCategoryMapCsvParser> {
1310

0 commit comments

Comments
 (0)