From 6c0b8a28d28044372d2b90c63aef0a2fbfa6c0a3 Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期日, 13 八月 2023 23:11:24 +0800
Subject: [PATCH] 156463

---
 zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorServiceImpl.java |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorServiceImpl.java
index 9379889..3507ba0 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorServiceImpl.java
@@ -48,6 +48,9 @@
     @Resource
     ZAuthorityService zAuthorityService;
 
+    @Resource
+    ZfDoctorMapper zfDoctorMapper;
+
     @Override
     public AjaxResult selectDoctorList(ZfDoctor zfDoctor, Integer pageNum, Integer pageSize) {
 //        LambdaQueryWrapper<ZfDoctor> lqw = buildCondition(zfDoctor);
@@ -231,6 +234,12 @@
         }
     }
 
+    @Override
+    public AjaxResult listType() {
+        List<String> result = zfDoctorMapper.listType();
+        return AjaxResult.success(result);
+    }
+
 //    @Override
 //    public AjaxResult mySave(ZfDoctor zfDoctor) {
 //        //鍒ゆ柇鏄惁鏈夐噸澶嶆暟鎹�
@@ -261,7 +270,6 @@
         lqw.eq(StringUtils.isNotEmpty(zfDoctor.getRemark()), ZfDoctor::getRemark, zfDoctor.getRemark());
         lqw.eq(zfDoctor.getFamilyId()!=null,ZfDoctor::getFamilyId,zfDoctor.getFamilyId());
         return lqw;
-
     }
 
     private LambdaQueryWrapper<ZfDoctor> buildCondition(ZfDoctor zfDoctor,List<Long> familyIdList) {
@@ -273,6 +281,8 @@
                 .like(StringUtils.isNotEmpty(zfDoctor.getDuration()), ZfDoctor::getDuration, zfDoctor.getDuration())
                 .like(StringUtils.isNotEmpty(zfDoctor.getEffect()), ZfDoctor::getEffect, zfDoctor.getEffect())
                 .like(StringUtils.isNotEmpty(zfDoctor.getSuitable()), ZfDoctor::getSuitable, zfDoctor.getSuitable())
+                .like(StringUtils.isNotEmpty(zfDoctor.getWmedical()),ZfDoctor::getWmedical,zfDoctor.getWmedical())
+                .like(StringUtils.isNotEmpty(zfDoctor.getCmedical()),ZfDoctor::getCmedical,zfDoctor.getCmedical())
                 .like(StringUtils.isNotEmpty(zfDoctor.getRemark()), ZfDoctor::getRemark, zfDoctor.getRemark());
         if (StringUtils.isNotEmpty(zfDoctor.getPrescription())){
             lqw.and(wrapper -> {

--
Gitblit v1.9.1