推理入参增加过滤规则字段ruleType

aipt-service/src/main/java/com/diagbot/client/bean/SearchData.java

@@ -40,6 +40,8 @@ public class SearchData {
     private String pacsOrder;   //当前正在下单辅检
     private String otherOrder; //其他
 
+    private String ruleType;   //规则类型
+
     //特征类别
     private String featureType;
     //特征类别对","进行分割后数据

aipt-service/src/main/java/com/diagbot/vo/SearchVo.java

@@ -47,4 +47,6 @@ public class SearchVo {
     private String lisOrder;   //当前正在下单化验
     private String pacsOrder;   //当前正在下单辅检
     private String otherOrder; //其他
+
+    private String ruleType;   //规则类型
 }

aipt-service/src/main/java/com/diagbot/web/PushController.java

@@ -59,7 +59,8 @@ public class PushController {
                     "lisString：化验纯文本,String<br>" +
                     "lisOrder：下单化验项，多项用分号隔开,String<br>" +
                     "pacsOrder：下单辅检项，多项用分号隔开,String<br>" +
-                    "otherOrder：其他下单项，多项用分号隔开,String<br>")
+                    "otherOrder：其他下单项，多项用分号隔开,String<br>" +
+                    "ruleType：规则类型，1：危急值提醒  2：开单合理性  3：管理评估  4：不良反应  5：药物推荐，多项用分号隔开,String<br>")
     @PostMapping("/treatment")
     @SysLogger("treatment")
     public RespDTO<Treat> getTreatment(@Valid @RequestBody SearchVo searchVo) {
@@ -96,7 +97,8 @@ public class PushController {
                     "lisString：化验纯文本,String<br>" +
                     "lisOrder：下单化验项，多项用分号隔开,String<br>" +
                     "pacsOrder：下单辅检项，多项用分号隔开,String<br>" +
-                    "otherOrder：其他下单项，多项用分号隔开,String<br>")
+                    "otherOrder：其他下单项，多项用分号隔开,String<br>" +
+                    "ruleType：规则类型，1：危急值提醒  2：开单合理性  3：管理评估  4：不良反应  5：药物推荐，多项用分号隔开,String<br>")
     @PostMapping("/pushInner")
     @SysLogger("pushInner")
     public RespDTO<PushDTO> pushInner(@Valid @RequestBody SearchVo searchVo) {

data-service/src/main/java/com/diagbot/client/bean/SearchData.java

@@ -40,4 +40,6 @@ public class SearchData {
     private String lisOrder;   //当前正在下单化验
     private String pacsOrder;   //当前正在下单辅检
     private String otherOrder; //其他
+
+    private String ruleType;   //规则类型
 }

data-service/src/main/java/com/diagbot/facade/AssembleFacade.java

@@ -48,6 +48,7 @@ public class AssembleFacade {
         searchData.setLisOrder(pushVO.getLisOrder());
         searchData.setPacsOrder(pushVO.getPacsOrder());
         searchData.setOtherOrder(pushVO.getOtherOrder());
+        searchData.setRuleType(pushVO.getRuleType());
 
         switch (pushVO.getSex()) {
             case 1:

data-service/src/main/java/com/diagbot/vo/PushVO.java

@@ -24,4 +24,6 @@ public class PushVO  extends PushBaseVO {
     private String lisOrder;   //当前正在下单化验
     private String pacsOrder;   //当前正在下单辅检
     private String otherOrder; //其他
+
+    private String ruleType;   //规则类型
 }

data-service/src/main/java/com/diagbot/web/PushController.java

@@ -57,7 +57,8 @@ public class PushController {
                     "lisString：化验纯文本,String<br>" +
                     "lisOrder：下单化验项，多项用分号隔开,String<br>" +
                     "pacsOrder：下单辅检项，多项用分号隔开,String<br>" +
-                    "otherOrder：其他下单项，多项用分号隔开,String<br>")
+                    "otherOrder：其他下单项，多项用分号隔开,String<br>" +
+                    "ruleType：规则类型，1：危急值提醒  2：开单合理性  3：管理评估  4：不良反应  5：药物推荐，多项用分号隔开,String<br>")
     @PostMapping("/push")
     @SysLogger("push")
     public RespDTO<PushDTO> push(@RequestBody @Valid PushVO pushVO) {
@@ -91,7 +92,8 @@ public class PushController {
                     "lisString：化验纯文本,String<br>" +
                     "lisOrder：下单化验项，多项用分号隔开,String<br>" +
                     "pacsOrder：下单辅检项，多项用分号隔开,String<br>" +
-                    "otherOrder：其他下单项，多项用分号隔开,String<br>")
+                    "otherOrder：其他下单项，多项用分号隔开,String<br>" +
+                    "ruleType：规则类型，1：危急值提醒  2：开单合理性  3：管理评估  4：不良反应  5：药物推荐，多项用分号隔开,String<br>")
     @PostMapping("/pushTreatment")
     @SysLogger("pushTreatment")
     public RespDTO<Treat> pushTreatment(@RequestBody @Valid PushVO pushVO) {
@@ -126,7 +128,8 @@ public class PushController {
                     "lisString：化验纯文本,String<br>" +
                     "lisOrder：下单化验项，多项用分号隔开,String<br>" +
                     "pacsOrder：下单辅检项，多项用分号隔开,String<br>" +
-                    "otherOrder：其他下单项，多项用分号隔开,String<br>")
+                    "otherOrder：其他下单项，多项用分号隔开,String<br>" +
+                    "ruleType：规则类型，1：危急值提醒  2：开单合理性  3：管理评估  4：不良反应  5：药物推荐，多项用分号隔开,String<br>")
     @PostMapping("/pushScale")
     @SysLogger("pushScale")
     public RespDTO<Map<String, Object>> pushScale(@RequestBody @Valid PushVO pushVO) {

icss-service/src/main/java/com/diagbot/client/bean/AdverseReaction.java

@@ -13,9 +13,10 @@ import java.util.List;
 @Getter
 @Setter
 public class AdverseReaction {
-    private Long id;
+    private Long conceptId;
     private String name;  //名称
-    private String tagName; //标签名称
+    private Integer libType;
+    private Integer type;
     private String showInfo = "0";//是否显示提示信息
     private Integer controlType; //控件类型
     private List<AdverseReactionDetail> details;

icss-service/src/main/java/com/diagbot/client/bean/SearchData.java

@@ -37,4 +37,6 @@ public class SearchData {
     private String hosCode;    //医院编码
     @ApiModelProperty(hidden = true)
     private Integer sysType;   //系统类型
+
+    private String ruleType;   //规则类型
 }

icss-service/src/main/java/com/diagbot/facade/AssembleFacade.java

@@ -47,6 +47,7 @@ public class AssembleFacade {
         searchData.setSysCode("1");
         searchData.setLength(10);
         searchData.setSysType(SysTypeEnum.ICSS_SERVICE.getKey());
+        searchData.setRuleType(pushVO.getRuleType());
 
         switch (pushVO.getSex()) {
             case 1:

icss-service/src/main/java/com/diagbot/vo/PushVO.java

@@ -23,4 +23,6 @@ public class PushVO  extends PushBaseVO {
     private String lisOrder;   //当前正在下单化验
     private String pacsOrder;   //当前正在下单辅检
     private String otherOrder; //其他
+
+    private String ruleType;   //规则类型
 }

icss-service/src/main/java/com/diagbot/web/PushController.java

@@ -19,7 +19,6 @@ import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
 
 import javax.validation.Valid;
-import java.util.Map;
 
 /**
  * @Description:推理接口
@@ -64,7 +63,8 @@ public class PushController {
                     "lisString：化验纯文本,String<br>" +
                     "lisOrder：下单化验项，多项用分号隔开,String<br>" +
                     "pacsOrder：下单辅检项，多项用分号隔开,String<br>" +
-                    "otherOrder：其他下单项，多项用分号隔开,String<br>")
+                    "otherOrder：其他下单项，多项用分号隔开,String<br>" +
+                    "ruleType：规则类型，1：危急值提醒  2：开单合理性  3：管理评估  4：不良反应  5：药物推荐，多项用分号隔开,String<br>")
     @PostMapping("/pushInner")
     @SysLogger("pushInner")
     public RespDTO<PushDTO> pushInner(@RequestBody @Valid PushVO pushVO) {
@@ -99,7 +99,8 @@ public class PushController {
                     "lisString：化验纯文本,String<br>" +
                     "lisOrder：下单化验项，多项用分号隔开,String<br>" +
                     "pacsOrder：下单辅检项，多项用分号隔开,String<br>" +
-                    "otherOrder：其他下单项，多项用分号隔开,String<br>")
+                    "otherOrder：其他下单项，多项用分号隔开,String<br>" +
+                    "ruleType：规则类型，1：危急值提醒  2：开单合理性  3：管理评估  4：不良反应  5：药物推荐，多项用分号隔开,String<br>")
     @PostMapping("/pushTreatment")
     @SysLogger("pushTreatment")
     public RespDTO<Treat> pushTreatment(@RequestBody @Valid PushVO pushVO) {

ltapi-service/src/main/java/com/diagbot/client/bean/SearchData.java

@@ -41,4 +41,6 @@ public class SearchData {
     private String lisOrder;
     private String pacsOrder;
     private String otherOrder;
+
+    private String ruleType;   //规则类型
 }

ltapi-service/src/main/java/com/diagbot/facade/AssembleFacade.java

@@ -2,12 +2,15 @@ package com.diagbot.facade;
 
 import com.diagbot.client.bean.LisResult;
 import com.diagbot.client.bean.SearchData;
+import com.diagbot.enums.FeatureTypeEnum;
 import com.diagbot.enums.SysTypeEnum;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.ListUtil;
+import com.diagbot.util.StringUtil;
 import com.diagbot.vo.PushVO;
 import org.springframework.stereotype.Component;
 
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -47,6 +50,23 @@ public class AssembleFacade {
         searchData.setLisOrder(pushVO.getLisOrder());
         searchData.setPacsOrder(pushVO.getPacsOrder());
         searchData.setOtherOrder(pushVO.getOtherOrder());
+        String ruleType = "";
+        String[] featureTypes = searchData.getFeatureType().split(",|，");
+        List<String> featureTypeList = Arrays.asList(featureTypes);
+        if (featureTypeList.contains(FeatureTypeEnum.MedicalIndication.getKey())) {
+            ruleType += "1,2";
+        } else if (featureTypeList.contains(FeatureTypeEnum.ManagementEvaluation.getKey())) {
+            if (StringUtil.isNotBlank(ruleType)) {
+                ruleType += ",";
+            }
+            ruleType += "3";
+        } else if (featureTypeList.contains(FeatureTypeEnum.Treat.getKey())) {
+            if (StringUtil.isNotBlank(ruleType)) {
+                ruleType += ",";
+            }
+            ruleType += "4,5";
+        }
+        searchData.setRuleType(ruleType);
 
         switch (pushVO.getSex()) {
             case 1:

ltapi-service/src/main/java/com/diagbot/vo/PushVO.java

@@ -29,4 +29,7 @@ public class PushVO  extends PushBaseVO {
     private String lisOrder;   //当前正在下单化验
     private String pacsOrder;   //当前正在下单辅检
     private String otherOrder; //其他
+
+    @ApiModelProperty(hidden = true)
+    private String ruleType;   //规则类型
 }

ltapi-service/src/main/java/com/diagbot/web/PushController.java

@@ -63,7 +63,8 @@ public class PushController {
                     "lisString：化验纯文本,String<br>" +
                     "lisOrder：下单化验项，多项用分号隔开,String<br>" +
                     "pacsOrder：下单辅检项，多项用分号隔开,String<br>" +
-                    "otherOrder：其他下单项，多项用分号隔开,String<br>")
+                    "otherOrder：其他下单项，多项用分号隔开,String<br>" +
+                    "ruleType：规则类型，1：危急值提醒  2：开单合理性  3：管理评估  4：不良反应  5：药物推荐，多项用分号隔开,String<br>")
     @PostMapping("/push")
     @SysLogger("push")
     public RespDTO<PushDTO> push(@RequestBody @Valid PushVO pushVO) {
@@ -101,7 +102,8 @@ public class PushController {
                     "lisString：化验纯文本,String<br>" +
                     "lisOrder：下单化验项，多项用分号隔开,String<br>" +
                     "pacsOrder：下单辅检项，多项用分号隔开,String<br>" +
-                    "otherOrder：其他下单项，多项用分号隔开,String<br>")
+                    "otherOrder：其他下单项，多项用分号隔开,String<br>" +
+                    "ruleType：规则类型，1：危急值提醒  2：开单合理性  3：管理评估  4：不良反应  5：药物推荐，多项用分号隔开,String<br>")
     @PostMapping("/pushTreatment")
     @SysLogger("pushTreatment")
     public RespDTO<Treat> pushTreatment(@RequestBody @Valid PushVO pushVO) {
@@ -135,7 +137,8 @@ public class PushController {
                     "scaleName：量表名称,String<br>" +
                     "disType：诊断类型，1-慢病，2-急诊，普通病不填,Integer<br>" +
                     "indications：指标结果,String<br>" +
-                    "adverseReactions：不良反应,String<br>")
+                    "adverseReactions：不良反应,String<br>" +
+                    "ruleType：规则类型，1：危急值提醒  2：开单合理性  3：管理评估  4：不良反应  5：药物推荐，多项用分号隔开,String<br>")
     @PostMapping("/pushScale")
     @SysLogger("pushScale")
     @ApiIgnore

prec-service/src/main/java/com/diagbot/client/bean/SearchData.java

@@ -31,4 +31,5 @@ public class SearchData {
     private String adverseEvent;
     private String hosCode;
     private Integer sysType;  //系统类型
+    private String ruleType;   //规则类型
 }

prec-service/src/main/java/com/diagbot/facade/AssembleFacade.java

@@ -28,6 +28,7 @@ public class AssembleFacade {
         searchData.setLength(10);
         searchData.setSysType(SysTypeEnum.PREC_SERVICE.getKey());
         searchData.setHosCode(pushVO.getHosCode());
+        searchData.setRuleType(pushVO.getRuleType());
         switch (pushVO.getSex()) {
             case 1:
                 searchData.setSex("M");

prec-service/src/main/java/com/diagbot/vo/PushVO.java

@@ -24,4 +24,6 @@ public class PushVO {
     private String symptom;
     @NotBlank(message = "请输入医院编码")
     private String hosCode;
+    @ApiModelProperty(hidden = true)
+    private String ruleType;   //规则类型
 }

triage-service/src/main/java/com/diagbot/client/bean/SearchData.java

@@ -1,5 +1,8 @@
 package com.diagbot.client.bean;
 
+import lombok.Getter;
+import lombok.Setter;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -8,6 +11,8 @@ import java.util.Map;
 /**
  * Created by fyeman on 2018/1/31.
  */
+@Getter
+@Setter
 public class SearchData {
     private int length = 10;
     private int age_start = 0;
@@ -38,6 +43,8 @@ public class SearchData {
     //外部系统编码 用于返回映射数据，如果sysCode为空或null，则返回kl_standard_info标准名称
     private String sysCode;
 
+    private String ruleType;   //规则类型
+
     private Map<String, Map<String, String>> inputs = new HashMap<>(10, 0.8f);
 
 
@@ -47,213 +54,4 @@ public class SearchData {
     private List<Feature> pacsFeatureList = new ArrayList<>();
     private List<Feature> diagFeatureList = new ArrayList<>();
     private List<Feature> symptompropertyFeatureList = new ArrayList<>();
-
-    public int getLength() {
-        return length;
-    }
-
-    public void setLength(int length) {
-        this.length = length;
-    }
-
-    public int getAge_start() {
-        return age_start;
-    }
-
-    public void setAge_start(int age_start) {
-        this.age_start = age_start;
-    }
-
-    public int getAge_end() {
-        return age_end;
-    }
-
-    public void setAge_end(int age_end) {
-        this.age_end = age_end;
-    }
-
-    public int getAge() {
-        return age;
-    }
-
-    public void setAge(int age) {
-        this.age = age;
-    }
-
-    public String getSex() {
-        return sex;
-    }
-
-    public void setSex(String sex) {
-        this.sex = sex;
-    }
-
-    public String getSymptom() {
-        return symptom;
-    }
-
-    public void setSymptom(String symptom) {
-        this.symptom = symptom;
-    }
-
-    public String getVital() {
-        return vital;
-    }
-
-    public void setVital(String vital) {
-        this.vital = vital;
-    }
-
-    public String getLis() {
-        return lis;
-    }
-
-    public void setLis(String lis) {
-        this.lis = lis;
-    }
-
-    public String getPacs() {
-        return pacs;
-    }
-
-    public void setPacs(String pacs) {
-        this.pacs = pacs;
-    }
-
-    public String getDiag() {
-        return diag;
-    }
-
-    public void setDiag(String diag) {
-        this.diag = diag;
-    }
-
-    public String getPast() {
-        return past;
-    }
-
-    public void setPast(String past) {
-        this.past = past;
-    }
-
-    public String getOther() {
-        return other;
-    }
-
-    public void setOther(String other) {
-        this.other = other;
-    }
-
-    public String getFeatureType() {
-        return featureType;
-    }
-
-    public void setFeatureType(String featureType) {
-        this.featureType = featureType;
-    }
-
-    public String[] getFeatureTypes() {
-        return featureTypes;
-    }
-
-    public void setFeatureTypes(String[] featureTypes) {
-        this.featureTypes = featureTypes;
-    }
-
-    public String getResourceType() {
-        return resourceType;
-    }
-
-    public void setResourceType(String resourceType) {
-        this.resourceType = resourceType;
-    }
-
-    public String getSysCode() {
-        return sysCode;
-    }
-
-    public void setSysCode(String sysCode) {
-        this.sysCode = sysCode;
-    }
-
-    public void setThreshold(String threshold) {
-        this.threshold = threshold;
-    }
-
-    public float getThreshold() {
-        return Float.parseFloat(threshold);
-    }
-
-    public List<Feature> getSymptomFeatureList() {
-        return symptomFeatureList;
-    }
-
-    public void setSymptomFeatureList(List<Feature> symptomFeatureList) {
-        this.symptomFeatureList = symptomFeatureList;
-    }
-
-    public List<Feature> getVitalFeatureList() {
-        return vitalFeatureList;
-    }
-
-    public void setVitalFeatureList(List<Feature> vitalFeatureList) {
-        this.vitalFeatureList = vitalFeatureList;
-    }
-
-    public List<Feature> getLisFeatureList() {
-        return lisFeatureList;
-    }
-
-    public void setLisFeatureList(List<Feature> lisFeatureList) {
-        this.lisFeatureList = lisFeatureList;
-    }
-
-    public List<Feature> getPacsFeatureList() {
-        return pacsFeatureList;
-    }
-
-    public void setPacsFeatureList(List<Feature> pacsFeatureList) {
-        this.pacsFeatureList = pacsFeatureList;
-    }
-
-
-    public List<Feature> getSymptompropertyFeatureList() {
-        return symptompropertyFeatureList;
-    }
-
-    public void setSymptompropertyFeatureList(List<Feature> symptompropertyFeatureList) {
-        this.symptompropertyFeatureList = symptompropertyFeatureList;
-    }
-
-    public List<Feature> getDiagFeatureList() {
-        return diagFeatureList;
-    }
-
-    public void setDiagFeatureList(List<Feature> diagFeatureList) {
-        this.diagFeatureList = diagFeatureList;
-    }
-
-    public Map<String, Map<String, String>> getInputs() {
-        return inputs;
-    }
-
-    public void setInputs(Map<String, Map<String, String>> inputs) {
-        this.inputs = inputs;
-    }
-
-    public AlgorithmClassify[] getAlgorithmClassify() {
-        return algorithmClassify;
-    }
-
-    public void setAlgorithmClassify(AlgorithmClassify[] algorithmClassify) {
-        this.algorithmClassify = algorithmClassify;
-    }
-
-    public String getAlgorithmClassifyValue() {
-        return algorithmClassifyValue;
-    }
-
-    public void setAlgorithmClassifyValue(String algorithmClassifyValue) {
-        this.algorithmClassifyValue = algorithmClassifyValue;
-    }
-}
+}