|
@@ -637,26 +637,34 @@ public class TestFacade {
|
|
|
indicationPushVO.setSex(1);
|
|
|
indicationPushVO.setIdNum(bean.getIdNum());
|
|
|
|
|
|
- List<Lis> lisDetail = new ArrayList<>();
|
|
|
if (bean.getCriticalMin() != null) {
|
|
|
+ IndicationPushVO copy = new IndicationPushVO();
|
|
|
+ BeanUtil.copyProperties(indicationPushVO, copy);
|
|
|
+ List<Lis> lisDetail = new ArrayList<>();
|
|
|
Lis lisDetailBean = new Lis();
|
|
|
lisDetailBean.setName(bean.getCriticalMeal());
|
|
|
lisDetailBean.setDetailName(bean.getCriticalLis());
|
|
|
lisDetailBean.setUniqueName(bean.getCriticalLis());
|
|
|
lisDetailBean.setValue(bean.getCriticalMin());
|
|
|
lisDetail.add(lisDetailBean);
|
|
|
- } else if (bean.getCriticalMax() != null) {
|
|
|
+ copy.setLis(lisDetail);
|
|
|
+ copy.setMsg(bean.getCriticalLis() + "【低危急值】");
|
|
|
+ indicationPushVOList.add(copy);
|
|
|
+ }
|
|
|
+ if (bean.getCriticalMax() != null) {
|
|
|
+ IndicationPushVO copy = new IndicationPushVO();
|
|
|
+ BeanUtil.copyProperties(indicationPushVO, copy);
|
|
|
+ List<Lis> lisDetail = new ArrayList<>();
|
|
|
Lis lisDetailBean = new Lis();
|
|
|
lisDetailBean.setName(bean.getCriticalMeal());
|
|
|
lisDetailBean.setDetailName(bean.getCriticalLis());
|
|
|
lisDetailBean.setUniqueName(bean.getCriticalLis());
|
|
|
lisDetailBean.setValue(bean.getCriticalMax());
|
|
|
lisDetail.add(lisDetailBean);
|
|
|
+ copy.setLis(lisDetail);
|
|
|
+ copy.setMsg(bean.getCriticalLis() + "【高危急值】");
|
|
|
+ indicationPushVOList.add(copy);
|
|
|
}
|
|
|
- indicationPushVO.setLis(lisDetail);
|
|
|
- indicationPushVO.setMsg(bean.getCriticalLis());
|
|
|
-
|
|
|
- indicationPushVOList.add(indicationPushVO);
|
|
|
}
|
|
|
|
|
|
Map<String, Object> map = getDebugMap(indicationPushVOList, "1", start);
|