|
@@ -14,6 +14,7 @@ import com.diagbot.entity.InquiryEvaluator;
|
|
|
import com.diagbot.entity.InquiryInfo;
|
|
|
import com.diagbot.entity.InquiryQuote;
|
|
|
import com.diagbot.entity.InquiryReport;
|
|
|
+import com.diagbot.enums.InquiryQuotedTypeEnum;
|
|
|
import com.diagbot.enums.IsDeleteEnum;
|
|
|
import com.diagbot.enums.SexEnum;
|
|
|
import com.diagbot.exception.CommonErrorCode;
|
|
@@ -184,6 +185,7 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
|
|
|
|
|
|
QueryWrapper<InquiryInfo> inquiryInfoQe = new QueryWrapper<InquiryInfo>();
|
|
|
inquiryInfoQe.eq("is_deleted", IsDeleteEnum.N.getKey());
|
|
|
+ inquiryInfoQe.eq("is_quoted", InquiryQuotedTypeEnum.Disable.getKey());
|
|
|
inquiryInfoQe.eq(hisInquirysVO.getHospitalId() != null,
|
|
|
"hospital_id", hisInquirysVO.getHospitalId());
|
|
|
inquiryInfoQe.eq(StringUtil.isNotBlank(hisInquirysVO.getHospitalCode()),
|
|
@@ -204,6 +206,9 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
|
|
|
"patient_id_no", hisInquirysVO.getPatientIdNo());
|
|
|
inquiryInfoQe.eq(hisInquirysVO.getType() != null,
|
|
|
"type", hisInquirysVO.getType());
|
|
|
+ String day = DateUtil.formatDateTime(DateUtil.getFirstTimeOfDay(DateUtil.addDay(DateUtil.now(),
|
|
|
+ -hisInquirysVO.getDayLimit())));
|
|
|
+ inquiryInfoQe.ge("gmt_modified", day);
|
|
|
|
|
|
inquiryInfoQe.ge(hisInquirysVO.getStartDate() != null,
|
|
|
"gmt_create", hisInquirysVO.getStartDate());
|
|
@@ -258,7 +263,10 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
|
|
|
}
|
|
|
|
|
|
QueryWrapper<InquiryInfo> inquiryInfoQe = new QueryWrapper<InquiryInfo>();
|
|
|
+ inquiryInfoQe.eq(getInquiryDetailVO.getInquiryId() != null,
|
|
|
+ "id", getInquiryDetailVO.getInquiryId());
|
|
|
inquiryInfoQe.eq("is_deleted", IsDeleteEnum.N.getKey());
|
|
|
+ inquiryInfoQe.eq("is_quoted", InquiryQuotedTypeEnum.Disable.getKey());
|
|
|
inquiryInfoQe.eq(getInquiryDetailVO.getHospitalId() != null,
|
|
|
"hospital_id", getInquiryDetailVO.getHospitalId());
|
|
|
inquiryInfoQe.eq(StringUtil.isNotBlank(getInquiryDetailVO.getHospitalCode()),
|