Compare commits

..

No commits in common. "35e745af597348275f4a93a43f78ec5fdcd50551" and "905290ba3c9c37e9a2ea0d5ba7e457670a538679" have entirely different histories.

2 changed files with 8 additions and 1 deletions

View File

@ -107,7 +107,7 @@ public class PatientexamlistController {
{
// 筛选条件
doList = pageResult.getList().stream()
.filter(PatientexamlistDO -> (PatientexamlistDO.getDeviceType().contains("US")))
.filter(PatientexamlistDO -> (PatientexamlistDO.getDeviceType().equals(devicetype)))
.collect(Collectors.toList());
}
else if(devicetype!=null&&!devicetype.trim().isEmpty())//表示只查询影像的数据

View File

@ -54,9 +54,13 @@ public interface PatientexamlistMapper extends BaseMapperX<PatientexamlistDO> {
.eqIfPresent(PatientexamlistDO::getExamId, reqVO.getExamId())
.likeIfPresent(PatientexamlistDO::getPName, reqVO.getPName())
.eqIfPresent(PatientexamlistDO::getGender, reqVO.getGender())
.eqIfPresent(PatientexamlistDO::getBirthday, reqVO.getBirthday())
.betweenIfPresent(PatientexamlistDO::getExamDate, reqVO.getExamDate())
.eqIfPresent(PatientexamlistDO::getDeviceType, reqVO.getDeviceType())
.eqIfPresent(PatientexamlistDO::getSeDc, reqVO.getSeDc())
.likeIfPresent(PatientexamlistDO::getExamItemName, reqVO.getExamItemName())
.eqIfPresent(PatientexamlistDO::getReportstatus, reqVO.getReportstatus())
.betweenIfPresent(PatientexamlistDO::getApplicationDate, reqVO.getApplicationDate())
.betweenIfPresent(PatientexamlistDO::getUploadDate, reqVO.getUploadDate())
.likeIfPresent(PatientexamlistDO::getOrgName, reqVO.getOrgName())
.eqIfPresent(PatientexamlistDO::getOrgId, reqVO.getOrgId())
@ -66,6 +70,9 @@ public interface PatientexamlistMapper extends BaseMapperX<PatientexamlistDO> {
.eqIfPresent(PatientexamlistDO::getDiagResults, reqVO.getDiagResults())
.betweenIfPresent(PatientexamlistDO::getDiagDate, reqVO.getDiagDate())
.eqIfPresent(PatientexamlistDO::getDiagDoctor, reqVO.getDiagDoctor())
.eqIfPresent(PatientexamlistDO::getReviewDoctor, reqVO.getReviewDoctor())
.betweenIfPresent(PatientexamlistDO::getReviewDate, reqVO.getReviewDate())
.eqIfPresent(PatientexamlistDO::getThumbnailImgUrl, reqVO.getThumbnailImgUrl())
.betweenIfPresent(PatientexamlistDO::getCreateTime, reqVO.getCreateTime())
.eqIfPresent(PatientexamlistDO::getOrgId, reqVO.getHighLevelOrgId())
.orderByDesc(PatientexamlistDO::getId));