修改hisName返回参数只针对检验检查项目

common-push/src/main/java/org/diagbot/common/push/filter/rule/PretreatmentRule.java

@@ -135,6 +135,7 @@ public class PretreatmentRule {
             List<PreResult> preResults = searchData.getLisOrder();
             for (PreResult result : preResults) {
                 result.setValue(result.getUniqueName());
+                result.setHisName(result.getName());
                 result.setUniqueName("开单--");
             }
             add2PreResultList(searchData.getLisOrder(), "", "lisOrder", searchData);
@@ -144,6 +145,7 @@ public class PretreatmentRule {
             List<PreResult> preResults = searchData.getPacsOrder();
             for (PreResult result : preResults) {
                 result.setValue(result.getUniqueName());
+                result.setHisName(result.getName());
                 result.setUniqueName("开单--");
             }
             add2PreResultList(searchData.getPacsOrder(), "", "pacsOrder", searchData);
@@ -242,7 +244,7 @@ public class PretreatmentRule {
                                 accord_rules = accord_rule_map.get(inputType);
                             }
                             //在满足规则里存放his项目名称
-                            rule.setHisName(result.getName());
+                            rule.setHisName(result.getHisName());
                             accord_rules.add(rule);
                             accord_rule_map.put(inputType, accord_rules);
                             searchData.setRules(accord_rule_map);

nlp/src/main/java/org/diagbot/nlp/rule/module/PreResult.java

@@ -14,6 +14,8 @@ public class PreResult {
     private String units = "";
     private String value = "";
     private String result = "";
+    //针对开单辅检项目
+    private String hisName = "";
 
     public String getDetailName() {
         return detailName;
@@ -94,4 +96,12 @@ public class PreResult {
     public void setResult(String result) {
         this.result = result;
     }
+
+    public String getHisName() {
+        return hisName;
+    }
+
+    public void setHisName(String hisName) {
+        this.hisName = hisName;
+    }
 }