看课红包下限

fs-doctor-app/src/main/java/com/fs/app/controller/DoctorController.java

@@ -89,9 +89,16 @@ public class DoctorController extends  AppBaseController {
             map.put("token",token);
             map.put("doctor",doctor);
             if(doctor.getDeptId()!=null){
-                FsDepartment department=departmentService.selectFsDepartmentByDeptId(doctor.getDeptId());
+//                FsDepartment department=departmentService.selectFsDepartmentByDeptId(doctor.getDeptId());
+                List<FsDepartment> department=departmentService.selectFsDepartmentByDeptIds(doctor.getDeptId());
+                StringBuilder departments=new StringBuilder();
+                department.forEach(fsDepartment -> departments.append(fsDepartment.getDeptName()).append(","));
+                if(departments.length()>0){
+                    departments.deleteCharAt(departments.length()-1);
+                }
                 if(department!=null){
-                    map.put("deptName",department.getDeptName());
+//                    map.put("deptName",department.getDeptName());
+                    map.put("deptName",departments.toString());
                 }
                 else{
                     map.put("deptName","");
@@ -136,9 +143,19 @@ public class DoctorController extends  AppBaseController {
             map.put("token",token);
             map.put("doctor",doctor);
             if(doctor.getDeptId()!=null){
-                FsDepartment department=departmentService.selectFsDepartmentByDeptId(doctor.getDeptId());
+//                FsDepartment department=departmentService.selectFsDepartmentByDeptId(doctor.getDeptId());
+//                if(department!=null){
+//                    map.put("deptName",department.getDeptName());
+//                }
+                List<FsDepartment> department=departmentService.selectFsDepartmentByDeptIds(doctor.getDeptId());
+                StringBuilder departments=new StringBuilder();
+                department.forEach(fsDepartment -> departments.append(fsDepartment.getDeptName()).append(","));
+                if(departments.length()>0){
+                    departments.deleteCharAt(departments.length()-1);
+                }
                 if(department!=null){
-                    map.put("deptName",department.getDeptName());
+//                    map.put("deptName",department.getDeptName());
+                    map.put("deptName",departments.toString());
                 }
                 else{
                     map.put("deptName","");
@@ -175,12 +192,17 @@ public class DoctorController extends  AppBaseController {
         try {
             FsDoctor doctor=doctorService.selectFsDoctorByDoctorId(Long.parseLong(getDoctorId()));
             FsHospital hospital=hospitalService.selectFsHospitalByHospitalId(doctor.getHospitalId());
-            FsDepartment department=departmentService.selectFsDepartmentByDeptId(doctor.getDeptId());
-
+//            FsDepartment department=departmentService.selectFsDepartmentByDeptId(doctor.getDeptId());
+            List<FsDepartment> department=departmentService.selectFsDepartmentByDeptIds(doctor.getDeptId());
+            StringBuilder departments=new StringBuilder();
+            department.forEach(fsDepartment -> departments.append(fsDepartment.getDeptName()).append(","));
+            if(departments.length()>0){
+                departments.deleteCharAt(departments.length()-1);
+            }
             Map<String,Object> map=new HashMap<>();
             map.put("doctor",doctor);
             map.put("hospital",hospital);
-            map.put("department",department);
+            map.put("department",departments.toString());
             return R.ok(map);
         } catch (Exception e){
             return R.error("操作异常");

fs-doctor-app/src/main/java/com/fs/app/controller/InquiryOrderController.java

@@ -147,9 +147,19 @@ public class InquiryOrderController extends  AppBaseController {
             FsDoctor doctor=doctorService.selectFsDoctorByDoctorId(order.getDoctorId());
             if(doctor!=null){
                 FsHospital hospital=hospitalService.selectFsHospitalByHospitalId(doctor.getHospitalId());
-                FsDepartment department=departmentService.selectFsDepartmentByDeptId(doctor.getDeptId());
+//                FsDepartment department=departmentService.selectFsDepartmentByDeptId(doctor.getDeptId());
+                List<FsDepartment> department=departmentService.selectFsDepartmentByDeptIds(doctor.getDeptId());
+                StringBuilder departments=new StringBuilder();
+                department.forEach(fsDepartment -> departments.append(fsDepartment.getDeptName()).append(","));
+                if(departments.length()>0){
+                    departments.deleteCharAt(departments.length()-1);
+                }
+                if(department!=null){
+//                    map.put("deptName",department.getDeptName());
+                    maps.put("deptName",departments.toString());
+                }
                 maps.put("hospital",hospital);
-                maps.put("department",department);
+//                maps.put("department",department);
             }
             maps.put("doctor",doctor);
         }

fs-service/src/main/java/com/fs/his/domain/FsDoctor.java

@@ -70,7 +70,7 @@ public class FsDoctor extends BaseEntity
 
     /** 科室ID */
     @Excel(name = "科室ID")
-    private Long deptId;
+    private String deptId;
 
     /** 余额 */
     @Excel(name = "余额")

fs-service/src/main/java/com/fs/his/mapper/FsDepartmentMapper.java

@@ -1,21 +1,24 @@
 package com.fs.his.mapper;
 
+import java.util.ArrayList;
 import java.util.List;
 import com.fs.his.domain.FsDepartment;
 import com.fs.his.vo.OptionsVO;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
+import org.springframework.security.core.parameters.P;
 
 /**
  * 科室Mapper接口
- * 
+ *
  * @author fs
  * @date 2023-06-01
  */
-public interface FsDepartmentMapper 
+public interface FsDepartmentMapper
 {
     /**
      * 查询科室
-     * 
+     *
      * @param deptId 科室主键
      * @return 科室
      */
@@ -23,7 +26,7 @@ public interface FsDepartmentMapper
 
     /**
      * 查询科室列表
-     * 
+     *
      * @param fsDepartment 科室
      * @return 科室集合
      */
@@ -31,7 +34,7 @@ public interface FsDepartmentMapper
 
     /**
      * 新增科室
-     * 
+     *
      * @param fsDepartment 科室
      * @return 结果
      */
@@ -39,7 +42,7 @@ public interface FsDepartmentMapper
 
     /**
      * 修改科室
-     * 
+     *
      * @param fsDepartment 科室
      * @return 结果
      */
@@ -47,7 +50,7 @@ public interface FsDepartmentMapper
 
     /**
      * 删除科室
-     * 
+     *
      * @param deptId 科室主键
      * @return 结果
      */
@@ -55,7 +58,7 @@ public interface FsDepartmentMapper
 
     /**
      * 批量删除科室
-     * 
+     *
      * @param deptIds 需要删除的数据主键集合
      * @return 结果
      */
@@ -65,4 +68,7 @@ public interface FsDepartmentMapper
 
     @Select("select dept_id dictValue,dept_name dictLabel from fs_department ORDER BY sort ")
     List<OptionsVO> selectFsDiseaseOptionsVO();
+
+
+    ArrayList<FsDepartment> selectFsDepartmentByDeptIds(@Param("list") List<String> list);
 }

fs-service/src/main/java/com/fs/his/mapper/FsDoctorMapper.java

@@ -68,9 +68,9 @@ public interface FsDoctorMapper
      */
     public int deleteFsDoctorByDoctorIds(Long[] doctorIds);
 @Select({"<script> " +
-     "        select doc.*,de.dept_name,ho.hospital_name,us.nick_name,us.phone from fs_doctor doc\n" +
+     "        select doc.*,GROUP_CONCAT(de.dept_name ORDER BY de.dept_id SEPARATOR ',') AS dept_name,ho.hospital_name,us.nick_name,us.phone from fs_doctor doc\n" +
         "        LEFT JOIN\n" +
-        "        fs_department de ON de.dept_id=doc.dept_id\n" +
+        "        fs_department de ON FIND_IN_SET(de.dept_id, doc.dept_id) " +
         "        LEFT JOIN\n" +
         "        fs_hospital ho ON ho.hospital_id=doc.hospital_id "+
       " LEFT JOIN\n" +

fs-service/src/main/java/com/fs/his/service/IFsDepartmentService.java

@@ -6,15 +6,15 @@ import com.fs.his.vo.OptionsVO;
 
 /**
  * 科室Service接口
- * 
+ *
  * @author fs
  * @date 2023-06-01
  */
-public interface IFsDepartmentService 
+public interface IFsDepartmentService
 {
     /**
      * 查询科室
-     * 
+     *
      * @param deptId 科室主键
      * @return 科室
      */
@@ -22,7 +22,7 @@ public interface IFsDepartmentService
 
     /**
      * 查询科室列表
-     * 
+     *
      * @param fsDepartment 科室
      * @return 科室集合
      */
@@ -30,7 +30,7 @@ public interface IFsDepartmentService
 
     /**
      * 新增科室
-     * 
+     *
      * @param fsDepartment 科室
      * @return 结果
      */
@@ -38,7 +38,7 @@ public interface IFsDepartmentService
 
     /**
      * 修改科室
-     * 
+     *
      * @param fsDepartment 科室
      * @return 结果
      */
@@ -46,7 +46,7 @@ public interface IFsDepartmentService
 
     /**
      * 批量删除科室
-     * 
+     *
      * @param deptIds 需要删除的科室主键集合
      * @return 结果
      */
@@ -54,7 +54,7 @@ public interface IFsDepartmentService
 
     /**
      * 删除科室信息
-     * 
+     *
      * @param deptId 科室主键
      * @return 结果
      */
@@ -62,4 +62,6 @@ public interface IFsDepartmentService
 
 
     List<OptionsVO> selectFsDiseaseOptionsVO();
+
+    List<FsDepartment> selectFsDepartmentByDeptIds(String deptId);
 }

fs-service/src/main/java/com/fs/his/service/impl/FsDepartmentServiceImpl.java

@@ -1,10 +1,14 @@
 package com.fs.his.service.impl;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
 import com.fs.common.exception.CustomException;
 import com.fs.common.utils.DateUtils;
 import com.fs.common.utils.SecurityUtils;
+import com.fs.common.utils.StringUtils;
 import com.fs.his.vo.OptionsVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -14,19 +18,19 @@ import com.fs.his.service.IFsDepartmentService;
 
 /**
  * 科室Service业务层处理
- * 
+ *
  * @author fs
  * @date 2023-06-01
  */
 @Service
-public class FsDepartmentServiceImpl implements IFsDepartmentService 
+public class FsDepartmentServiceImpl implements IFsDepartmentService
 {
     @Autowired
     private FsDepartmentMapper fsDepartmentMapper;
 
     /**
      * 查询科室
-     * 
+     *
      * @param deptId 科室主键
      * @return 科室
      */
@@ -38,7 +42,7 @@ public class FsDepartmentServiceImpl implements IFsDepartmentService
 
     /**
      * 查询科室列表
-     * 
+     *
      * @param fsDepartment 科室
      * @return 科室
      */
@@ -50,7 +54,7 @@ public class FsDepartmentServiceImpl implements IFsDepartmentService
 
     /**
      * 新增科室
-     * 
+     *
      * @param fsDepartment 科室
      * @return 结果
      */
@@ -70,7 +74,7 @@ public class FsDepartmentServiceImpl implements IFsDepartmentService
 
     /**
      * 修改科室
-     * 
+     *
      * @param fsDepartment 科室
      * @return 结果
      */
@@ -88,7 +92,7 @@ public class FsDepartmentServiceImpl implements IFsDepartmentService
 
     /**
      * 批量删除科室
-     * 
+     *
      * @param deptIds 需要删除的科室主键
      * @return 结果
      */
@@ -100,7 +104,7 @@ public class FsDepartmentServiceImpl implements IFsDepartmentService
 
     /**
      * 删除科室信息
-     * 
+     *
      * @param deptId 科室主键
      * @return 结果
      */
@@ -114,4 +118,14 @@ public class FsDepartmentServiceImpl implements IFsDepartmentService
     public List<OptionsVO> selectFsDiseaseOptionsVO() {
         return fsDepartmentMapper.selectFsDiseaseOptionsVO();
     }
+
+    @Override
+    public List<FsDepartment> selectFsDepartmentByDeptIds(String deptId) {
+        ArrayList<FsDepartment> fsDepartments = new ArrayList<>();
+        if (StringUtils.isNotBlank(deptId)){
+            List<String> list = Arrays.asList(deptId.split(","));
+            fsDepartments = fsDepartmentMapper.selectFsDepartmentByDeptIds(list);
+        }
+        return fsDepartments;
+    }
 }

fs-service/src/main/java/com/fs/his/service/impl/FsInquiryOrderMsgServiceImpl.java

@@ -185,7 +185,8 @@ public class FsInquiryOrderMsgServiceImpl implements IFsInquiryOrderMsgService
                                    FsInquiryOrderPatientDTO patientDTO = JSON.parseObject(order.getPatientJson(),FsInquiryOrderPatientDTO.class);
                                    if (patientDTO!=null&&patientDTO.getPatientName()!=null){
                                        FsDoctor doctor=doctorMapper.selectFsDoctorByDoctorId(doctorIdL);
-                                       if (doctor.getDeptId()!=null&&doctor.getDeptId().compareTo(39L)==0){
+//                                       if (doctor.getDeptId()!=null&&doctor.getDeptId().compareTo(39L)==0){
+                                       if (doctor.getDeptId()!=null&&doctor.getDeptId().contains("39")){
                                            logger.info("药师回复发送短信:"+fsUser.getPhone()+patientDTO.getPatientName());
                                            smsService.sendUserSms(fsUser.getPhone(), patientDTO.getPatientName(), "7");
                                        }else {

fs-service/src/main/java/com/fs/his/service/impl/FsInquiryOrderServiceImpl.java

@@ -619,7 +619,11 @@ public class FsInquiryOrderServiceImpl implements IFsInquiryOrderService
                     order.setPayMoney(doctorPrice.get(0).getPrice());
                 }
                 order.setDoctorId(doctor.getDoctorId());
-                order.setDepartmentId(doctor.getDeptId());
+//                order.setDepartmentId(doctor.getDeptId());
+                if (StringUtils.isNotBlank(doctor.getDeptId())){
+                    Long deptId = Long.valueOf(doctor.getDeptId().substring(0,doctor.getDeptId().indexOf(",")));
+                    order.setDepartmentId(deptId);
+                }
                 order.setIsReceive(1);
 
             }
@@ -911,7 +915,8 @@ public class FsInquiryOrderServiceImpl implements IFsInquiryOrderService
         msg.setMsgType("TIMCustomElem");
         FsDoctor doctor=doctorMapper.selectFsDoctorByDoctorId(param.getDoctorId());
         String doc="医生";
-        if (doctor.getDeptId()!=null&&doctor.getDeptId().compareTo(39L)==0){
+//        if (doctor.getDeptId()!=null&&doctor.getDeptId().compareTo(39L)==0){
+        if (doctor.getDeptId()!=null&&doctor.getDeptId().contains("39")){
             doc="药师";
         }
         InquiryOrderMsgDTO inquiryOrderMsgDTO=new InquiryOrderMsgDTO();
@@ -1048,7 +1053,8 @@ public class FsInquiryOrderServiceImpl implements IFsInquiryOrderService
         FsDoctor doctor=doctorMapper.selectFsDoctorByDoctorId(param.getDoctorId());
 
         String doc="医生";
-        if (doctor.getDeptId()!=null&&doctor.getDeptId().compareTo(39L)==0){
+//        if (doctor.getDeptId()!=null&&doctor.getDeptId().compareTo(39L)==0){
+        if (doctor.getDeptId()!=null&&doctor.getDeptId().contains("39")){
             doc="药师";
         }
         InquiryOrderMsgDTO inquiryOrderMsgDTO=new InquiryOrderMsgDTO();
@@ -1529,7 +1535,11 @@ public class FsInquiryOrderServiceImpl implements IFsInquiryOrderService
             order.setMoney(new BigDecimal(0));
             order.setPayMoney(new BigDecimal(0));
             order.setDoctorId(doctor.getDoctorId());
-            order.setDepartmentId(doctor.getDeptId());
+//            order.setDepartmentId(doctor.getDeptId());
+            if (StringUtils.isNotBlank(doctor.getDeptId())){
+                Long deptId = Long.valueOf(doctor.getDeptId().substring(0,doctor.getDeptId().indexOf(",")));
+                order.setDepartmentId(deptId);
+            }
             order.setIsReceive(1);
             order.setIsAudit(1);
         }
@@ -1607,7 +1617,11 @@ public class FsInquiryOrderServiceImpl implements IFsInquiryOrderService
             order.setMoney(new BigDecimal(0));
             order.setPayMoney(new BigDecimal(0));
             order.setDoctorId(doctor.getDoctorId());
-            order.setDepartmentId(doctor.getDeptId());
+//            order.setDepartmentId(doctor.getDeptId());
+            if (StringUtils.isNotBlank(doctor.getDeptId())){
+                Long deptId = Long.valueOf(doctor.getDeptId().substring(0,doctor.getDeptId().indexOf(",")));
+                order.setDepartmentId(deptId);
+            }
             order.setIsReceive(1);
             order.setIsAudit(1);
         }

fs-service/src/main/java/com/fs/his/vo/FsDoctorListVO.java

@@ -40,7 +40,7 @@ public class FsDoctorListVO {
     private String hospitalName;
     /** 科室ID */
 //    @Excel(name = "科室ID")
-    private Long deptId;
+    private String deptId;
     /** 科室ID */
     @Excel(name = "科室名称")
     private String deptName;

fs-service/src/main/resources/application-config-druid-lmjy.yml

@@ -0,0 +1,79 @@
+baidu:
+  token:
+  back-domain:
+#配置
+logging:
+  level:
+    org.springframework.web: INFO
+    com.github.binarywang.demo.wx.cp: DEBUG
+    me.chanjar.weixin: DEBUG
+wx:
+  cp:
+    corpId: wwb2a1055fb6c9a7c2
+    appConfigs:
+      - agentId: 1000008
+        secret: ec7okROXJqkNafq66-L6aKNv0asTzQIG0CYrj3vyBbo
+        token: PPKOdAlCoMO
+        aesKey: PKvaxtpSv8NGpfTDm7VUHIK8Wok2ESyYX24qpXJAdMP
+  pay:
+    appId:  #微信公众号或者小程序等的appid
+    mchId:  #微信支付商户号
+    mchKey:  #微信支付商户密钥
+    subAppId:  #服务商模式下的子商户公众账号ID
+    subMchId:  #服务商模式下的子商户号
+    keyPath: c:\\cert\\apiclient_cert.p12 # p12证书的位置，可以指定绝对路径，也可以指定类路径（以classpath:开头）
+    notifyUrl: https://userapp.his.runtzh.com/app/wxpay/wxPayNotify
+  mp:
+    useRedis: false
+    redisConfig:
+      host: 127.0.0.1
+      port: 6379
+      timeout: 2000
+    configs:
+      - appId: wx5d3096e20e4bd8bb # 第一个公众号的appid  //公众号名称:成都九州在线互联网医院
+        secret: 1afa05f0c71beff0d52fb849c62e479a # 公众号的appsecret
+        token: PPKOdAlCoMO # 接口配置里的Token值
+        aesKey: Eswa6VjwtVMCcw03qZy6fWllgrv5aytIA1SZPEU0kU2 # 接口配置里的EncodingAESKey值
+aifabu:  #爱链接
+  appKey:
+watch:
+  watchUrl: watch.ylrzcloud.com/prod-api
+#  account: tcloud
+#  password: mdf-m2h_6yw2$hq
+  account1: ccif #866655060138751
+  password1: cp-t5or_6xw7$mt
+  account2: tcloud #rt500台
+  password2: mdf-m2h_6yw2$hq
+  account3: whr
+  password3: v9xsKuqn_$d2y
+
+fs :
+  commonApi: http://172.27.0.7:8010
+#  commonApi: http://127.0.0.1:8010
+  h5CommonApi: http://119.29.195.254:8010
+nuonuo:
+  key:
+  secret:
+
+
+  # 存储捅配置
+tencent_cloud_config:
+  secret_id: AKIDiMq9lDf2EOM9lIfqqfKo7FNgM5meD0sT
+  secret_key: u5SuS80342xzx8FRBukza9lVNHKNMSaB
+  bucket: lm-1323137866
+  app_id: 1323137866
+  region: ap-chongqing
+  proxy: lm
+cloud_host:
+  company_name: 良苗教育
+#看课授权时显示的头像
+headerImg:
+  imgUrl:
+ipad:
+  ipadUrl:
+
+wx_miniapp_temp:
+  pay_order_temp_id:
+  inquiry_temp_id:
+
+

fs-service/src/main/resources/application-druid-lmjy.yml

@@ -0,0 +1,150 @@
+# 数据源配置
+spring:
+    profiles:
+        include: config-druid-lmjy,common
+    # redis 配置
+    redis:
+        # 地址
+        host: 127.0.0.1
+        # 端口，默认为6379
+        port: 6379
+        # 数据库索引
+        database: 0
+        # 密码
+        password:
+        # 连接超时时间
+        timeout: 20s
+        lettuce:
+            pool:
+                # 连接池中的最小空闲连接
+                min-idle: 0
+                # 连接池中的最大空闲连接
+                max-idle: 8
+                # 连接池的最大数据库连接数
+                max-active: 8
+                # #连接池最大阻塞等待时间（使用负值表示没有限制）
+                max-wait: -1ms
+    datasource:
+        #        clickhouse:
+        #            type: com.alibaba.druid.pool.DruidDataSource
+        #            driverClassName: com.clickhouse.jdbc.ClickHouseDriver
+        #            url: jdbc:clickhouse://cc-2vc8zzo26w0l7m2l6.public.clickhouse.ads.aliyuncs.com/sop?compress=0&use_server_time_zone=true&use_client_time_zone=false&timezone=Asia/Shanghai
+        #            username: rt_2024
+        #            password: Yzx_19860213
+        #            initialSize: 10
+        #            maxActive: 100
+        #            minIdle: 10
+        #            maxWait: 6000
+        mysql:
+            type: com.alibaba.druid.pool.DruidDataSource
+            driverClassName: com.mysql.cj.jdbc.Driver
+            druid:
+                # 主库数据源
+                master:
+                    url: jdbc:mysql://192.168.0.6:3306/lm_scrm?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                    username: root
+                    password: Ylrztek250218!3@.
+                # 从库数据源
+                slave:
+                    # 从数据源开关/默认关闭
+                    enabled: false
+                    url:
+                    username:
+                    password:
+                # 初始连接数
+                initialSize: 5
+                # 最小连接池数量
+                minIdle: 10
+                # 最大连接池数量
+                maxActive: 20
+                # 配置获取连接等待超时的时间
+                maxWait: 60000
+                # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+                timeBetweenEvictionRunsMillis: 60000
+                # 配置一个连接在池中最小生存的时间，单位是毫秒
+                minEvictableIdleTimeMillis: 300000
+                # 配置一个连接在池中最大生存的时间，单位是毫秒
+                maxEvictableIdleTimeMillis: 900000
+                # 配置检测连接是否有效
+                validationQuery: SELECT 1 FROM DUAL
+                testWhileIdle: true
+                testOnBorrow: false
+                testOnReturn: false
+                webStatFilter:
+                    enabled: true
+                statViewServlet:
+                    enabled: true
+                    # 设置白名单，不填则允许所有访问
+                    allow:
+                    url-pattern: /druid/*
+                    # 控制台管理用户名和密码
+                    login-username: fs
+                    login-password: 123456
+                filter:
+                    stat:
+                        enabled: true
+                        # 慢SQL记录
+                        log-slow-sql: true
+                        slow-sql-millis: 1000
+                        merge-sql: true
+                    wall:
+                        config:
+                            multi-statement-allow: true
+        sop:
+            type: com.alibaba.druid.pool.DruidDataSource
+            driverClassName: com.mysql.cj.jdbc.Driver
+            druid:
+                # 主库数据源
+                master:
+                    url: jdbc:mysql://192.168.0.171:3306/fs_his_sop?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                    username: root
+                    password: Ylrztek250218!3@.
+                # 初始连接数
+                initialSize: 5
+                # 最小连接池数量
+                minIdle: 10
+                # 最大连接池数量
+                maxActive: 20
+                # 配置获取连接等待超时的时间
+                maxWait: 60000
+                # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+                timeBetweenEvictionRunsMillis: 60000
+                # 配置一个连接在池中最小生存的时间，单位是毫秒
+                minEvictableIdleTimeMillis: 300000
+                # 配置一个连接在池中最大生存的时间，单位是毫秒
+                maxEvictableIdleTimeMillis: 900000
+                # 配置检测连接是否有效
+                validationQuery: SELECT 1 FROM DUAL
+                testWhileIdle: true
+                testOnBorrow: false
+                testOnReturn: false
+                webStatFilter:
+                    enabled: true
+                statViewServlet:
+                    enabled: true
+                    # 设置白名单，不填则允许所有访问
+                    allow:
+                    url-pattern: /druid/*
+                    # 控制台管理用户名和密码
+                    login-username: fs
+                    login-password: 123456
+                filter:
+                    stat:
+                        enabled: true
+                        # 慢SQL记录
+                        log-slow-sql: true
+                        slow-sql-millis: 1000
+                        merge-sql: true
+                    wall:
+                        config:
+                            multi-statement-allow: true
+rocketmq:
+    name-server: rmq-1243b25nj.rocketmq.gz.public.tencenttdmq.com:8080 # RocketMQ NameServer 地址
+    producer:
+        group: my-producer-group
+        access-key: a # 替换为实际的 accessKey
+        secret-key: k # 替换为实际的 secretKey
+    consumer:
+        group: test-group
+        access-key: l # 替换为实际的 accessKey
+        secret-key: l # 替换为实际的 secretKey

fs-service/src/main/resources/mapper/his/FsDepartmentMapper.xml

@@ -39,6 +39,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectFsDepartmentVo"/>
         where dept_id = #{deptId}
     </select>
+    <select id="selectFsDepartmentByDeptIds" resultType="com.fs.his.domain.FsDepartment">
+        <include refid="selectFsDepartmentVo"/>
+        where dept_id in
+        <foreach collection="list" open="(" close=")" separator="," index="index" item="deptId">
+            #{deptId}
+        </foreach>
+    </select>
 
     <insert id="insertFsDepartment" parameterType="FsDepartment" useGeneratedKeys="true" keyProperty="deptId">
         insert into fs_department

fs-user-app/src/main/java/com/fs/app/controller/DoctorController.java

@@ -81,7 +81,8 @@ public class DoctorController extends  AppBaseController {
 
         FsDoctor doctor=doctorService.selectFsDoctorByDoctorId(doctorId);
         FsHospital hospital=hospitalService.selectFsHospitalByHospitalId(doctor.getHospitalId());
-        FsDepartment department=departmentService.selectFsDepartmentByDeptId(doctor.getDeptId());
+//        FsDepartment department = departmentService.selectFsDepartmentByDeptId(doctor.getDeptId())
+        List<FsDepartment> department=departmentService.selectFsDepartmentByDeptIds(doctor.getDeptId());
 
         Map<String,Object> map=new HashMap<>();
         map.put("doctor",doctor);

fs-user-app/src/main/java/com/fs/app/controller/InquiryOrderController.java

@@ -507,7 +507,8 @@ public class InquiryOrderController extends  AppBaseController {
             FsDoctor doctor=doctorService.selectFsDoctorByDoctorId(order.getDoctorId());
             if(doctor!=null){
                 FsHospital hospital=hospitalService.selectFsHospitalByHospitalId(doctor.getHospitalId());
-                FsDepartment department=departmentService.selectFsDepartmentByDeptId(doctor.getDeptId());
+//                FsDepartment department=departmentService.selectFsDepartmentByDeptId(doctor.getDeptId());
+                List<FsDepartment> department=departmentService.selectFsDepartmentByDeptIds(doctor.getDeptId());
                 maps.put("hospital",hospital);
                 maps.put("department",department);
             }
@@ -612,7 +613,8 @@ public class InquiryOrderController extends  AppBaseController {
             FsDoctor doctor=doctorService.selectFsDoctorByDoctorId(order.getDoctorId());
             if(doctor!=null){
                 FsHospital hospital=hospitalService.selectFsHospitalByHospitalId(doctor.getHospitalId());
-                FsDepartment department=departmentService.selectFsDepartmentByDeptId(doctor.getDeptId());
+//                FsDepartment department=departmentService.selectFsDepartmentByDeptId(doctor.getDeptId());
+                List<FsDepartment> department=departmentService.selectFsDepartmentByDeptIds(doctor.getDeptId());
                 maps.put("hospital",hospital);
                 maps.put("department",department);
             }

fs-user-app/src/main/resources/application.yml

@@ -6,10 +6,10 @@ server:
 # Spring配置
 spring:
   profiles:
-#    active: dev
+#    active: common,config-dev,dev
 #    active: druid-jzzx
 #    active: druid-yzt
 #    active: druid-hdt
 #    active: druid-sxjz
 #    active: druid-yzt
-    active: druid-myhk
+#    active: druid-myhk