Merge remote-tracking branch 'origin/dev/ruleTest20210105' into test

cdssman-service/src/main/java/com/diagbot/facade/RuleConvertFacade.java

@@ -1453,7 +1453,11 @@ public class RuleConvertFacade {
                     if (result.getMinValue() != null) {
                         ResultBill minResult = new ResultBill();
                         BeanUtil.copyProperties(result, minResult);
-                        minResult.setInputValue(random(null, result.getMinValue()).toString());
+                        if (result.getConflictItemType().equals(GraphLabelEnum.Vital.getName()) && result.getConflictItemName().equals("年龄")) {
+                            minResult.setInputValue(random_int(null, result.getMinValue().intValue()).toString());
+                        } else {
+                            minResult.setInputValue(random(null, result.getMinValue()).toString());
+                        }
                         BillMsg billMsg = getBillMsg(minResult);
                         minResult.setExpectedOutput(billMsg.getMsg());
                         retList.add(minResult);
@@ -1461,13 +1465,21 @@ public class RuleConvertFacade {
                     if (result.getMaxValue() != null) {
                         ResultBill maxResult = new ResultBill();
                         BeanUtil.copyProperties(result, maxResult);
-                        maxResult.setInputValue(random(result.getMaxValue(), null).toString());
+                        if (result.getConflictItemType().equals(GraphLabelEnum.Vital.getName()) && result.getConflictItemName().equals("年龄")) {
+                            maxResult.setInputValue(random_int(result.getMaxValue().intValue(), null).toString());
+                        } else {
+                            maxResult.setInputValue(random(result.getMaxValue(), null).toString());
+                        }
                         BillMsg billMsg = getBillMsg(maxResult);
                         maxResult.setExpectedOutput(billMsg.getMsg());
                         retList.add(maxResult);
                     }
                 } else {
-                    result.setInputValue(random(result.getMinValue(), result.getMaxValue()).toString());
+                    if (result.getConflictItemType().equals(GraphLabelEnum.Vital.getName()) && result.getConflictItemName().equals("年龄")) {
+                        result.setInputValue(random_int(result.getMinValue().intValue(), result.getMaxValue().intValue()).toString());
+                    } else {
+                        result.setInputValue(random(result.getMinValue(), result.getMaxValue()).toString());
+                    }
                     BillMsg billMsg = getBillMsg(result);
                     result.setExpectedOutput(billMsg.getMsg());
                     retList.add(result);

cdssman-service/src/main/java/com/diagbot/facade/SearchDataFacade.java

@@ -45,7 +45,7 @@ public class SearchDataFacade {
             //检验开单项
             Lis lis = new Lis();
             lis.setName(resultBill.getBillItemHisName());
-            lis.setDetailName(resultBill.getBillItemHisDetailName());
+            //lis.setDetailName(resultBill.getBillItemHisDetailName());
             lis.setUniqueName(resultBill.getBillItemName());
             indicationPushVO.getLisOrder().add(lis);
         }
@@ -91,7 +91,8 @@ public class SearchDataFacade {
             } else if (resultBill.getConflictItemName().equals("体温")) {
                 indicationPushVO.setVital(resultBill.getConflictItemName() + resultBill.getInputValue() + "℃,");
             } else {
-                indicationPushVO.setVital(resultBill.getConflictItemName() + resultBill.getInputValue() + ",");
+                indicationPushVO.setVital(resultBill.getConflictItemName() +
+                        (StringUtil.isNotBlank(resultBill.getInputValue()) ? resultBill.getInputValue() : "") + ",");
             }
         } else if (resultBill.getConflictItemType().equals(GraphLabelEnum.ClinicalFinding.getName())) {
             indicationPushVO.setSymptom(indicationPushVO.getSymptom() +