|
@@ -1,11 +1,9 @@
|
|
|
package com.diagbot.facade;
|
|
|
|
|
|
import com.diagbot.dto.DictionaryInfoDTO;
|
|
|
-import com.diagbot.entity.node.Age;
|
|
|
import com.diagbot.entity.node.BillConcept;
|
|
|
import com.diagbot.entity.node.BillCondition;
|
|
|
import com.diagbot.entity.node.BillItem;
|
|
|
-import com.diagbot.entity.node.ClinicalFinding;
|
|
|
import com.diagbot.entity.node.Group;
|
|
|
import com.diagbot.entity.node.Lis;
|
|
|
import com.diagbot.entity.node.LisSet;
|
|
@@ -299,14 +297,7 @@ public class BillManFacade {
|
|
|
|
|
|
//条件名称
|
|
|
if (billSaveVO.getRuleType().equals(2)) {
|
|
|
- if (billSaveVO.getRelationId() == null) {
|
|
|
- conditionName_save = conditionName_new;
|
|
|
- } else {
|
|
|
- if (!(existRelation != null &&
|
|
|
- billSaveVO.getRelationId().equals(existRelation.getRelationId()))) {
|
|
|
- conditionName_save = conditionName_new;
|
|
|
- }
|
|
|
- }
|
|
|
+ conditionName_save = conditionName_new;
|
|
|
}
|
|
|
|
|
|
//新增已存在
|
|
@@ -316,12 +307,13 @@ public class BillManFacade {
|
|
|
throw new CommonException(CommonErrorCode.IS_EXISTS, "规则已存在");
|
|
|
}
|
|
|
} else {
|
|
|
- if (!(existRelation != null
|
|
|
- && billSaveVO.getRelationId().equals(existRelation.getRelationId()))) {
|
|
|
- if (existRelation_new != null
|
|
|
- && !billSaveVO.getRelationId().equals(existRelation_new.getRelationId())) {
|
|
|
- throw new CommonException(CommonErrorCode.IS_EXISTS, "规则已存在");
|
|
|
- }
|
|
|
+ if ((billSaveVO.getRelationId().equals(1)
|
|
|
+ && existRelation != null
|
|
|
+ && !existRelation.getRelationId().equals(billSaveVO.getRelationId()))
|
|
|
+ || (billSaveVO.getRelationId().equals(2)
|
|
|
+ && existRelation_new != null
|
|
|
+ && !existRelation_new.getRelationId().equals(billSaveVO.getRelationId()))) {
|
|
|
+ throw new CommonException(CommonErrorCode.IS_EXISTS, "规则已存在");
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -369,17 +361,6 @@ public class BillManFacade {
|
|
|
condition.getUnit(),
|
|
|
condition.getName());
|
|
|
break;
|
|
|
- case "临床表现":
|
|
|
- ClinicalFinding clinicalFinding = clinicalFindingRepository.createOrUpdate(conditionName_save,
|
|
|
- 0,
|
|
|
- Cn2SpellUtil.converterToFirstSpell(conditionName_save),
|
|
|
- 1,
|
|
|
- condition.getMaxValue(),
|
|
|
- condition.getMinValue(),
|
|
|
- condition.getRange(),
|
|
|
- condition.getUnit(),
|
|
|
- condition.getName());
|
|
|
- break;
|
|
|
case "禁忌人群":
|
|
|
Group group = groupRepository.createOrUpdate(conditionName_save,
|
|
|
0,
|
|
@@ -402,18 +383,12 @@ public class BillManFacade {
|
|
|
condition.getUnit(),
|
|
|
condition.getName());
|
|
|
break;
|
|
|
+ /*
|
|
|
+ case "临床表现":
|
|
|
+ break;
|
|
|
case "年龄":
|
|
|
- Age age = ageRepository.createOrUpdate(conditionName_save,
|
|
|
- 0,
|
|
|
- Cn2SpellUtil.converterToFirstSpell(conditionName_save),
|
|
|
- 1,
|
|
|
- condition.getMaxValue(),
|
|
|
- condition.getMinValue(),
|
|
|
- condition.getRange(),
|
|
|
- condition.getUnit(),
|
|
|
- condition.getName());
|
|
|
break;
|
|
|
- /*case "性别":
|
|
|
+ case "性别":
|
|
|
break;
|
|
|
case "辅助检查名称描述":
|
|
|
break;
|