|
@@ -722,12 +722,12 @@ public class TestFacade {
|
|
|
operation.add(item);
|
|
|
}
|
|
|
indicationPushVO.setOperation(operation);*/
|
|
|
- //年龄
|
|
|
+ //年龄
|
|
|
IndicationPushVO indicationPushVOAge = new IndicationPushVO();
|
|
|
String[] split = bean.getAgeAll().split(",");
|
|
|
setname(indicationPushVOAge,bean);
|
|
|
indicationPushVOAge.setAge((int) getValueNum(split));
|
|
|
- indicationPushVOAge.setMsg("年龄:"+operationNameMsg);
|
|
|
+ indicationPushVOAge.setMsg("年龄:"+(int) getValueNum(split)+operationNameMsg);
|
|
|
indicationPushVOAge.setRuleType("3");
|
|
|
indicationPushVOAge.setIdNum(bean.getIdNum());
|
|
|
indicationPushVOList.add(indicationPushVOAge);
|
|
@@ -735,14 +735,19 @@ public class TestFacade {
|
|
|
//体格
|
|
|
String physique = bean.getPhysique();
|
|
|
String[] physiqueStrArray = physique.split(",");
|
|
|
- for (String str : physiqueStrArray) {
|
|
|
+ for (int i = 0;i<physiqueStrArray.length;i++) {
|
|
|
+ String str = physiqueStrArray[i];
|
|
|
+ if(testLineVO.isGetOne()){
|
|
|
+ int sum = getRandomNum(physiqueStrArray.length);
|
|
|
+ str =physiqueStrArray[sum];
|
|
|
+ }
|
|
|
IndicationPushVO indphysiquePushVO = new IndicationPushVO();
|
|
|
setname(indphysiquePushVO,bean);
|
|
|
StringBuffer sbVital = new StringBuffer();
|
|
|
String[] vitalArr = str.split(",");
|
|
|
if (vitalArr.length > 1) {
|
|
|
- if ("收缩压".equals(vitalArr[0]) || "舒张压".equals(vitalArr[0])) {
|
|
|
- if ("收缩压".equals(vitalArr[0])) {
|
|
|
+ if ("收缩压".equals(vitalArr[0].trim()) || "舒张压".equals(vitalArr[0].trim())) {
|
|
|
+ if ("收缩压".equals(vitalArr[0].trim())) {
|
|
|
sbVital.append("血压");
|
|
|
sbVital.append(getValue(vitalArr) + "/100mmHg");
|
|
|
indphysiquePushVO.setIdNum(bean.getIdNum());
|
|
@@ -779,13 +784,21 @@ public class TestFacade {
|
|
|
indphysiquePushVO.setVital(sbVital.toString());
|
|
|
indicationPushVOList.add(indphysiquePushVO);
|
|
|
}
|
|
|
-
|
|
|
+ if(testLineVO.isGetOne()){
|
|
|
+ break;
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
//化验
|
|
|
String lisAll = bean.getLisAll();
|
|
|
String[] physiquelisAll = lisAll.split(",");
|
|
|
- for (String str : physiquelisAll) {
|
|
|
+ for (int i = 0;i<physiquelisAll.length;i++) {
|
|
|
+
|
|
|
+ String str = physiquelisAll[i];
|
|
|
+ if(testLineVO.isGetOne()){
|
|
|
+ int sum = getRandomNum(physiquelisAll.length);
|
|
|
+ str =physiquelisAll[sum];
|
|
|
+ }
|
|
|
IndicationPushVO indicationPushVOlisList = new IndicationPushVO();
|
|
|
setname(indicationPushVOlisList,bean);
|
|
|
List<Lis> lisList = new ArrayList<>();
|
|
@@ -794,30 +807,33 @@ public class TestFacade {
|
|
|
String[] strArray = str.split(",");
|
|
|
if(strArray.length>2) {
|
|
|
Lis lisBean = new Lis();
|
|
|
- lisBean.setUniqueName(strArray[0]);
|
|
|
- lisBean.setName(strArray[0]);
|
|
|
- lisBean.setDetailName(strArray[0]);
|
|
|
+ lisBean.setUniqueName(strArray[0].trim());
|
|
|
+ lisBean.setName(strArray[0].trim());
|
|
|
+ lisBean.setDetailName(strArray[0].trim());
|
|
|
lisBean.setValue(getValue(strArray));
|
|
|
lisList.add(lisBean);
|
|
|
indicationPushVOlisList.setIdNum(bean.getIdNum());
|
|
|
indicationPushVOlisList.setRuleType("3");
|
|
|
- indicationPushVOlisList.setMsg("化验" + strArray[0] + "==" + operationNameMsg);
|
|
|
+ indicationPushVOlisList.setMsg("化验" + strArray[0].trim() + "==" + operationNameMsg);
|
|
|
indicationPushVOlisList.setLis(lisList);
|
|
|
indicationPushVOList.add(indicationPushVOlisList);
|
|
|
}else {
|
|
|
Lis lisBean = new Lis();
|
|
|
- lisBean.setUniqueName(strArray[0]);
|
|
|
+ lisBean.setUniqueName(strArray[0].trim());
|
|
|
lisBean.setName(strArray[0]);
|
|
|
- lisBean.setDetailName(strArray[0]);
|
|
|
- lisBean.setOtherValue(strArray[1]);
|
|
|
+ lisBean.setDetailName(strArray[0].trim());
|
|
|
+ lisBean.setOtherValue(strArray[1].trim());
|
|
|
lisList.add(lisBean);
|
|
|
indicationPushVOlisList.setIdNum(bean.getIdNum());
|
|
|
indicationPushVOlisList.setRuleType("3");
|
|
|
- indicationPushVOlisList.setMsg("化验:" + strArray[0] + "==" + operationNameMsg);
|
|
|
+ indicationPushVOlisList.setMsg("化验:" + strArray[0].trim() + "==" + operationNameMsg);
|
|
|
indicationPushVOlisList.setLis(lisList);
|
|
|
indicationPushVOList.add(indicationPushVOlisList);
|
|
|
}
|
|
|
}
|
|
|
+ if(testLineVO.isGetOne()){
|
|
|
+ break;
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
//辅检
|
|
@@ -825,14 +841,20 @@ public class TestFacade {
|
|
|
String[] physiquepacsAll = pacsAll.split(",");
|
|
|
//indicationPushVO.setSymptom(pacsAll);
|
|
|
|
|
|
- for (String pacsStr : physiquepacsAll) {
|
|
|
+ for (int i = 0;i<physiquepacsAll.length;i++) {
|
|
|
+
|
|
|
+ String pacsStr = physiquepacsAll[i];
|
|
|
+ if(testLineVO.isGetOne()){
|
|
|
+ int sum = getRandomNum(physiquepacsAll.length);
|
|
|
+ pacsStr =physiquepacsAll[sum];
|
|
|
+ }
|
|
|
IndicationPushVO indicationPushVOpacs = new IndicationPushVO();
|
|
|
setname(indicationPushVOpacs,bean);
|
|
|
List<Pacs> pacs = new ArrayList<>();
|
|
|
Pacs pacs1 = new Pacs();
|
|
|
pacs1.setUniqueName("腹部CT");
|
|
|
pacs1.setName("腹部CT");
|
|
|
- pacs1.setResult(pacsStr);
|
|
|
+ pacs1.setResult(pacsStr.trim());
|
|
|
pacs.add(pacs1);
|
|
|
indicationPushVOpacs.setIdNum(bean.getIdNum());
|
|
|
indicationPushVOpacs.setRuleType("3");
|
|
@@ -840,25 +862,37 @@ public class TestFacade {
|
|
|
indicationPushVOpacs.setPacs(pacs);
|
|
|
indicationPushVOpacs.setSymptom(pacsAll);
|
|
|
indicationPushVOList.add(indicationPushVOpacs);
|
|
|
+ if(testLineVO.isGetOne()){
|
|
|
+ break;
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
//诊断"腹部CT"
|
|
|
String disease = bean.getDisease();
|
|
|
String[] physiquedisease = disease.split(",");
|
|
|
|
|
|
- for (String diseaseStr : physiquedisease) {
|
|
|
+ for (int i = 0;i<physiquedisease.length;i++) {
|
|
|
+
|
|
|
+ String diseaseStr = physiquedisease[i];
|
|
|
+ if(testLineVO.isGetOne()){
|
|
|
+ int sum = getRandomNum(physiquelisAll.length);
|
|
|
+ diseaseStr =physiquedisease[sum];
|
|
|
+ }
|
|
|
IndicationPushVO indicationPushVOpacs = new IndicationPushVO();
|
|
|
setname(indicationPushVOpacs,bean);
|
|
|
List<Item> diag = new ArrayList<>();
|
|
|
Item item = new Item();
|
|
|
- item.setUniqueName(diseaseStr);
|
|
|
- item.setName(diseaseStr);
|
|
|
+ item.setUniqueName(diseaseStr.trim());
|
|
|
+ item.setName(diseaseStr.trim());
|
|
|
diag.add(item);
|
|
|
indicationPushVOpacs.setMsg("诊断:"+diseaseStr+"=="+operationNameMsg);
|
|
|
indicationPushVOpacs.setDiag(diag);
|
|
|
indicationPushVOpacs.setIdNum(bean.getIdNum());
|
|
|
indicationPushVOpacs.setRuleType("3");
|
|
|
indicationPushVOList.add(indicationPushVOpacs);
|
|
|
+ if(testLineVO.isGetOne()){
|
|
|
+ break;
|
|
|
+ }
|
|
|
}
|
|
|
//List<Item> operationOrder = new ArrayList<>();
|
|
|
// setname(indicationPushVO,bean);
|