|
@@ -1176,6 +1176,11 @@ public class MappingConfigFacade extends MappingConfigServiceImpl {
|
|
|
queryWrapper
|
|
|
.eq("his_detail_name", mappingConfig.getHisDetailName());
|
|
|
}
|
|
|
+ if (mappingConfig.getFormConceptId() != null) {
|
|
|
+ queryWrapper.eq("form_concept_id", mappingConfig.getFormConceptId());
|
|
|
+ } else {
|
|
|
+ queryWrapper.isNull("form_concept_id");
|
|
|
+ }
|
|
|
if (mappingConfig.getFormConceptId() != null) {
|
|
|
queryWrapper.eq("form_concept_id", mappingConfig.getFormConceptId());
|
|
|
}
|
|
@@ -1231,6 +1236,11 @@ public class MappingConfigFacade extends MappingConfigServiceImpl {
|
|
|
} else {
|
|
|
queryWrapper.eq("his_detail_name", mappingConfig.getHisDetailName());
|
|
|
}
|
|
|
+ if (mappingConfig.getFormConceptId() != null) {
|
|
|
+ queryWrapper.eq("form_concept_id", mappingConfig.getFormConceptId());
|
|
|
+ } else {
|
|
|
+ queryWrapper.isNull("form_concept_id");
|
|
|
+ }
|
|
|
MappingConfig oldRecord = this.getOne(queryWrapper, false);
|
|
|
if (mappingConfig.getId() == null
|
|
|
&& oldRecord != null) {
|