|
@@ -77,41 +77,44 @@ public class TestFacade {
|
|
|
IndicationPushVO indicationPushVO = new IndicationPushVO();
|
|
|
indicationPushVO.setRuleType("2");
|
|
|
indicationPushVO.setIdNum(bean.getIdNum());
|
|
|
+ if (StringUtil.isBlank(bean.getStandName()) || bean.getNeoName().startsWith("本品")) {
|
|
|
+ continue;
|
|
|
+ }
|
|
|
if (StringUtil.isNotBlank(bean.getOrderType())) {
|
|
|
switch (bean.getOrderType()) {
|
|
|
- case "实验室检查名称": // 细项
|
|
|
- List<Lis> lisDetailOrder = new ArrayList<>();
|
|
|
- Lis lisDetailBean = new Lis();
|
|
|
- lisDetailBean.setName(bean.getStandName());
|
|
|
- lisDetailBean.setDetailName(bean.getStandName());
|
|
|
- lisDetailBean.setUniqueName(bean.getStandName());
|
|
|
- lisDetailOrder.add(lisDetailBean);
|
|
|
- indicationPushVO.setLisOrder(lisDetailOrder);
|
|
|
- break;
|
|
|
- case "辅助检查名称":
|
|
|
- List<Pacs> pacsOrder = new ArrayList<>();
|
|
|
- Pacs pacsBean = new Pacs();
|
|
|
- pacsBean.setName(bean.getStandName());
|
|
|
- pacsBean.setUniqueName(bean.getStandName());
|
|
|
- pacsOrder.add(pacsBean);
|
|
|
- indicationPushVO.setPacsOrder(pacsOrder);
|
|
|
- break;
|
|
|
- case "实验室检查套餐名":
|
|
|
- List<Lis> lisOrder = new ArrayList<>();
|
|
|
- Lis lisBean = new Lis();
|
|
|
- lisBean.setName(bean.getStandName());
|
|
|
- lisBean.setUniqueName(bean.getStandName());
|
|
|
- lisOrder.add(lisBean);
|
|
|
- indicationPushVO.setLisOrder(lisOrder);
|
|
|
- break;
|
|
|
- case "医保手术和操作名称":
|
|
|
- List<Item> operationOrder = new ArrayList<>();
|
|
|
- Item operationItem = new Item();
|
|
|
- operationItem.setName(bean.getStandName());
|
|
|
- operationItem.setUniqueName(bean.getStandName());
|
|
|
- operationOrder.add(operationItem);
|
|
|
- indicationPushVO.setOperationOrder(operationOrder);
|
|
|
- break;
|
|
|
+ // case "实验室检查名称": // 细项
|
|
|
+ // List<Lis> lisDetailOrder = new ArrayList<>();
|
|
|
+ // Lis lisDetailBean = new Lis();
|
|
|
+ // lisDetailBean.setName(bean.getStandName());
|
|
|
+ // lisDetailBean.setDetailName(bean.getStandName());
|
|
|
+ // lisDetailBean.setUniqueName(bean.getStandName());
|
|
|
+ // lisDetailOrder.add(lisDetailBean);
|
|
|
+ // indicationPushVO.setLisOrder(lisDetailOrder);
|
|
|
+ // break;
|
|
|
+ // case "辅助检查名称":
|
|
|
+ // List<Pacs> pacsOrder = new ArrayList<>();
|
|
|
+ // Pacs pacsBean = new Pacs();
|
|
|
+ // pacsBean.setName(bean.getStandName());
|
|
|
+ // pacsBean.setUniqueName(bean.getStandName());
|
|
|
+ // pacsOrder.add(pacsBean);
|
|
|
+ // indicationPushVO.setPacsOrder(pacsOrder);
|
|
|
+ // break;
|
|
|
+ // case "实验室检查套餐名":
|
|
|
+ // List<Lis> lisOrder = new ArrayList<>();
|
|
|
+ // Lis lisBean = new Lis();
|
|
|
+ // lisBean.setName(bean.getStandName());
|
|
|
+ // lisBean.setUniqueName(bean.getStandName());
|
|
|
+ // lisOrder.add(lisBean);
|
|
|
+ // indicationPushVO.setLisOrder(lisOrder);
|
|
|
+ // break;
|
|
|
+ // case "医保手术和操作名称":
|
|
|
+ // List<Item> operationOrder = new ArrayList<>();
|
|
|
+ // Item operationItem = new Item();
|
|
|
+ // operationItem.setName(bean.getStandName());
|
|
|
+ // operationItem.setUniqueName(bean.getStandName());
|
|
|
+ // operationOrder.add(operationItem);
|
|
|
+ // indicationPushVO.setOperationOrder(operationOrder);
|
|
|
+ // break;
|
|
|
case "药品通用名称":
|
|
|
List<Drug> drugOrder = new ArrayList<>();
|
|
|
Drug drug = new Drug();
|
|
@@ -130,9 +133,9 @@ public class TestFacade {
|
|
|
if (StringUtil.isNotEmpty(bean.getNeoType())) {
|
|
|
switch (bean.getNeoType()) {
|
|
|
case "1": // 性别
|
|
|
- if ("男性".equals(bean.getNeoName())) {
|
|
|
+ if ("男".equals(bean.getNeoName())) {
|
|
|
indicationPushVO.setSex(1);
|
|
|
- } else if ("女性".equals(bean.getNeoName())) {
|
|
|
+ } else if ("女".equals(bean.getNeoName())) {
|
|
|
indicationPushVO.setSex(2);
|
|
|
}
|
|
|
break;
|
|
@@ -232,7 +235,7 @@ public class TestFacade {
|
|
|
}
|
|
|
break;
|
|
|
case "14": // 年龄
|
|
|
- String[] splitAge = bean.getNeoName().split(",");
|
|
|
+ String[] splitAge = bean.getNeoName().split(",|,");
|
|
|
indicationPushVO.setAge((int) getValueNum(splitAge));
|
|
|
break;
|
|
|
default:
|
|
@@ -412,9 +415,9 @@ public class TestFacade {
|
|
|
indicationPushVO.setRuleType("4");
|
|
|
indicationPushVO.setIdNum(bean.getIdNum());
|
|
|
|
|
|
- if ("男性".equals(bean.getSexStr())) {
|
|
|
+ if ("男".equals(bean.getSexStr())) {
|
|
|
indicationPushVO.setSex(1);
|
|
|
- } else if ("女性".equals(bean.getSexStr())) {
|
|
|
+ } else if ("女".equals(bean.getSexStr())) {
|
|
|
indicationPushVO.setSex(2);
|
|
|
}
|
|
|
if (StringUtil.isNotBlank(bean.getDisName())) {
|