Browse Source

推理接口

Zhaops 6 years ago
parent
commit
7d40930b58

+ 5 - 1
icss-service/src/main/java/com/diagbot/dto/PushKYJDTO.java

@@ -14,6 +14,10 @@ import java.util.List;
 @Getter
 @Setter
 public class PushKYJDTO {
+    private List<FeatureRate> symptom;
+    private List<FeatureRate> vitals;
     private List<FeatureRate> dis;
     private List<FeatureRate> labs;
-}
+    private List<FeatureRate> pacs;
+    private List<FeatureRate> history;
+}

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

@@ -269,6 +269,7 @@ public class PushFacade {
         PushVO pushVO = new PushVO();
         pushVO.setAge(pushKYJVO.getAge());
         pushVO.setSex(pushKYJVO.getSex());
+        pushVO.setFeatureType(pushKYJVO.getFeatureType());
 
         //参数预处理
         /*String lis = "";

+ 3 - 0
icss-service/src/main/java/com/diagbot/vo/PushKYJVO.java

@@ -3,6 +3,7 @@ package com.diagbot.vo;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.util.List;
 
@@ -18,5 +19,7 @@ public class PushKYJVO {
     private Integer age;
     @NotNull(message = "请输入性别")
     private Integer sex;
+    @NotBlank(message = "请输入推送类型")
+    private String featureType;
     private List<LisResult> lisResultList;
 }

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

@@ -3,6 +3,7 @@ package com.diagbot.vo;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.util.List;
 
@@ -18,6 +19,8 @@ public class PushVO {
     private Integer age;
     @NotNull(message = "请输入性别")
     private Integer sex;
+    @NotBlank(message = "请输入推送类型")
+    private String featureType;
     private String symptom;
     private String diag;
     private String vital;
@@ -25,6 +28,5 @@ public class PushVO {
     private String pacs;
     private String past;
     private String other;
-    private String featureType;
     private Long diseaseId;
 }

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

@@ -42,8 +42,8 @@ public class PushController {
                     "lis:化验,Array<br>" +
                     "pacs:辅检,String<br>" +
                     "diag:诊断,String<br>" +
-                    "featureType:类型,1:症状,3:其他史,4:查体,5:化验,6:辅检,7:诊断,8:治疗方案(必填),String<br>"+
-                    "diseaeId:取治疗方案的诊断,Long<br>" )
+                    "featureType:类型,1:症状,3:其他史,4:查体,5:化验,6:辅检,7:诊断,8:治疗方案(必填),String<br>" +
+                    "diseaeId:取治疗方案的诊断,Long<br>")
     @PostMapping("/pushInner")
     @SysLogger("pushInner")
     public RespDTO<PushDTO> pushInner(@RequestBody @Valid PushVO pushVO) {
@@ -59,8 +59,8 @@ public class PushController {
                     "lis:化验,Array<br>" +
                     "pacs:辅检,String<br>" +
                     "diag:诊断,String<br>" +
-                    "featureType:类型,1:症状,3:其他史,4:查体,5:化验,6:辅检,7:诊断,8:治疗方案(必填),String<br>"+
-                    "diseaeId:取治疗方案的诊断,Long<br>" )
+                    "featureType:类型,1:症状,3:其他史,4:查体,5:化验,6:辅检,7:诊断,8:治疗方案(必填),String<br>" +
+                    "diseaeId:取治疗方案的诊断,Long<br>")
     @PostMapping("/pushText")
     @SysLogger("pushText")
     public RespDTO<PushDTO> pushText(@RequestBody @Valid PushVO pushVO) {
@@ -86,7 +86,8 @@ public class PushController {
     @ApiOperation(value = "推理接口(快易检)[by:zhaops]",
             notes = "age: 年龄(必填)<br>" +
                     "sex:性别,1:男,2:女(必填)<br>" +
-                    "lisKYJVOList:化验项列表(必填)<br>")
+                    "lisKYJVOList:化验项列表(必填)<br>" +
+                    "featureType:类型,1:症状,3:其他史,4:查体,5:化验,6:辅检,7:诊断,8:治疗方案(必填),String<br>")
     @PostMapping("/pushKYJ")
     @SysLogger("pushKYJ")
     public RespDTO<PushKYJDTO> pushKYJ(@RequestBody @Valid PushKYJVO pushKYJVO) {