|
@@ -3,6 +3,7 @@ package com.diagbot.util;
|
|
|
import com.diagbot.biz.push.entity.Item;
|
|
|
import com.diagbot.biz.push.entity.Lis;
|
|
|
import com.diagbot.dto.RuleBaseDTO;
|
|
|
+import com.diagbot.enums.LexiconEnum;
|
|
|
import com.diagbot.model.entity.BodyPart;
|
|
|
import com.diagbot.model.entity.Clinical;
|
|
|
import com.diagbot.model.entity.Negative;
|
|
@@ -354,13 +355,14 @@ public class CoreUtil {
|
|
|
map.put("flag", flag);
|
|
|
return map;
|
|
|
}
|
|
|
- if (StringUtil.isBlank(ruleBaseDTO.getBaseMaxValue()) && StringUtil.isBlank(ruleBaseDTO.getBaseMinValue())) {
|
|
|
+ // if (StringUtil.isBlank(ruleBaseDTO.getBaseMaxValue()) && StringUtil.isBlank(ruleBaseDTO.getBaseMinValue())) {
|
|
|
+ // 如果是体格检查结果,就用临床表现比较;如果是体格检查项目,用体征数值比较
|
|
|
+ if (ruleBaseDTO.getBaseLibType().equals(LexiconEnum.VitalResult.getKey())) {
|
|
|
// 体征名称比较(例如:喉头水肿)
|
|
|
for (Clinical clinical : clinicals) {
|
|
|
if (ruleBaseDTO.getBaseLibName().equals(clinical.getStandName())) {
|
|
|
- map.put("msg", clinical.getName());
|
|
|
+ msgList.add(clinical.getName());
|
|
|
flag = true;
|
|
|
- break;
|
|
|
}
|
|
|
}
|
|
|
} else {
|