病历保存接口修改

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

@@ -71,10 +71,16 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
         QueryWrapper<InquiryInfo> inquiryInfoQe = new QueryWrapper<>();
         inquiryInfoQe.eq("is_deleted", IsDeleteEnum.N.getKey());
         inquiryInfoQe.eq("hospital_id", saveInquiryVO.getHospitalId());
+        inquiryInfoQe.eq(saveInquiryVO.getSonHospitalId() != null,
+                "son_hospital_id", saveInquiryVO.getSonHospitalId());
         inquiryInfoQe.eq("hospital_dept_id", saveInquiryVO.getHospitalDeptId());
-        inquiryInfoQe.eq("doctor_id", saveInquiryVO.getDoctorId());
+        inquiryInfoQe.eq(saveInquiryVO.getDoctorId() != null,
+                "doctor_id", saveInquiryVO.getDoctorId());
         inquiryInfoQe.eq("patient_id", saveInquiryVO.getPatientId());
-        inquiryInfoQe.eq("inquiry_code", saveInquiryVO.getInquiryCode());
+        inquiryInfoQe.eq(StringUtil.isNotBlank(saveInquiryVO.getInquiryCode()),
+                "inquiry_code", saveInquiryVO.getInquiryCode());
+        inquiryInfoQe.eq("is_quoted", 0);
+        inquiryInfoQe.orderByDesc("gmt_modified");
         InquiryInfo inquiryInfo = this.getOne(inquiryInfoQe, false);
 
         if (inquiryInfo == null) {

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

@@ -47,6 +47,24 @@ public class SaveInquiryVO {
 	@NotBlank(message="医院名称必传")
     private String hospitalName;
 
+	/**
+	 * 子医院id
+	 */
+	@ApiModelProperty(value="子医院id")
+	private Long sonHospitalId;
+
+	/**
+	 * 子医院编码
+	 */
+	@ApiModelProperty(value="子医院编码")
+	private String sonHospitalCode;
+
+	/**
+	 * 子医院名称
+	 */
+	@ApiModelProperty(value="子医院名称")
+	private String sonHospitalName;
+
     /**
      * 医院科室id
      */
@@ -71,22 +89,19 @@ public class SaveInquiryVO {
     /**
      * 医生id
      */
-	@ApiModelProperty(value="医生id",required=true)
-	@NotNull(message="医生id必传")
+	@ApiModelProperty(value="医生id")
     private Long doctorId;
 	
 	/**
      * 医生编码
      */
-	@ApiModelProperty(value="医生编码",required=true)
-	@NotBlank(message="医生编码必传")
+	@ApiModelProperty(value="医生编码")
     private String doctorCode;
 
     /**
      * 医生姓名
      */
-	@ApiModelProperty(value="医生姓名",required=true)
-	@NotBlank(message="医生姓名必传")
+	@ApiModelProperty(value="医生姓名")
     private String doctorName;
 
     /**
@@ -140,8 +155,7 @@ public class SaveInquiryVO {
     /**
      * 就诊序列号
      */
-	@ApiModelProperty(value="就诊序列号",required=true)
-	@NotBlank(message="就诊序列号必传")
+	@ApiModelProperty(value="就诊序列号")
     private String inquiryCode;
 
     /**