|
@@ -735,14 +735,25 @@ public class TestFacade {
|
|
|
continue;
|
|
|
}
|
|
|
IndicationPushVO indicationPushVO = new IndicationPushVO();
|
|
|
+ String operationName = bean.getOperationName();
|
|
|
+ List<Item> operation = new ArrayList<>();
|
|
|
+ String[] operationStrArray = operationName.split(",");
|
|
|
+ for(String str :operationStrArray){
|
|
|
+ Item item = new Item();
|
|
|
+ item.setName(str);
|
|
|
+ item.setUniqueName(str);
|
|
|
+ operation.add(item);
|
|
|
+ }
|
|
|
+/* indicationPushVO.setOperation(operation);
|
|
|
//年龄
|
|
|
String[] split = bean.getAgeAll().split(",");
|
|
|
indicationPushVO.setAge((int) getValueNum(split));
|
|
|
indicationPushVO.setMsg("年龄");
|
|
|
indicationPushVO.setRuleType("3");
|
|
|
- indicationPushVO.setIdNum(bean.getIdNum());
|
|
|
+ indicationPushVO.setIdNum(bean.getIdNum());*/
|
|
|
|
|
|
- //体格
|
|
|
+ /* //体格
|
|
|
+
|
|
|
String physique = bean.getPhysique();
|
|
|
String[] physiqueStrArray = physique.split(",");
|
|
|
for (String str : physiqueStrArray) {
|
|
@@ -759,18 +770,17 @@ public class TestFacade {
|
|
|
indphysiquePushVO.setMsg("体格"+str);
|
|
|
indicationPushVOList.add(indicationPushVO);
|
|
|
}
|
|
|
- }
|
|
|
+ }*/
|
|
|
//化验
|
|
|
String lisAll = bean.getLisAll();
|
|
|
String[] physiquelisAll = lisAll.split(",");
|
|
|
-
|
|
|
for (String str : physiquelisAll) {
|
|
|
IndicationPushVO indicationPushVOlisList = new IndicationPushVO();
|
|
|
+ setname(indicationPushVOlisList,bean);
|
|
|
List<Lis> lisList = new ArrayList<>();
|
|
|
if (str.contains(",")) {
|
|
|
//包含英文逗号
|
|
|
String[] strArray = str.split(",");
|
|
|
- String lisStr = bean.getNeoName();
|
|
|
Lis lisBean = new Lis();
|
|
|
lisBean.setUniqueName(strArray[0]);
|
|
|
lisBean.setName(strArray[0]);
|
|
@@ -783,7 +793,7 @@ public class TestFacade {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- //辅检
|
|
|
+ /* //辅检
|
|
|
String pacsAll = bean.getPacsAll();
|
|
|
String[] physiquepacsAll = pacsAll.split(",");
|
|
|
indicationPushVO.setSymptom(pacsAll);
|
|
@@ -814,13 +824,13 @@ public class TestFacade {
|
|
|
indicationPushVOpacs.setMsg("诊断"+diseaseStr);
|
|
|
indicationPushVOpacs.setDiag(diag);
|
|
|
indicationPushVOList.add(indicationPushVOpacs);
|
|
|
- }
|
|
|
+ }*/
|
|
|
List<Item> operationOrder = new ArrayList<>();
|
|
|
Item item = new Item();
|
|
|
item.setUniqueName(bean.getOperationName());
|
|
|
item.setName(bean.getOperationName());
|
|
|
operationOrder.add(item);
|
|
|
- //indicationPushVO.setOperationOrder(operationOrder);
|
|
|
+ indicationPushVO.setOperationOrder(operationOrder);
|
|
|
indicationPushVOList.add(indicationPushVO);
|
|
|
}
|
|
|
|
|
@@ -845,4 +855,12 @@ public class TestFacade {
|
|
|
map.put("程序报错", errMsg);
|
|
|
return map;
|
|
|
}
|
|
|
+ public void setname(IndicationPushVO indicationPushVO,TestIndicationVO bean){
|
|
|
+ List<Item> operationOrder = new ArrayList<>();
|
|
|
+ Item item = new Item();
|
|
|
+ item.setUniqueName(bean.getOperationName());
|
|
|
+ item.setName(bean.getOperationName());
|
|
|
+ operationOrder.add(item);
|
|
|
+ indicationPushVO.setOperationOrder(operationOrder);
|
|
|
+ }
|
|
|
}
|