From 7b1f2b132f3cace752333626551758d5e3ab04b0 Mon Sep 17 00:00:00 2001 From: xm Date: Sun, 21 Nov 2021 09:24:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=8E=B7=E5=8F=96=E4=B8=BA=E4=B9=B1=E7=A0=81?= =?UTF-8?q?=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/manage/controller/FontController.java | 23 +++++++++++++++---- .../java/com/manage/dao/Power_UserMapper.java | 4 ++-- .../resources/mapper/Power_UserMapper.xml | 5 ++-- 3 files changed, 22 insertions(+), 10 deletions(-) diff --git a/power-admin/src/main/java/com/manage/controller/FontController.java b/power-admin/src/main/java/com/manage/controller/FontController.java index 141003e..3103be2 100644 --- a/power-admin/src/main/java/com/manage/controller/FontController.java +++ b/power-admin/src/main/java/com/manage/controller/FontController.java @@ -564,11 +564,12 @@ public class FontController { * 通过申请医生id,获取医生名字, * 通过病案deptcode,获取医生对应的科室 */ - @RequestMapping("/getDoctorNameAndDoctorRoom") + @RequestMapping(value = "/getDoctorNameAndDoctorRoom",produces = "text/plain;charset=UTF-8") @ResponseBody public String getDoctorNameAndDoctorRoom(String userId,String deptcode) throws Exception{ - Power_User name = power_userMapper.selectForDoctorName(userId); - Power_User room = power_userMapper.selectForDoctorRoom(deptcode); + System.out.println(userId+"userId"+deptcode+"deptcode"); + String name = power_userMapper.selectForDoctorName(userId); + String room= power_userMapper.selectForDoctorRoom(deptcode); String result = room+","+name; return result; } @@ -594,6 +595,18 @@ public class FontController { } /** + * @MethodName sendMessage + * @Description: 发送信息接口 + * @Param applyType 申请类型 + * @Param count 新的待审批份数 + * @Returnt Msg + * @Author: 曾文和 + * @CreateDate: 2020-04-24 + * @UpdateUser: 曾文和 + * @UpdateDate: 2020-04-24 + * @UpdateRemark: 更新说明 + * @Version: + * * 从高明更新至湛江,2021/11/20 * 修改为向特定用户发送信息 * 特定用户科主任,病案室 @@ -616,8 +629,8 @@ public class FontController { return Msg.fail("消息内容不能为空"); } WsPool.sendMessageToAll(message.getSysFlag() + "_" + message.getUserId(), message.getTitle() + STR_SPLIT + message.getContent() + STR_SPLIT + message.getTypeFlag()); - //修改为向特定用户发送信息 -// WsPool.sendMessageToUser(); + return Msg.success(); } + } diff --git a/power-dao/src/main/java/com/manage/dao/Power_UserMapper.java b/power-dao/src/main/java/com/manage/dao/Power_UserMapper.java index c77bbc5..a84c8e8 100644 --- a/power-dao/src/main/java/com/manage/dao/Power_UserMapper.java +++ b/power-dao/src/main/java/com/manage/dao/Power_UserMapper.java @@ -73,9 +73,9 @@ public interface Power_UserMapper { List selectAllForRecordRoom (String deptCode); - Power_User selectForDoctorName (String userId); + String selectForDoctorName (String userId); - Power_User selectForDoctorRoom (String deptCode); + String selectForDoctorRoom (String deptCode); String selectForDeptId(Integer userId); diff --git a/power-dao/src/main/resources/mapper/Power_UserMapper.xml b/power-dao/src/main/resources/mapper/Power_UserMapper.xml index f5fbebb..d82f5c5 100644 --- a/power-dao/src/main/resources/mapper/Power_UserMapper.xml +++ b/power-dao/src/main/resources/mapper/Power_UserMapper.xml @@ -709,7 +709,6 @@ and effective = 1 and role_id in (25) - - select power_user.`name` from power_user where user_name = #{userId} - select power_dept.dept_name dept_id from power_dept