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的自然顺序排序