问诊问题处理

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

@@ -298,7 +298,7 @@ public class InquiryOrderController extends  AppBaseController {
         customDTO.setImType(1);
         customDTO.setOrderType(inquiryOrder.getOrderType());
         customDTO.setOrderId(report.getOrderId().toString());
-        /*msgDTO.setCloudCustomData(JSONUtil.toJsonStr(customDTO));
+        msgDTO.setCloudCustomData(JSONUtil.toJsonStr(customDTO));
         List<MsgDataDTO> msgs=new ArrayList<>();
         MsgDataDTO msg=new MsgDataDTO();
         String ext= JSONUtil.toJsonStr(report);
@@ -314,23 +314,23 @@ public class InquiryOrderController extends  AppBaseController {
         }else if (ImTypeConfig.IMTYPE== ImTypeEnum.TENCENT){
             imService.sendMsg(msgDTO);
         }
-        /*JSONObject jsonObject = new JSONObject();
-        OpenImMsgDTO openImMsgDTO = new OpenImMsgDTO();
-        openImMsgDTO.setSendID("D"+report.getDoctorId().toString());
-        openImMsgDTO.setRecvID("U"+report.getUserId().toString());
-        openImMsgDTO.setContentType(110);
-        openImMsgDTO.setSenderPlatformID(5);
-        openImMsgDTO.setSessionType(1);
-
-        OpenImMsgDTO.Content content = new OpenImMsgDTO.Content();
-        PayloadDTO payloadDTO = new PayloadDTO();
-        payloadDTO.setData("startInquiry");
-        PayloadDTO.Extension extension = new PayloadDTO.Extension();
-        extension.setTitle();
-        //content.setContent(ext);
-        openImMsgDTO.setContent(content);
-        openImMsgDTO.setEx(customDTO);
-        openIMService.openIMSendMsg(openImMsgDTO);*/
+//        JSONObject jsonObject = new JSONObject();
+//        OpenImMsgDTO openImMsgDTO = new OpenImMsgDTO();
+//        openImMsgDTO.setSendID("D"+report.getDoctorId().toString());
+//        openImMsgDTO.setRecvID("U"+report.getUserId().toString());
+//        openImMsgDTO.setContentType(110);
+//        openImMsgDTO.setSenderPlatformID(5);
+//        openImMsgDTO.setSessionType(1);
+//
+//        OpenImMsgDTO.Content content = new OpenImMsgDTO.Content();
+//        PayloadDTO payloadDTO = new PayloadDTO();
+//        payloadDTO.setData("startInquiry");
+//        PayloadDTO.Extension extension = new PayloadDTO.Extension();
+//        extension.setTitle();
+//        //content.setContent(ext);
+//        openImMsgDTO.setContent(content);
+//        openImMsgDTO.setEx(customDTO);
+//        openIMService.openIMSendMsg(openImMsgDTO);
         return R.ok("操作成功");
     }
 

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

@@ -136,9 +136,9 @@ public interface FsPrescribeMapper
     List<FsPrescribeListUVO> selectFsPrescribeListUVO(@Param("maps")FsPrescribeListUParam param);
 
     @Select({"<script> " +
-            "select p.*  from fs_prescribe p " +
+            "select p.*  from fs_prescribe p LEFT JOIN company_user_user c ON p.user_id = c.user_id " +
             "where 1=1  " +
-            "<if test = 'maps.status != null    '> " +
+            "<if test = 'maps.status != null '> " +
             "and p.status = #{maps.status} " +
             "</if>" +
             "<if test = ' maps.patientName!=null and maps.patientName != \"\"  '> " +
@@ -147,6 +147,9 @@ public interface FsPrescribeMapper
             "<if test = ' maps.prescribeType!=null and maps.prescribeType != \"\"  '> " +
             "and p.prescribe_type = #{maps.prescribeType} " +
             "</if>" +
+            "<if test = ' maps.companyUserId!=null and maps.companyUserId != \"\"  '> " +
+            "and c.company_user_id = #{maps.companyUserId} " +
+            "</if>" +
             " order by p.create_time desc "+
             "</script>"})
     List<FsPrescribeListDVO> selectFsPrescribeListUVOByCompanyUser(@Param("maps") FsPrescribeListDCompanyParam param);