lxd/FlowPacs
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: lxd:905290ba3c9c37e9a2ea0d5ba7e457670a538679
Branches Tags
lxd:master
lxd:main
...
compare: lxd:35e745af597348275f4a93a43f78ec5fdcd50551
Branches Tags
lxd:master
lxd:main

3 Commits
905290ba3c ... 35e745af59

Author SHA1 Message Date
lxd
35e745af59 修改PatientexamlistPageReqVO分页查询条件
Some checks are pending
Java CI with Maven / build (11) (push) Waiting to run
Details
Java CI with Maven / build (17) (push) Waiting to run
Details
Java CI with Maven / build (8) (push) Waiting to run
Details
yudao-ui-admin CI / build (14.x) (push) Waiting to run
Details
yudao-ui-admin CI / build (16.x) (push) Waiting to run
Details
2024-08-15 17:50:58 +08:00
lxd
c1496faa27 Merge remote-tracking branch '公司/master' 
# Conflicts:
#	yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/dal/mysql/patientexamlist/PatientexamlistMapper.java
 2024-08-15 17:35:16 +08:00
lxd
4eb86349cd 修改影像逻辑 2024-08-15 17:33:59 +08:00
2 changed files with 1 additions and 8 deletions
Show Stats Expand all files Collapse all files

2
yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/patientexamlist/PatientexamlistController.java
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())//表示只查询影像的数据

7
yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/dal/mysql/patientexamlist/PatientexamlistMapper.java
View File

@ -54,13 +54,9 @@ public interface PatientexamlistMapper extends BaseMapperX<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::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::getUploadDate, reqVO.getUploadDate()) .betweenIfPresent(PatientexamlistDO::getUploadDate, reqVO.getUploadDate())
.likeIfPresent(PatientexamlistDO::getOrgName, reqVO.getOrgName()) .likeIfPresent(PatientexamlistDO::getOrgName, reqVO.getOrgName())
.eqIfPresent(PatientexamlistDO::getOrgId, reqVO.getOrgId()) .eqIfPresent(PatientexamlistDO::getOrgId, reqVO.getOrgId())
@ -70,9 +66,6 @@ public interface PatientexamlistMapper extends BaseMapperX<PatientexamlistDO> {
.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::getDiagDoctor, reqVO.getDiagDoctor())
.eqIfPresent(PatientexamlistDO::getReviewDoctor, reqVO.getReviewDoctor())
.betweenIfPresent(PatientexamlistDO::getReviewDate, reqVO.getReviewDate())
.eqIfPresent(PatientexamlistDO::getThumbnailImgUrl, reqVO.getThumbnailImgUrl())
.betweenIfPresent(PatientexamlistDO::getCreateTime, reqVO.getCreateTime()) .betweenIfPresent(PatientexamlistDO::getCreateTime, reqVO.getCreateTime())
.eqIfPresent(PatientexamlistDO::getOrgId, reqVO.getHighLevelOrgId()) .eqIfPresent(PatientexamlistDO::getOrgId, reqVO.getHighLevelOrgId())
.orderByDesc(PatientexamlistDO::getId)); .orderByDesc(PatientexamlistDO::getId));