From 557667c78f86ee4ad6070ca89e990a41a2f31d2e Mon Sep 17 00:00:00 2001 From: lxd <1004405501@qq.com> Date: Tue, 3 Sep 2024 15:27:01 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B6=85=E5=A3=B0=E5=92=8C=E5=BD=B1=E5=83=8F?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=94=B6=E8=97=8F=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dal/dataobject/patientexamlist/PatientexamlistDO.java | 5 +++++ .../dal/mysql/patientexamlist/PatientexamlistMapper.java | 1 + .../controller/admin/ultrasonic/ultrasonicController.java | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/dal/dataobject/patientexamlist/PatientexamlistDO.java b/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/dal/dataobject/patientexamlist/PatientexamlistDO.java index 2d9272c62..544e9e90e 100644 --- a/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/dal/dataobject/patientexamlist/PatientexamlistDO.java +++ b/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/dal/dataobject/patientexamlist/PatientexamlistDO.java @@ -175,4 +175,9 @@ public class PatientexamlistDO extends BaseDO { @TableField(value = "StudyInsta") private String StudyInsta; + @TableField(value = "isFavourite") + private String isFavourite; + + @TableField(value = "FavouriteTime",updateStrategy = FieldStrategy.IGNORED) + private LocalDateTime FavouriteTime; } \ No newline at end of file diff --git a/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/dal/mysql/patientexamlist/PatientexamlistMapper.java b/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/dal/mysql/patientexamlist/PatientexamlistMapper.java index 5cbea4156..4685a9c06 100644 --- a/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/dal/mysql/patientexamlist/PatientexamlistMapper.java +++ b/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/dal/mysql/patientexamlist/PatientexamlistMapper.java @@ -73,6 +73,7 @@ public interface PatientexamlistMapper extends BaseMapperX { .eqIfPresent(PatientexamlistDO::getDiagDoctor, reqVO.getDiagDoctor()) .betweenIfPresent(PatientexamlistDO::getCreateTime, reqVO.getCreateTime()) .eqIfPresent(PatientexamlistDO::getOrgId, reqVO.getHighLevelOrgId()) + .eqIfPresent(PatientexamlistDO::getIsFavourite,reqVO.getIsFavourite()) .orderByDesc(PatientexamlistDO::getId)); } diff --git a/yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/controller/admin/ultrasonic/ultrasonicController.java b/yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/controller/admin/ultrasonic/ultrasonicController.java index c6e549a22..5a0453ac0 100644 --- a/yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/controller/admin/ultrasonic/ultrasonicController.java +++ b/yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/controller/admin/ultrasonic/ultrasonicController.java @@ -119,7 +119,7 @@ public class ultrasonicController { { // 筛选条件： filteredList = filteredList.stream() - .filter(ultrasonicDO -> ultrasonicDO.getPrivateDoctorId().isEmpty()) + .filter(ultrasonicDO -> (ultrasonicDO.getPrivateDoctorId() == null || ultrasonicDO.getPrivateDoctorId().isEmpty())) .collect(Collectors.toList()); // 定义一个比较器，先按pid是否为"0"排序，然后按pid的自然顺序排序