Merge remote-tracking branch 'origin/master'

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

@@ -113,6 +113,8 @@ public class BizPainAssessmentServiceImpl implements IBizPainAssessmentService {
             throw new ServiceException(TRExcCode.SYSTEM_ERROR_B0001,"手术信息不存在");
         }
         if (baseRepository.insert(BizPainAssessmentMapper.INSTANCE.convertPO(source))!=0) {
+            int assessCount =Optional.ofNullable(clinicRoom.getAssessCount()).orElse(0);
+            clinicRoom.setAssessCount(++assessCount);
             clinicRoom.setLastPainAssessmentTime(new Date());
             clinicRoomRepository.updateById(clinicRoom);
             //消除镇痛提醒

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

@@ -39,6 +39,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 /**
@@ -94,6 +95,8 @@ public class BizQuestionAnswerServiceImpl implements IBizQuestionAnswerService {
         }
         questionAnswer.setQuestion(questionList);
         baseRepository.insert(questionAnswer);
+        Integer followUpCount = Optional.ofNullable(clinicRoom.getFollowUpCount()).orElse(0);
+        clinicRoom.setFollowUpCount(++followUpCount);
         clinicRoom.setLastBeforeQuestionTime(new Date());
         clinicRoomRepository.updateById(clinicRoom);
         //消除镇痛提醒
@@ -160,6 +163,8 @@ public class BizQuestionAnswerServiceImpl implements IBizQuestionAnswerService {
         questionAnswer.setQuestionType(ClinicPhaseEnums.AFTER);
         questionAnswer.setQuestion(questionList);
         baseRepository.insert(questionAnswer);
+        Integer followUpCount = Optional.ofNullable(clinicRoom.getFollowUpCount()).orElse(0);
+        clinicRoom.setFollowUpCount(++followUpCount);
         clinicRoom.setLastAfterQuestionTime(new Date());
         clinicRoomRepository.updateById(clinicRoom);
     }