|
@@ -101,19 +101,39 @@ public class TestFacade {
|
|
|
// lisBean.setUniqueName(lisArr[0]);
|
|
|
// lisBean.setName(lisArr[0]);
|
|
|
// lisBean.setDetailName(lisArr[0]);
|
|
|
- // if ("<".equals(lisArr[1])) {
|
|
|
- // lisBean.setValue(Double.parseDouble(lisArr[2]) - 1);
|
|
|
- // } else if (">".equals(lisArr[1])) {
|
|
|
- // lisBean.setValue(Double.parseDouble(lisArr[2]) + 1);
|
|
|
- // }
|
|
|
+ // lisBean.setValue(getValue(lisArr));
|
|
|
// lisList.add(lisBean);
|
|
|
// indicationPushVO.setLis(lisList);
|
|
|
// break;
|
|
|
// case "3" : // 临床表现
|
|
|
// indicationPushVO.setChief(bean.getNeoName());
|
|
|
// break;
|
|
|
- case "5" : // 诊断
|
|
|
- indicationPushVO.setDiagString(bean.getNeoName());
|
|
|
+ // case "5" : // 诊断
|
|
|
+ // indicationPushVO.setDiagString(bean.getNeoName());
|
|
|
+ // break;
|
|
|
+ case "12" : // 体征
|
|
|
+ String[] vitalArr = bean.getNeoName().split(",");
|
|
|
+ StringBuffer sbVital = new StringBuffer();
|
|
|
+ if ("体温".equals(vitalArr[0])) {
|
|
|
+ sbVital.append("体温");
|
|
|
+ sbVital.append(getValue(vitalArr));
|
|
|
+ sbVital.append(vitalArr[3]);
|
|
|
+ indicationPushVO.setVital(sbVital.toString());
|
|
|
+ }
|
|
|
+ // else if ("收缩压".equals(vitalArr[0]) || "舒张压".equals(vitalArr[0])){
|
|
|
+ // if ("收缩压".equals(vitalArr[0])) {
|
|
|
+ // sbVital.append("血压");
|
|
|
+ // sbVital.append(getValue(vitalArr) + "/100mmHg");
|
|
|
+ // indicationPushVO.setVital(sbVital.toString());
|
|
|
+ // } else if ("舒张压".equals(vitalArr[0])) {
|
|
|
+ // sbVital.append("血压");
|
|
|
+ // sbVital.append("100/" + getValue(vitalArr) + "mmHg");
|
|
|
+ // indicationPushVO.setVital(sbVital.toString());
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ else {
|
|
|
+ continue;
|
|
|
+ }
|
|
|
break;
|
|
|
default:
|
|
|
continue;
|
|
@@ -125,19 +145,40 @@ public class TestFacade {
|
|
|
Map<String, Object> map = new LinkedHashMap<>();
|
|
|
|
|
|
List<String> msg = new ArrayList<>();
|
|
|
+ List<String> errMsg = new ArrayList<>();
|
|
|
for (IndicationPushVO indicationPushVO : indicationPushVOList) {
|
|
|
- IndicationDTO indicationDTO = indicationFacade.indicationFac(indicationPushVO);
|
|
|
- if (ListUtil.isEmpty(indicationDTO.getBillMsgList())) {
|
|
|
- msg.add("第【" + indicationPushVO.getIdNum() + "】行未匹配");
|
|
|
+ try {
|
|
|
+ IndicationDTO indicationDTO = indicationFacade.indicationFac(indicationPushVO);
|
|
|
+ if (ListUtil.isEmpty(indicationDTO.getBillMsgList())) {
|
|
|
+ msg.add("第【" + indicationPushVO.getIdNum() + "】行未匹配");
|
|
|
+ }
|
|
|
+ } catch (Exception e) {
|
|
|
+ errMsg.add(indicationPushVO.getIdNum() + "行出错了");
|
|
|
}
|
|
|
}
|
|
|
map.put("总条数", indicationPushVOList.size() + "条");
|
|
|
map.put("出错条数", msg.size() + "条");
|
|
|
map.put("出错信息", msg);
|
|
|
+ map.put("程序报错", errMsg);
|
|
|
return map;
|
|
|
}
|
|
|
|
|
|
|
|
|
+ /**
|
|
|
+ * 返回数值
|
|
|
+ *
|
|
|
+ * @param arr
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ public double getValue(String[] arr) {
|
|
|
+ if ("<".equals(arr[1]) || "≤".equals(arr[1])) {
|
|
|
+ return Double.parseDouble(arr[2])-1;
|
|
|
+ } else if (">".equals(arr[1]) || "≥".equals(arr[1])) {
|
|
|
+ return Double.parseDouble(arr[2])+1;
|
|
|
+ }
|
|
|
+ return 0.0;
|
|
|
+ }
|
|
|
+
|
|
|
/**
|
|
|
* 标准词转换
|
|
|
*
|