From 676d5a490ee09dacb4f1cf9ea7ae0cec34b9370a Mon Sep 17 00:00:00 2001 From: lizhi <1370025557@qq.com> Date: Thu, 7 Jul 2022 08:58:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cloud/kicc/system/controller/DoctorController.java | 1 + .../java/com/cloud/kicc/system/controller/OfficeController.java | 1 + .../com/cloud/kicc/system/service/impl/HospitalServiceImpl.java | 1 - 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/DoctorController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/DoctorController.java index 612c5ecc..980bffdf 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/DoctorController.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/DoctorController.java @@ -90,6 +90,7 @@ public class DoctorController { private LambdaQueryWrapper getQueryWrapper(Doctor doctor) { return Wrappers.lambdaQuery() .like(StrUtil.isNotBlank(doctor.getName()), Doctor::getName, doctor.getName()) + .eq(StrUtil.isNotBlank(doctor.getOrganType()),Doctor::getOrganType,doctor.getOrganType()) .between(StrUtil.isNotBlank(doctor.getBeginTime()) && StrUtil.isNotBlank(doctor.getEndTime()), Doctor::getCreateTime, doctor.getBeginTime(), doctor.getEndTime()) .orderByAsc(Doctor::getId); } diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/OfficeController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/OfficeController.java index 0fffd672..1c538714 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/OfficeController.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/OfficeController.java @@ -89,6 +89,7 @@ public R queryById(@PathVariable String id){ private QueryWrapper getQueryWrapper(Office office) { return new QueryWrapper() .like(StrUtil.isNotBlank(office.getName()), "name", office.getName()) + .eq(StrUtil.isNotBlank(office.getOrganType()),"organ_type",office.getOrganType()) .between(StrUtil.isAllNotBlank(office.getBeginTime(),office.getEndTime()),"create_time", office.getBeginTime(), office.getEndTime()) diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/HospitalServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/HospitalServiceImpl.java index 32d06d2d..b2e92364 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/HospitalServiceImpl.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/HospitalServiceImpl.java @@ -55,5 +55,4 @@ public class HospitalServiceImpl extends ServiceImpl i } return rows; } - } \ No newline at end of file