|
@@ -118,6 +118,8 @@ public class TestFacade {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ indicationPushVO.setMsg(bean.getNeoName());
|
|
|
+
|
|
|
if (StringUtil.isNotEmpty(bean.getNeoType())) {
|
|
|
switch (bean.getNeoType()) {
|
|
|
case "1": // 性别
|
|
@@ -178,17 +180,22 @@ public class TestFacade {
|
|
|
} else if ("药品类别".equals(bean.getDrugType())) {
|
|
|
List<String> drugList = (List<String>)redisUtil.get("药品分类_" + bean.getNeoName());
|
|
|
if (ListUtil.isNotEmpty(drugList)) {
|
|
|
- for (String s : drugList) {
|
|
|
- pastStr = new StringBuffer("");
|
|
|
- IndicationPushVO indicationPushCopy = new IndicationPushVO();
|
|
|
- BeanUtil.copyProperties(indicationPushVO, indicationPushCopy);
|
|
|
- pastStr.append("有“").append(s).append("”过敏。");
|
|
|
- indicationPushCopy.setPasts(pastStr.toString());
|
|
|
- indicationPushCopy.setMsg("过敏药品【" + s + "】");
|
|
|
- indicationPushVOList.add(indicationPushCopy);
|
|
|
+ if (testLineVO.isGetOne()) {
|
|
|
+ pastStr.append("有“").append(drugList.get(getRandomNum(drugList.size()))).append("”过敏。");
|
|
|
+ indicationPushVO.setPasts(pastStr.toString());
|
|
|
+ } else {
|
|
|
+ for (String s : drugList) {
|
|
|
+ pastStr = new StringBuffer("");
|
|
|
+ IndicationPushVO indicationPushCopy = new IndicationPushVO();
|
|
|
+ BeanUtil.copyProperties(indicationPushVO, indicationPushCopy);
|
|
|
+ pastStr.append("有“").append(s).append("”过敏。");
|
|
|
+ indicationPushCopy.setPasts(pastStr.toString());
|
|
|
+ indicationPushCopy.setMsg("过敏药品【" + s + "】");
|
|
|
+ indicationPushVOList.add(indicationPushCopy);
|
|
|
+ }
|
|
|
+ continue;
|
|
|
}
|
|
|
}
|
|
|
- continue;
|
|
|
}
|
|
|
break;
|
|
|
case "12": // 体征
|
|
@@ -325,6 +332,7 @@ public class TestFacade {
|
|
|
item.setName(bean.getOperationName());
|
|
|
operationOrder.add(item);
|
|
|
indicationPushVO.setOperationOrder(operationOrder);
|
|
|
+ indicationPushVO.setMsg(bean.getOperationName());
|
|
|
indicationPushVOList.add(indicationPushVO);
|
|
|
}
|
|
|
|
|
@@ -523,6 +531,7 @@ public class TestFacade {
|
|
|
item.setForm(bean.getDrugForm());
|
|
|
drugOrder.add(item);
|
|
|
indicationPushVO.setDrugOrder(drugOrder);
|
|
|
+ indicationPushVO.setMsg(bean.getDrugHighRisk() + bean.getDrugForm());
|
|
|
indicationPushVOList.add(indicationPushVO);
|
|
|
}
|
|
|
|
|
@@ -572,6 +581,7 @@ public class TestFacade {
|
|
|
lisDetail.add(lisDetailBean);
|
|
|
}
|
|
|
indicationPushVO.setLis(lisDetail);
|
|
|
+ indicationPushVO.setMsg(bean.getCriticalLis());
|
|
|
|
|
|
indicationPushVOList.add(indicationPushVO);
|
|
|
}
|
|
@@ -603,6 +613,7 @@ public class TestFacade {
|
|
|
pacs.setResult(bean.getRuleText());
|
|
|
pacsList.add(pacs);
|
|
|
indicationPushVO.setPacs(pacsList);
|
|
|
+ indicationPushVO.setMsg(bean.getRuleText());
|
|
|
indicationPushVO.setIdNum(bean.getIdNum());
|
|
|
|
|
|
indicationPushVOList.add(indicationPushVO);
|