Merge remote-tracking branch 'origin/bjcz_his_scrm' into bjcz_his_scrm

fs-ipad-task/src/main/java/com/fs/app/service/IpadSendServer.java

@@ -681,7 +681,7 @@ public class IpadSendServer {
         try {
             content.setSendStatus(1);
             // 如果是群公告，使用SendNotice接口
-            if(qwSopLogs.getSendType() == 21 && "1".equals(content.getContentType())){
+            if(qwSopLogs.getSendType() == 21 && "11".equals(content.getContentType())){
                 sendNotice(vo, content);
                 return;
             }

fs-service/src/main/java/com/fs/sop/service/impl/SopUserLogsInfoServiceImpl.java

@@ -806,6 +806,13 @@ public class SopUserLogsInfoServiceImpl implements ISopUserLogsInfoService {
                     QwSopCourseFinishTempSetting setting = new QwSopCourseFinishTempSetting();
 
                     List<QwSopCourseFinishTempSetting.Setting> list = JSONArray.parseArray(param.getSetting(), QwSopCourseFinishTempSetting.Setting.class);
+                    
+                    // 检查是否有群公告类型，如果有则设置sendType=21
+                    boolean hasGroupNotice = list.stream().anyMatch(st -> "11".equals(st.getContentType()));
+                    if(hasGroupNotice){
+                        sopLogs.setSendType(21);
+                        log.info("检测到群公告类型，设置sendType=21, sopId:{}, chatId:{}", param.getSopId(), groupChat.getChatId());
+                    }
 
                     for (QwSopCourseFinishTempSetting.Setting st : list) {