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

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

@@ -97,6 +97,9 @@ public class PushFacade {
         searchData.setLength(10);
 
         Response<ResponseData> res = aiServiceClient.bayesPageData(searchData);
+        if (null == res || null == res.getData()) {
+            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "AI没有返回结果");
+        }
         return res.getData();
     }
 

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

@@ -31,21 +31,22 @@ public class HisInquirysVO {
     /**
      * 科室id
      */
-	@ApiModelProperty(value="科室id",required=true)
-	@NotNull(message="科室id必传")
+	@ApiModelProperty(value="科室id")
+	//@NotNull(message="科室id必传")
     private Long hospitalDeptId;
 
     /**
      * 医生id
      */
-	@ApiModelProperty(value="医生id",required=true)
-	@NotNull(message="医生id必传")
+	@ApiModelProperty(value="医生id")
+	//@NotNull(message="医生id必传")
     private Long doctorId;
 
     /**
      * 患者id
      */
-	@ApiModelProperty(value="患者id")
+	@ApiModelProperty(value="患者id",required=true)
+	@NotNull(message="患者id必传")
     private Long patientId;
     
     /**