|
@@ -1157,14 +1157,21 @@ public class CaseFrontSheetMainService {
|
|
|
}
|
|
|
|
|
|
public List<FrontsheetQualityVerification> fetchQualityVerifications(AuditInquiry inquiry) {
|
|
|
- QueryWrapper<FrontsheetQualityVerification> wrapper = new QueryWrapper<>();
|
|
|
+ if (inquiry.getState() != AuditState.REJECTED) {
|
|
|
+ QueryWrapper<FrontsheetQualityVerification> wrapper = new QueryWrapper<>();
|
|
|
+ if (StringUtil.notBlank(inquiry.getPatNo())) {
|
|
|
+ wrapper.eq("pat_no", inquiry.getPatNo());
|
|
|
+ }
|
|
|
+ wrapper.eq("audit_state", inquiry.getState());
|
|
|
+ wrapper.ge("application_time", inquiry.getStart());
|
|
|
+ wrapper.le("application_time", inquiry.getEnd());
|
|
|
+ return qualityVerificationDao.selectList(wrapper);
|
|
|
+ }
|
|
|
+ String statement = "";
|
|
|
if (StringUtil.notBlank(inquiry.getPatNo())) {
|
|
|
- wrapper.eq("pat_no", inquiry.getPatNo());
|
|
|
+ statement = " and pat_no=" + inquiry.getPatNo();
|
|
|
}
|
|
|
- wrapper.eq("audit_state", inquiry.getState());
|
|
|
- wrapper.ge("application_time", inquiry.getStart());
|
|
|
- wrapper.le("application_time", inquiry.getEnd());
|
|
|
- return qualityVerificationDao.selectList(wrapper);
|
|
|
+ return qualityVerificationDao.selectRejectedRecords(inquiry.getStart(), inquiry.getEnd(), statement);
|
|
|
}
|
|
|
|
|
|
public String executeAudit(FrontsheetQualityVerification request) {
|