小程序消息修改

postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientquestionsubjectresult/PatientQuestionSubjectResult.java

@@ -87,14 +87,14 @@ public class PatientQuestionSubjectResult extends BaseEntity {
      * 回答（填空题）
      */
     @ApiModelProperty(value = "回答")
-    @Excel(name = "回答", readConverterExp = "填=空题")
+    @Excel(name = "回答", readConverterExp = "填空题")
     private String fillBlanksAnswer;
 
     /**
      * 选项个数（打分题）
      */
     @ApiModelProperty(value = "选项个数")
-    @Excel(name = "选项个数", readConverterExp = "打=分题")
+    @Excel(name = "选项个数", readConverterExp = "打分题")
     private Integer optionCount;
 
     /**

postdischarge-mobile/src/main/java/com/xinelu/mobile/mapper/homepage/HomePageMapper.java

@@ -77,4 +77,6 @@ public interface HomePageMapper {
      * @return SignPatientManageRouteNode
      */
     List<MessageTabulationVO> selectManageRouteByResidentId(@Param("residentId") Long residentId, @Param("nodeExecuteStatus") String nodeExecuteStatus);
+
+    PatientTaskExecuteRecord selectPatientManageRouteByManageRouteNodeId(Long manageRouteNodeId);
 }

postdischarge-mobile/src/main/java/com/xinelu/mobile/service/homepage/Impl/HomePageServiceImpl.java

@@ -21,6 +21,7 @@ import com.xinelu.manage.dto.patientquestionsubmitresult.PatientQuestionSubmitRe
 import com.xinelu.manage.mapper.patientquestionoptionresult.PatientQuestionOptionResultMapper;
 import com.xinelu.manage.mapper.patientquestionsubjectresult.PatientQuestionSubjectResultMapper;
 import com.xinelu.manage.mapper.patientquestionsubmitresult.PatientQuestionSubmitResultMapper;
+import com.xinelu.manage.mapper.patienttaskexecuterecord.PatientTaskExecuteRecordMapper;
 import com.xinelu.manage.mapper.questioninfo.QuestionInfoMapper;
 import com.xinelu.manage.mapper.questionsubject.QuestionSubjectMapper;
 import com.xinelu.manage.mapper.questionsubjectoption.QuestionSubjectOptionMapper;
@@ -79,6 +80,8 @@ public class HomePageServiceImpl implements HomePageService {
     private SignPatientManageRouteNodeMapper signPatientManageRouteNodeMapper;
     @Resource
     private IPropagandaInfoService propagandaInfoService;
+    @Resource
+    private PatientTaskExecuteRecordMapper patientTaskExecuteRecordMapper;
 
     /**
      * 我的随访列表
@@ -175,8 +178,20 @@ public class HomePageServiceImpl implements HomePageService {
     @Transactional(rollbackFor = Exception.class)
     public AjaxResult updatePatientTaskExecuteRecord(PatientQuestionSubmitResultDTO dto) {
         LocalDateTime time = LocalDateTime.now();
+        //新增患者管理任务执行记录表
+        PatientTaskExecuteRecord patientTaskExecuteRecord = homePageMapper.selectPatientManageRouteByManageRouteNodeId(dto.getManageRouteNodeId());
+        patientTaskExecuteRecord.setExecuteTime(time);
+        patientTaskExecuteRecord.setCreateTime(time);
+        patientTaskExecuteRecordMapper.insertPatientTaskExecuteRecord(patientTaskExecuteRecord);
+        //患者问卷提交结果信息表
         PatientQuestionSubmitResult patientQuestionSubmitResult = new PatientQuestionSubmitResult();
         BeanUtils.copyBeanProp(patientQuestionSubmitResult, dto);
+        patientQuestionSubmitResult.setTaskExecuteRecordId(patientTaskExecuteRecord.getId());
+        patientQuestionSubmitResult.setQuestionInfoId(dto.getQuestionInfoId());
+        patientQuestionSubmitResult.setPatientId(patientTaskExecuteRecord.getPatientId());
+        patientQuestionSubmitResult.setPatientName(patientTaskExecuteRecord.getPatientName());
+        patientQuestionSubmitResult.setManageRouteId(patientTaskExecuteRecord.getManageRouteId());
+        patientQuestionSubmitResult.setManageRouteName(patientTaskExecuteRecord.getManageRouteName());
         patientQuestionSubmitResult.setCreateTime(time);
         // 新增患者问卷提交结果
         if (patientQuestionSubmitResultMapper.insertPatientQuestionSubmitResult(patientQuestionSubmitResult) <= 0) {

postdischarge-mobile/src/main/java/com/xinelu/mobile/vo/homepage/MessageContentVO.java

@@ -10,6 +10,16 @@ import lombok.Data;
 @Data
 public class MessageContentVO {
 
+    /**
+     * 签约患者管理任务路径节点表
+     */
+    private Long manageRouteNodeId;
+
+    /**
+     * 患者id
+     */
+    private Long patientId;
+
     /**
      * 任务类型
      */

postdischarge-mobile/src/main/resources/mapper/homepage/HomePageMapper.xml

@@ -165,7 +165,8 @@
                spmrn.update_time,
                spmrn.message_status,
                IF(pter.id is NULL, 0, 1) sign,
-               pter.id                   patientTaskExecuteRecordId
+               pter.id                   patientTaskExecuteRecordId,
+               spmrn.task_type
         from sign_patient_manage_route_node spmrn
                  LEFT JOIN sign_patient_manage_route spmr ON spmr.id = spmrn.manage_route_id
                  LEFT JOIN patient_info pi on pi.id = spmr.patient_id
@@ -177,4 +178,18 @@
           and pi.del_flag = 0
         Order BY spmrn.update_time DESC
     </select>
+
+    <select id="selectPatientManageRouteByManageRouteNodeId"
+            resultType="com.xinelu.manage.domain.patienttaskexecuterecord.PatientTaskExecuteRecord">
+        select spmr.patient_id,
+               spmr.patient_name,
+               spmr.id                 manageRouteId,
+               spmrn.id                manageRouteNodeId,
+               spmrn.manage_route_name manageRouteName,
+               spmrn.route_node_name   manageRouteNodeName,
+               spmrn.task_type         taskContent
+        from sign_patient_manage_route_node spmrn
+                 LEFT JOIN sign_patient_manage_route spmr ON spmr.id = spmrn.manage_route_id
+        where spmrn.id = #{manageRouteNodeId}
+    </select>
 </mapper>