|
@@ -6,7 +6,7 @@ import com.diagbot.dto.LisOtherDTO;
|
|
|
import com.diagbot.dto.RuleBaseDTO;
|
|
|
import com.diagbot.dto.RuleSimpleDTO;
|
|
|
import com.diagbot.dto.WordCrfDTO;
|
|
|
-import com.diagbot.enums.LibTypeEnum;
|
|
|
+import com.diagbot.enums.LexiconEnum;
|
|
|
import com.diagbot.enums.TypeEnum;
|
|
|
import com.diagbot.util.CoreUtil;
|
|
|
import com.diagbot.util.ListUtil;
|
|
@@ -94,10 +94,10 @@ public class LisRule {
|
|
|
LisOtherDTO lisOtherDTO = new LisOtherDTO();
|
|
|
int i = 0;
|
|
|
for (RuleBaseDTO ruleBaseDTO : ruleBaseDTOList) {
|
|
|
- if (LibTypeEnum.getEnum(ruleBaseDTO.getBaseLibType()) != null) { // 避免空指针
|
|
|
+ if (LexiconEnum.getEnum(ruleBaseDTO.getBaseLibType()) != null) { // 避免空指针
|
|
|
Map<String, Object> map = null;
|
|
|
- switch (LibTypeEnum.getEnum(ruleBaseDTO.getBaseLibType())) {
|
|
|
- case lisDetail: // 化验细项
|
|
|
+ switch (LexiconEnum.getEnum(ruleBaseDTO.getBaseLibType())) {
|
|
|
+ case LisSubName: // 化验细项
|
|
|
if (ruleBaseDTO.getBaseLibName().equals(lisBean.getUniqueName())) {
|
|
|
map = CoreUtil.compareLis(ruleBaseDTO, lisBean);
|
|
|
if ((Boolean) map.get("flag") == true) {
|
|
@@ -106,21 +106,21 @@ public class LisRule {
|
|
|
}
|
|
|
}
|
|
|
break;
|
|
|
- case group: // 人群
|
|
|
+ case Group: // 人群
|
|
|
map = groupRule.rule(wordCrfDTO, ruleBaseDTO);
|
|
|
if (CoreUtil.getMapFlag(map)) {
|
|
|
lisOtherDTO.getGroupMsg().add((String)map.get("msg"));
|
|
|
i++;
|
|
|
}
|
|
|
break;
|
|
|
- case disease: // 诊断
|
|
|
+ case Disease: // 诊断
|
|
|
map = commonRule.compareItem(wordCrfDTO.getDiag(), ruleBaseDTO);
|
|
|
if (CoreUtil.getMapFlag(map)) {
|
|
|
lisOtherDTO.setDiseaseMsg((List<String>)map.get("msgList"));
|
|
|
i++;
|
|
|
}
|
|
|
break;
|
|
|
- case drug:
|
|
|
+ case Medicine:
|
|
|
map = commonRule.compareItem(wordCrfDTO.getDrug(), ruleBaseDTO);
|
|
|
if (CoreUtil.getMapFlag(map)) {
|
|
|
lisOtherDTO.setDrugMsg((List<String>)map.get("msgList"));
|
|
@@ -177,10 +177,10 @@ public class LisRule {
|
|
|
lisOtherDTO.setMsg(msg);
|
|
|
int i = 0;
|
|
|
for (RuleBaseDTO ruleBaseDTO : ruleBaseDTOList) {
|
|
|
- if (LibTypeEnum.getEnum(ruleBaseDTO.getBaseLibType()) != null) { // 避免空指针
|
|
|
+ if (LexiconEnum.getEnum(ruleBaseDTO.getBaseLibType()) != null) { // 避免空指针
|
|
|
Map<String, Object> map = null;
|
|
|
- switch (LibTypeEnum.getEnum(ruleBaseDTO.getBaseLibType())) {
|
|
|
- case lisDetail: // 化验细项
|
|
|
+ switch (LexiconEnum.getEnum(ruleBaseDTO.getBaseLibType())) {
|
|
|
+ case LisSubName: // 化验细项
|
|
|
if (ruleBaseDTO.getBaseLibName().equals(lisBean.getUniqueName())) {
|
|
|
map = CoreUtil.compareLis(ruleBaseDTO, lisBean);
|
|
|
if ((Boolean) map.get("flag") == true) {
|
|
@@ -189,20 +189,20 @@ public class LisRule {
|
|
|
}
|
|
|
}
|
|
|
break;
|
|
|
- case disease: // 诊断
|
|
|
+ case Disease: // 诊断
|
|
|
map = commonRule.compareItem(wordCrfDTO.getDiag(), ruleBaseDTO);
|
|
|
if (CoreUtil.getMapFlag(map)) {
|
|
|
lisOtherDTO.setDiseaseMsg((List<String>)map.get("msgList"));
|
|
|
i++;
|
|
|
}
|
|
|
break;
|
|
|
- case drug: // 药品
|
|
|
+ case Medicine: // 药品
|
|
|
map = commonRule.compareItem(wordCrfDTO.getDrug(), ruleBaseDTO);
|
|
|
if (CoreUtil.getMapFlag(map)) {
|
|
|
lisOtherDTO.setDrugMsg((List<String>)map.get("msgList"));
|
|
|
i++;
|
|
|
}
|
|
|
- case operation: // 手术
|
|
|
+ case Operation: // 手术
|
|
|
map = commonRule.compareItem(wordCrfDTO.getOperation(), ruleBaseDTO);
|
|
|
if (CoreUtil.getMapFlag(map)) {
|
|
|
lisOtherDTO.setOperationMsg((List<String>)map.get("msgList"));
|
|
@@ -264,9 +264,9 @@ public class LisRule {
|
|
|
String msg = "";
|
|
|
int i = 0;
|
|
|
for (RuleBaseDTO ruleBaseDTO : ruleBaseDTOList) {
|
|
|
- if (LibTypeEnum.getEnum(ruleBaseDTO.getBaseLibType()) != null) { // 避免空指针
|
|
|
- switch (LibTypeEnum.getEnum(ruleBaseDTO.getBaseLibType())) {
|
|
|
- case lisDetail: // 化验细项
|
|
|
+ if (LexiconEnum.getEnum(ruleBaseDTO.getBaseLibType()) != null) { // 避免空指针
|
|
|
+ switch (LexiconEnum.getEnum(ruleBaseDTO.getBaseLibType())) {
|
|
|
+ case LisSubName: // 化验细项
|
|
|
if (ruleBaseDTO.getBaseLibName().equals(lisBean.getUniqueName())) {
|
|
|
Map<String, Object> map = CoreUtil.compareLis(ruleBaseDTO, lisBean);
|
|
|
if ((Boolean) map.get("flag") == true) {
|
|
@@ -275,7 +275,7 @@ public class LisRule {
|
|
|
}
|
|
|
}
|
|
|
break;
|
|
|
- case group: // 人群
|
|
|
+ case Group: // 人群
|
|
|
Map map = groupRule.rule(wordCrfDTO, ruleBaseDTO);
|
|
|
if (CoreUtil.getMapFlag(map)) {
|
|
|
i++;
|