|
@@ -71,10 +71,16 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
|
|
QueryWrapper<InquiryInfo> inquiryInfoQe = new QueryWrapper<>();
|
|
QueryWrapper<InquiryInfo> inquiryInfoQe = new QueryWrapper<>();
|
|
inquiryInfoQe.eq("is_deleted", IsDeleteEnum.N.getKey());
|
|
inquiryInfoQe.eq("is_deleted", IsDeleteEnum.N.getKey());
|
|
inquiryInfoQe.eq("hospital_id", saveInquiryVO.getHospitalId());
|
|
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("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("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);
|
|
InquiryInfo inquiryInfo = this.getOne(inquiryInfoQe, false);
|
|
|
|
|
|
if (inquiryInfo == null) {
|
|
if (inquiryInfo == null) {
|