Merge remote-tracking branch 'origin/dev/icssNCD' into dev/icssNCD

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

@@ -3,6 +3,8 @@ package com.diagbot.client.bean;
 import com.diagbot.client.AlgorithmClassify;
 import com.diagbot.client.Feature;
 import com.diagbot.dto.LisResult;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -12,6 +14,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;
@@ -29,7 +33,9 @@ public class SearchData {
     private String past = "";
     private String other = "";
     private List<LisResult> lisArr;
-
+    private Integer disType; //0-普通病（默认不填），1-慢病，2-急诊
+    private String scaleName;
+    private String indications;
 
     //特征类别
     private String featureType;
@@ -53,221 +59,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;
-    }
-
-    public List<LisResult> getLisArr() {
-        return lisArr;
-    }
-
-    public void setLisArr(List<LisResult> lisArr) {
-        this.lisArr = lisArr;
-    }
 }

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

@@ -63,5 +63,5 @@ public class SearchVo {
     private Map<String, Map<String, String>> inputs;
 
     private String scaleName;
-
+    private String indications;
 }

icss-service/src/main/java/com/diagbot/client/AiptServiceClient.java

@@ -31,7 +31,7 @@ public interface AiptServiceClient {
     @PostMapping(value = "/nlpService/symptomFeature")
     Response<List<Map<String, Object>>> symptomFeaturePageData(@RequestParam("text") String text);
 
-    @PostMapping("/clinicaldata/highRish")
+    @PostMapping("/clinicaldata/highRisk")
     Response<GdbResponse> highRisk(@RequestBody SearchData searchData);
 
     @PostMapping(value = "/clinicaldata/scaleCalc")

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

@@ -1,6 +1,8 @@
 package com.diagbot.client.bean;
 
 import com.diagbot.vo.LisResult;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -10,6 +12,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;
@@ -30,7 +34,7 @@ public class SearchData {
     private Integer disType; //0-普通病（默认不填），1-慢病，2-急诊
     private String scaleName;
     private List<AdverseReaction> adverseEvent;
-    private List<IndicationResult> indications;
+    private String indications;
 
     //特征类别
     private String featureType;
@@ -47,260 +51,10 @@ public class SearchData {
 
     private Map<String, Map<String, String>> inputs = new HashMap<>(10, 0.8f);
 
-
     private List<Feature> symptomFeatureList = new ArrayList<>();
     private List<Feature> vitalFeatureList = new ArrayList<>();
     private List<Feature> lisFeatureList = new ArrayList<>();
     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;
-    }
-
-    public List<LisResult> getLisArr() {
-        return lisArr;
-    }
-
-    public void setLisArr(List<LisResult> lisArr) {
-        this.lisArr = lisArr;
-    }
-
-    public Integer getDisType() {
-        return disType;
-    }
-
-    public void setDisType(Integer disType) {
-        this.disType = disType;
-    }
-
-    public String getScaleName() {
-        return scaleName;
-    }
-
-    public void setScaleName(String scaleName) {
-        this.scaleName = scaleName;
-    }
-
-    public List<AdverseReaction> getAdverseEvent() {
-        return adverseEvent;
-    }
-
-    public void setAdverseEvent(List<AdverseReaction> adverseEvent) {
-        this.adverseEvent = adverseEvent;
-    }
-
-    public List<IndicationResult> getIndications() {
-        return indications;
-    }
-
-    public void setIndications(List<IndicationResult> indications) {
-        this.indications = indications;
-    }
 }

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

@@ -104,7 +104,7 @@ public class PushFacade {
         searchData.setDisType(pushVO.getDisType());
         searchData.setAdverseEvent(pushVO.getAdverseReactions());
         searchData.setScaleName(pushVO.getScaleName());
-        searchData.setIndications(pushVO.getMedicalIndications());
+        searchData.setIndications(pushVO.getIndications());
         searchData.setFeatureType(pushVO.getFeatureType());
         searchData.setSysCode("1");
         searchData.setLength(10);

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

@@ -14,12 +14,12 @@ import java.util.List;
  */
 @Getter
 @Setter
-public class PushVO  extends PushBaseVO{
+public class PushVO  extends PushBaseVO {
     private Long diseaseId;
     private Long patientId;   //病人id
     private String scaleName; //量表名称
     private Long scaleId;     //量表id
     private Integer disType;  //0-普通病（默认不填），1-慢病，2-急诊
     private List<AdverseReaction> adverseReactions; //不良反应
-    private List<IndicationResult> medicalIndications;   //推理指标
+    private String indications;   //推理指标
 }

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

@@ -63,6 +63,7 @@ public class PushController {
                     "scaleId：量表id,Long<br>" +
                     "patientId：病人id,Long<br>" +
                     "disType：诊断类型，1-慢病，2-急诊，普通病不填,Integer<br>" +
+                    "indications：指标结果,String<br>" +
                     "adverseReactions：不良反应,List<不良反应明细><br>")
     @PostMapping("/pushInner")
     @SysLogger("pushInner")