Merge branch 'dev/znwz20200131_init' into dev/zzcx20200202_init

znwz-service/src/main/java/com/diagbot/facade/InquiryInfoFacade.java

@@ -47,7 +47,10 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
 
     public SaveInquiryDTO saveInquiry(SaveInquiryVO saveInquiryVO) {
         SaveInquiryDTO saveInquiryDTO = new SaveInquiryDTO();
-        String retUrl = getUrl(saveInquiryVO);
+        String retUrl = null;
+        if (saveInquiryVO.getFrom().equals("1")){
+            retUrl = getUrl(saveInquiryVO);
+        }
         Date now = DateUtil.now();
 
         InquiryInfo inquiryInfo = new InquiryInfo();
@@ -103,7 +106,7 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
         body.put("doctorId", Integer.parseInt(saveInquiryVO.getDoctorId()));
         body.put("mpiId", saveInquiryVO.getMpiId());
         body.put("appId", saveInquiryVO.getAppId());
-        if (saveInquiryVO.getDepartment().equals("全科")){
+        if (saveInquiryVO.getDepartment().indexOf("全科") != -1) {
             body.put("diagnosis", saveInquiryVO.getDiagnosis());
         }
         bodyList.add(body);

znwz-service/src/main/java/com/diagbot/vo/SaveInquiryVO.java

@@ -59,29 +59,25 @@ public class SaveInquiryVO {
     /**
      * 用户ID
      */
-    @ApiModelProperty(value = "用户ID", required = true)
-    @NotBlank(message = "用户ID必传")
+    @ApiModelProperty(value = "用户ID")
     private String mpiId;
 
     /**
      * 用户名称
      */
-    @ApiModelProperty(value = "用户名称", required = true)
-    @NotBlank(message = "用户名称必传")
+    @ApiModelProperty(value = "用户名称")
     private String patientName;
 
     /**
      * 用户年龄
      */
-    @ApiModelProperty(value = "用户年龄", required = true)
-    @NotNull(message = "用户年龄必传")
+    @ApiModelProperty(value = "用户年龄")
     private Integer patientAge;
 
     /**
      * 用户性别
      */
-    @ApiModelProperty(value = "用户性别", required = true)
-    @NotBlank(message = "用户性别必传")
+    @ApiModelProperty(value = "用户性别")
     private String patientSex;
 
     /**
@@ -100,5 +96,11 @@ public class SaveInquiryVO {
     @NotEmpty(message = "问诊明细不能为空")
     private List<SaveInquiryDetailVO> detailList;
 
+    /**
+     * 链接来源 (1:问诊2;挂号)
+     */
+    @ApiModelProperty(value = "链接来源 (1:问诊2;挂号) ")
+    private String from = "1";
+
 
 }