修改影像逻辑

This commit is contained in:
lxd 2024-08-15 17:33:59 +08:00
parent e193d526d7
commit 4eb86349cd
2 changed files with 1 additions and 11 deletions

View File

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

View File

@ -52,11 +52,7 @@ public interface PatientexamlistMapper extends BaseMapperX<PatientexamlistDO> {
return selectPage(reqVO, new LambdaQueryWrapperX<PatientexamlistDO>() return selectPage(reqVO, new LambdaQueryWrapperX<PatientexamlistDO>()
.eqIfPresent(PatientexamlistDO::getExamId, reqVO.getExamId()) .eqIfPresent(PatientexamlistDO::getExamId, reqVO.getExamId())
.likeIfPresent(PatientexamlistDO::getPName, reqVO.getPName()) .likeIfPresent(PatientexamlistDO::getPName, reqVO.getPName())
.eqIfPresent(PatientexamlistDO::getGender, reqVO.getGender())
.eqIfPresent(PatientexamlistDO::getBirthday, reqVO.getBirthday())
.betweenIfPresent(PatientexamlistDO::getExamDate, reqVO.getExamDate()) .betweenIfPresent(PatientexamlistDO::getExamDate, reqVO.getExamDate())
.eqIfPresent(PatientexamlistDO::getDeviceType, reqVO.getDeviceType())
.eqIfPresent(PatientexamlistDO::getSeDc, reqVO.getSeDc())
.likeIfPresent(PatientexamlistDO::getExamItemName, reqVO.getExamItemName()) .likeIfPresent(PatientexamlistDO::getExamItemName, reqVO.getExamItemName())
.eqIfPresent(PatientexamlistDO::getReportstatus, reqVO.getReportstatus()) .eqIfPresent(PatientexamlistDO::getReportstatus, reqVO.getReportstatus())
.betweenIfPresent(PatientexamlistDO::getApplicationDate, reqVO.getApplicationDate()) .betweenIfPresent(PatientexamlistDO::getApplicationDate, reqVO.getApplicationDate())
@ -64,15 +60,9 @@ public interface PatientexamlistMapper extends BaseMapperX<PatientexamlistDO> {
.likeIfPresent(PatientexamlistDO::getOrgName, reqVO.getOrgName()) .likeIfPresent(PatientexamlistDO::getOrgName, reqVO.getOrgName())
.eqIfPresent(PatientexamlistDO::getOrgId, reqVO.getOrgId()) .eqIfPresent(PatientexamlistDO::getOrgId, reqVO.getOrgId())
// .eqIfPresent(PatientexamlistDO::getHighLevelOrgId, reqVO.getHighLevelOrgId()) // .eqIfPresent(PatientexamlistDO::getHighLevelOrgId, reqVO.getHighLevelOrgId())
.betweenIfPresent(PatientexamlistDO::getCreateDate, reqVO.getCreateDate())
.eqIfPresent(PatientexamlistDO::getExamDescription, reqVO.getExamDescription()) .eqIfPresent(PatientexamlistDO::getExamDescription, reqVO.getExamDescription())
.eqIfPresent(PatientexamlistDO::getDiagResults, reqVO.getDiagResults()) .eqIfPresent(PatientexamlistDO::getDiagResults, reqVO.getDiagResults())
.betweenIfPresent(PatientexamlistDO::getDiagDate, reqVO.getDiagDate()) .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()) .eqIfPresent(PatientexamlistDO::getOrgId, reqVO.getHighLevelOrgId())
.orderByDesc(PatientexamlistDO::getId)); .orderByDesc(PatientexamlistDO::getId));