feat: IM分支合并

fs-admin/src/main/java/com/fs/his/controller/FsInquiryOrderController.java

@@ -1,6 +1,7 @@
 package com.fs.his.controller;
 
 import com.alibaba.fastjson.JSON;
+import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fs.common.annotation.Log;
 import com.fs.common.annotation.RepeatSubmit;
 import com.fs.common.core.controller.BaseController;
@@ -155,8 +156,7 @@ public class FsInquiryOrderController extends BaseController
 
     @PreAuthorize("@ss.hasPermi('his:inquiryOrder:sendMsg')")
     @GetMapping(value = "/sendMsg/{orderId}")
-    public AjaxResult sendMsg(@PathVariable("orderId") Long orderId)
-    {
+    public AjaxResult sendMsg(@PathVariable("orderId") Long orderId) throws JsonProcessingException {
 
         return AjaxResult.success(fsInquiryOrderService.sendStartMsg(orderId));
     }

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

@@ -494,7 +494,7 @@ public class FsDoctorServiceImpl implements IFsDoctorService
 
     @Override
     public String selectDoctorByIds(String doctorId) {
-        return fsDoctorMapper.selectDoctorNameByIds(doctorIds);
+        return fsDoctorMapper.selectDoctorNameByIds(doctorId);
     }
 
     public static BufferedImage convertCircular(BufferedImage bi1) throws IOException {