病历引用接口修改

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

@@ -393,16 +393,12 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
         BeanUtil.copyProperties(inquiryQuoteVO, inquiryQuote);
         inquiryQuote.setGmtCreate(now);
         inquiryQuote.setGmtModified(now);
-        if (inquiryQuoteVO.getDeptInfo() != null) {
-            inquiryQuote.setHospitalDeptId(inquiryQuoteVO.getDeptInfo().getId());
-            inquiryQuote.setHospitalDeptCode(inquiryQuoteVO.getDeptInfo().getCode());
-            inquiryQuote.setHospitalDeptName(inquiryQuoteVO.getDeptInfo().getName());
-        }
-        if (inquiryQuoteVO.getDoctorInfo() != null) {
-            inquiryQuote.setDoctorId(inquiryQuoteVO.getDoctorInfo().getId());
-            inquiryQuote.setDoctorCode(inquiryQuoteVO.getDoctorInfo().getCode());
-            inquiryQuote.setDoctorName(inquiryQuoteVO.getDoctorInfo().getName());
-        }
+        inquiryQuote.setHospitalDeptId(inquiryQuoteVO.getDeptInfo().getId());
+        inquiryQuote.setHospitalDeptCode(inquiryQuoteVO.getDeptInfo().getCode());
+        inquiryQuote.setHospitalDeptName(inquiryQuoteVO.getDeptInfo().getName());
+        inquiryQuote.setDoctorId(inquiryQuoteVO.getDoctorInfo().getId());
+        inquiryQuote.setDoctorCode(inquiryQuoteVO.getDoctorInfo().getCode());
+        inquiryQuote.setDoctorName(inquiryQuoteVO.getDoctorInfo().getName());
         inquiryQuote.setPatientId(inquiryQuoteVO.getPatientInfo().getId());
         inquiryQuote.setPatientCode(inquiryQuoteVO.getPatientInfo().getCode());
         inquiryQuote.setPatientName(inquiryQuoteVO.getPatientInfo().getName());

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

@@ -73,14 +73,16 @@ public class InquiryQuoteVO {
      * 科室信息
      */
     @Valid
-    @ApiModelProperty(value = "科室信息")
+    @ApiModelProperty(value = "科室信息", required = true)
+    @NotNull(message = "科室信息必传")
     private InquiryQuoteDeptVO deptInfo;
 
     /**
      * 医生信息
      */
     @Valid
-    @ApiModelProperty(value = "医生信息")
+    @ApiModelProperty(value = "医生信息", required = true)
+    @NotNull(message = "医生信息必传")
     private InquiryQuoteDoctorVO doctorInfo;
 
     /**