diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/ChatGroupController.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/ChatGroupController.java index 422b0dd..6f327c3 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/ChatGroupController.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/ChatGroupController.java @@ -130,27 +130,24 @@ public class ChatGroupController { /** * 医生端--回话会话列表获取患者信息 - * @param froms 发送人员ID - * @param did 问诊医生ID - * @param groupids 群组ID + * + * @param froms 发送人员ID + * @param did 问诊医生ID + * @param groupid 群组ID * @return */ @PostMapping("getPinfoBySession") - public BaseResponse getPinfoBySesson(String froms,String did,String groupids){ + public BaseResponse getPinfoBySesson(String froms, String did, String groupid) { BaseResponse baseResponse = new BaseResponse(); - List> psList=new ArrayList<>(); - - String[] fromArr=froms.split(","); + List> psList = new ArrayList<>(); - for (int i = 0; i < fromArr.length; i++) { - List> tmpList=lymsChatgroupService.getPinfoBySesson(fromArr[i],did); - if (tmpList.size()>0) { - psList.add(tmpList.get(0)); - } + List> tmpList = lymsChatgroupService.getPinfoBySesson(null, did, groupid); + if (tmpList.size() > 0) { + psList.add(tmpList.get(0)); } baseResponse.setObject(psList); - return baseResponse; + return baseResponse; } } diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/mapper/LymsChatgroupMapper.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/mapper/LymsChatgroupMapper.java index 3d690b0..ea5b834 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/mapper/LymsChatgroupMapper.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/mapper/LymsChatgroupMapper.java @@ -13,8 +13,10 @@ import java.util.Map; */ public interface LymsChatgroupMapper extends BaseMapper { - @Select("SELECT p.`id`, `pname`, `idno`, `ppasswd`, `sex`, `birth`, IFNULL(`headimg`,'') headimg, `ccnt`, `islogin`, `openid`, `hxid`, `pid`, `pcid`, `did`, `cid`, `fid`, `stat` FROM lyms_patient p,lyms_tkrecord r WHERE p.`id`=r.`pid` AND p.`idno` = #{froms} AND r.`did`=#{did} ORDER BY r.`createdtime` DESC") - List> getPinfoBySesson(@Param("froms") String froms,@Param("did") String did); + @Select("SELECT p.`id`, `pname`, `idno`, `ppasswd`, `sex`, `birth`, IFNULL(p.`headimg`,'') headimg, `ccnt`, `islogin`, `openid`, p.`hxid`, `pid`, `pcid`, r.`did`, `cid`, `fid`, r.`stat` " + + "FROM lyms_patient p,lyms_tkrecord r,lyms_chatgroup cg,lyms_doctor d " + + "WHERE p.`id`=r.`pid` AND p.`idno`=cg.`fromp` AND r.`did`=d.`did` AND cg.`target`=d.`dlogin` AND r.`did`=#{did} AND cg.`hxgroupid`=#{groupid} ORDER BY r.`createdtime` DESC") + List> getPinfoBySesson(@Param("froms") String froms,@Param("did") String did,@Param("groupid") String groupid); } diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/LymsChatgroupService.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/LymsChatgroupService.java index 1c37321..8b65021 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/LymsChatgroupService.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/LymsChatgroupService.java @@ -17,5 +17,5 @@ public interface LymsChatgroupService extends IService { * @param did * @return */ - List> getPinfoBySesson(String froms, String did); + List> getPinfoBySesson(String froms, String did,String groupid); } diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/impl/LymsChatgroupServiceImpl.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/impl/LymsChatgroupServiceImpl.java index 02b0702..dbc1a38 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/impl/LymsChatgroupServiceImpl.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/impl/LymsChatgroupServiceImpl.java @@ -21,8 +21,8 @@ public class LymsChatgroupServiceImpl extends ServiceImpl> getPinfoBySesson(String froms, String did) { - return lymsChatgroupMapper.getPinfoBySesson(froms,did); + public List> getPinfoBySesson(String froms, String did,String groupid) { + return lymsChatgroupMapper.getPinfoBySesson(froms,did,groupid); } }