Merge remote-tracking branch 'origin/master'

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

@@ -1134,6 +1134,7 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService {
         try {
             //信息采集 发送药师im
             FsUserInformationCollection fsUserInformationCollectionParam = new FsUserInformationCollection();
+            fsUserInformationCollectionParam.setUserId(packageOrder.getUserId());
             fsUserInformationCollectionParam.setPackageOrderId(packageOrder.getOrderId());
             fsUserInformationCollectionParam.setPackageOrderCode(packageOrder.getOrderSn());
             List<FsUserInformationCollection> fsUserInformationCollections = fsUserInformationCollectionMapper.selectFsUserInformationCollectionList(fsUserInformationCollectionParam);

fs-service/src/main/java/com/fs/im/service/impl/OpenIMServiceImpl.java

@@ -1582,32 +1582,32 @@ public class OpenIMServiceImpl implements OpenIMService {
     public OpenImResponseDTO sendUserInformation(Long userId,Long doctorId,Long userInformationId) {
         try {
             accountCheck("U"+userId,"1");
-        OpenImMsgDTO openImMsgDTO = new OpenImMsgDTO();
-        ObjectMapper objectMapper = new ObjectMapper();
-        openImMsgDTO.setSendID("U"+userId);
-        openImMsgDTO.setRecvID("D"+doctorId);
-        //110为im的自定义消息类型
-        openImMsgDTO.setContentType(110);
-        openImMsgDTO.setSenderPlatformID(5);
-        openImMsgDTO.setSessionType(1);
-        OpenImMsgDTO.Content content = new OpenImMsgDTO.Content();
-        //content.setContent(ext);
-        PayloadDTO payload = new PayloadDTO();
-        payload.setDescription("userInformation");
-        payload.setData("userInformation");
-        PayloadDTO.Extension extension = new PayloadDTO.Extension();
+            OpenImMsgDTO openImMsgDTO = new OpenImMsgDTO();
+            ObjectMapper objectMapper = new ObjectMapper();
+            openImMsgDTO.setSendID("U"+userId);
+            openImMsgDTO.setRecvID("D"+doctorId);
+            //110为im的自定义消息类型
+            openImMsgDTO.setContentType(110);
+            openImMsgDTO.setSenderPlatformID(5);
+            openImMsgDTO.setSessionType(1);
+            OpenImMsgDTO.Content content = new OpenImMsgDTO.Content();
+            //content.setContent(ext);
+            PayloadDTO payload = new PayloadDTO();
+            payload.setDescription("userInformation");
+            payload.setData("userInformation");
+            PayloadDTO.Extension extension = new PayloadDTO.Extension();
 
-        extension.setDoctorId(doctorId);
-        extension.setUserInformationId(userInformationId);
-        payload.setExtension(extension);
-        OpenImMsgDTO.ImData imData = new OpenImMsgDTO.ImData();
+            extension.setDoctorId(doctorId);
+            extension.setUserInformationId(userInformationId);
+            payload.setExtension(extension);
+            OpenImMsgDTO.ImData imData = new OpenImMsgDTO.ImData();
 
-        imData.setPayload(payload);
+            imData.setPayload(payload);
 
-        String imJson = objectMapper.writeValueAsString(imData);
-        content.setData(imJson);
-        openImMsgDTO.setContent(content);
-        return openIMSendMsg(openImMsgDTO);
+            String imJson = objectMapper.writeValueAsString(imData);
+            content.setData(imJson);
+            openImMsgDTO.setContent(content);
+            return openIMSendMsg(openImMsgDTO);
         } catch (Exception e) {
             e.printStackTrace();
             return null;

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

@@ -54,6 +54,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="jsonInfo != null  and jsonInfo != ''"> and json_info = #{jsonInfo}</if>
             <if test="userConfirm != null "> and user_confirm = #{userConfirm}</if>
             <if test="doctorConfirm != null "> and doctor_confirm = #{doctorConfirm}</if>
+            <if test="packageOrderId != null "> and package_order_id = #{packageOrderId}</if>
+            <if test="packageOrderCode != null and packageOrderCode !=''"> and package_order_code = #{packageOrderCode}</if>
         </where>
         order by id desc
     </select>