|
@@ -5,6 +5,7 @@ import org.diagbot.bigdata.common.ApplicationCacheUtil;
|
|
|
import org.diagbot.common.javabean.Rule;
|
|
|
import org.diagbot.common.push.filter.PreResult;
|
|
|
import org.diagbot.common.push.filter.pretreat.Pretreatment;
|
|
|
+import org.diagbot.common.push.filter.pretreat.PretreatmentPacs;
|
|
|
import org.diagbot.common.push.filter.pretreat.PretreatmentSymptom;
|
|
|
import org.diagbot.common.push.filter.pretreat.PretreatmentVital;
|
|
|
import org.diagbot.common.work.CrisisDetail;
|
|
@@ -54,7 +55,7 @@ public class PretreatmentFilter {
|
|
|
}
|
|
|
//pacs数据
|
|
|
if (!StringUtils.isEmpty(searchData.getPacs())) {
|
|
|
- searchData.setPacs(add2PreResultList(new PretreatmentVital(), searchData.getPacs(), allCrisisDetailList));
|
|
|
+ searchData.setPacs(add2PreResultList(new PretreatmentPacs(), searchData.getPacs(), allCrisisDetailList));
|
|
|
}
|
|
|
responseData.setCrisisDetails(allCrisisDetailList);
|
|
|
}
|
|
@@ -96,13 +97,13 @@ public class PretreatmentFilter {
|
|
|
private String conceptConvert(PreResult result, Rule rule, String content) {
|
|
|
//标准值最优先匹配 暂时忽略单位
|
|
|
if (compareEqual(result.getValue(), rule.getSet_value())) {
|
|
|
- content = content + rule.getSet_concept_text();
|
|
|
+ content = content + rule.getSet_concept_text()==null?"":rule.getSet_concept_text();
|
|
|
}
|
|
|
if (compareMin(result.getValue(), rule.getMin_value())) {
|
|
|
- content = content + rule.getMin_concept_text();
|
|
|
+ content = content + rule.getMin_concept_text()==null?"":rule.getMin_concept_text();
|
|
|
}
|
|
|
if (compareMax(result.getValue(), rule.getMax_value())) {
|
|
|
- content = content + rule.getMax_concept_text();
|
|
|
+ content = content + rule.getMax_concept_text()==null?"":rule.getMax_concept_text();
|
|
|
}
|
|
|
return content;
|
|
|
}
|
|
@@ -110,9 +111,9 @@ public class PretreatmentFilter {
|
|
|
private void conceptCrisis(PreResult result, Rule rule, List<CrisisDetail> allCrisisDetailList) {
|
|
|
boolean crisis = false;
|
|
|
CrisisDetail crisisDetail = new CrisisDetail();
|
|
|
- crisisDetail.setOriginText(result.getDetailName() + " = " + result.getValue() + result.getUnits());
|
|
|
+ crisisDetail.setOriginText(result.getDetailName() + " : " + result.getValue() + result.getUnits());
|
|
|
if (compareEqual(result.getValue(), rule.getSet_value())) {
|
|
|
- crisisDetail.setStandardText(result.getDetailName() + " = " + rule.getSet_value() + rule.getUnit());
|
|
|
+ crisisDetail.setStandardText(result.getDetailName() + " : " + rule.getSet_value() + rule.getUnit());
|
|
|
crisisDetail.setRemindText(rule.getSetRemind());
|
|
|
crisis = true;
|
|
|
}
|
|
@@ -154,9 +155,7 @@ public class PretreatmentFilter {
|
|
|
if (!StringUtils.isEmpty(c1) && !StringUtils.isEmpty(c2)) {
|
|
|
try {
|
|
|
return Double.valueOf(c1) > Double.valueOf(c2);
|
|
|
- } catch (Exception e) {
|
|
|
- e.printStackTrace();
|
|
|
- }
|
|
|
+ } catch (Exception e) {}
|
|
|
}
|
|
|
return false;
|
|
|
}
|