fix

租户管理员

tr-modules/tr-module-mobile/src/main/java/cn/tr/module/mobile/dto/MsgDTO.java

@@ -44,7 +44,17 @@ public class MsgDTO {
         msgDTO.setRole(SYSTEM);
         return msgDTO;
     }
-
+    public static MsgDTO doneMsg(String clinicId,String fromUserId,String toUserId,String tenantId){
+        MsgDTO msgDTO = new MsgDTO();
+        msgDTO.setClinicId(clinicId);
+        msgDTO.setType(MsgContentType.DOCTOR_DONE);
+        msgDTO.setFromUserId(fromUserId);
+        msgDTO.setToUserId(toUserId);
+        msgDTO.setTenantId(tenantId);
+        msgDTO.setMsgId(IdWorker.getIdStr());
+        msgDTO.setRole(SYSTEM);
+        return msgDTO;
+    }
     public static MsgDTO onlineMsg(String clinicId,String fromUserId,String toUserId,String tenantId){
         MsgDTO msgDTO = new MsgDTO();
         msgDTO.setClinicId(clinicId);

tr-modules/tr-module-mobile/src/main/java/cn/tr/module/mobile/enums/MsgContentType.java

@@ -26,6 +26,12 @@ public interface MsgContentType {
      */
     String Video="video";
 
+
+    /**
+     * 医生先一步进入
+     */
+    String DOCTOR_DONE="dDone";
+
     /**
      * 医生进入
      */

tr-modules/tr-module-mobile/src/main/java/cn/tr/module/mobile/service/impl/ImMsgReceivedServiceImpl.java

@@ -97,7 +97,7 @@ public class ImMsgReceivedServiceImpl implements IImMsgReceivedService {
             try{
                 //判断医生是否在线
                 if (self.doctorIsOnline(loginInfo.getClinicId())&& !StrUtil.equals(MsgRoleType.DOCTOR,loginInfo.getRole())) {
-                    sendMsg(MsgDTO.onlineMsg(loginInfo.getClinicId(),loginInfo.getUserId(),loginInfo.getUserId(),loginInfo.getTenantId()),Boolean.FALSE);
+                    sendMsg(MsgDTO.doneMsg(loginInfo.getClinicId(),loginInfo.getUserId(),loginInfo.getUserId(),loginInfo.getTenantId()),Boolean.FALSE);
                 }else if(!StrUtil.equals(MsgRoleType.DOCTOR,loginInfo.getRole())){
                     sendMsg(MsgDTO.noneMsg(loginInfo.getClinicId(),loginInfo.getUserId(),loginInfo.getUserId(),loginInfo.getTenantId()),Boolean.FALSE);
                 }

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/common/service/impl/BizQuestionGroupServiceImpl.java

@@ -127,6 +127,10 @@ public class BizQuestionGroupServiceImpl implements IBizQuestionGroupService {
     @Transactional(rollbackFor = Exception.class)
     @Override
     public boolean updateBizQuestionGroupById(BizQuestionGroupDTO source) {
+        if(QuestionGroupTypeEnums.PRE.equals(source.getType())){
+            source.setFrequency(null);
+            source.setInterval(null);
+        }
         BizQuestionGroupPO oldQuestionGroup = baseRepository.selectById(source.getId());
         if (Objects.isNull(oldQuestionGroup)) {
             throw new ServiceException(TRExcCode.SYSTEM_ERROR_B0001, "该问卷组不存在");
@@ -148,6 +152,10 @@ public class BizQuestionGroupServiceImpl implements IBizQuestionGroupService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public BizQuestionGroupDTO insertBizQuestionGroup(BizQuestionGroupDTO source) {
+        if(QuestionGroupTypeEnums.PRE.equals(source.getType())){
+            source.setFrequency(null);
+            source.setInterval(null);
+        }
         BizQuestionGroupPO bizQuestionGroupPO = BizQuestionGroupMapper.INSTANCE.convertPO(source);
         Map<String, Object> stringObjectMap = BeanUtil.beanToMap(source, MD5_FIELDS);
         bizQuestionGroupPO.setVersion(1);