患者问卷提交结果信息

postdischarge-manage/src/main/java/com/xinelu/manage/controller/patienttaskexecuterecord/PatientTaskExecuteRecordController.java

@@ -84,4 +84,12 @@ public class PatientTaskExecuteRecordController extends BaseController {
     public AjaxResult selectVisitRecord(Long id) {
         return patientTaskExecuteRecordService.selectVisitRecord(id);
     }
+
+    /**
+     * 根据任务执行记录查询患者问卷信息
+     */
+    @GetMapping("/selectPatientQuestionSubmit")
+    public AjaxResult selectPatientQuestionSubmit(Long taskExecuteRecordId) {
+        return patientTaskExecuteRecordService.selectPatientQuestionSubmit(taskExecuteRecordId);
+    }
 }

postdischarge-manage/src/main/java/com/xinelu/manage/domain/taskpartitiondict/TaskPartitionDict.java

@@ -12,9 +12,7 @@ import lombok.NoArgsConstructor;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
-import java.sql.Time;
 import java.time.LocalTime;
-import java.util.Date;
 
 /**
  * 任务细分字典对象 task_partition_dict
@@ -99,6 +97,12 @@ public class TaskPartitionDict extends BaseEntity {
     @Excel(name = "任务细分模板内容")
     private String taskPartitionContent;
 
+    /**
+     * 模板类型
+     */
+    @ApiModelProperty(value = "模板类型")
+    @Excel(name = "模板类型")
+    private String templateType;
 
     @Override
     public String toString() {

postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientquestionsubmitresult/PatientQuestionSubmitResultMapper.java

@@ -60,5 +60,11 @@ public interface PatientQuestionSubmitResultMapper {
      */
     int deletePatientQuestionSubmitResultByIds(Long[] ids);
 
+    /**
+     * 根据任务执行记录查询患者问卷信息
+     *
+     * @param taskExecuteRecordId 患者管理任务执行记录表id
+     * @return PatientQuestionSubmitResultDTO
+     */
     PatientQuestionSubmitResultDTO selectResultByTaskExecuteRecordId(Long taskExecuteRecordId);
 }

postdischarge-manage/src/main/java/com/xinelu/manage/service/patientquestionsubmitresult/impl/PatientQuestionSubmitResultServiceImpl.java

@@ -1,16 +1,13 @@
 package com.xinelu.manage.service.patientquestionsubmitresult.impl;
 
-import java.time.LocalDateTime;
-import java.util.List;
-
 import com.xinelu.manage.domain.patientquestionsubmitresult.PatientQuestionSubmitResult;
 import com.xinelu.manage.mapper.patientquestionsubmitresult.PatientQuestionSubmitResultMapper;
 import com.xinelu.manage.service.patientquestionsubmitresult.IPatientQuestionSubmitResultService;
-
 import org.springframework.stereotype.Service;
 
-
 import javax.annotation.Resource;
+import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * 患者问卷提交结果信息Service业务层处理
@@ -53,8 +50,8 @@ public class PatientQuestionSubmitResultServiceImpl implements IPatientQuestionS
      */
     @Override
     public int insertPatientQuestionSubmitResult(PatientQuestionSubmitResult patientQuestionSubmitResult) {
-                patientQuestionSubmitResult.setCreateTime(LocalDateTime.now());
+        patientQuestionSubmitResult.setCreateTime(LocalDateTime.now());
-            return patientQuestionSubmitResultMapper.insertPatientQuestionSubmitResult(patientQuestionSubmitResult);
+        return patientQuestionSubmitResultMapper.insertPatientQuestionSubmitResult(patientQuestionSubmitResult);
     }
 
     /**
@@ -65,7 +62,7 @@ public class PatientQuestionSubmitResultServiceImpl implements IPatientQuestionS
      */
     @Override
     public int updatePatientQuestionSubmitResult(PatientQuestionSubmitResult patientQuestionSubmitResult) {
-                patientQuestionSubmitResult.setUpdateTime(LocalDateTime.now());
+        patientQuestionSubmitResult.setUpdateTime(LocalDateTime.now());
         return patientQuestionSubmitResultMapper.updatePatientQuestionSubmitResult(patientQuestionSubmitResult);
     }
 

postdischarge-manage/src/main/java/com/xinelu/manage/service/patienttaskexecuterecord/IPatientTaskExecuteRecordService.java

@@ -68,4 +68,12 @@ public interface IPatientTaskExecuteRecordService {
      * @return AjaxResult
      */
     AjaxResult selectVisitRecord(Long id);
+
+    /**
+     * 根据任务执行记录查询患者问卷信息
+     *
+     * @param taskExecuteRecordId 患者管理任务执行记录表id
+     * @return PatientQuestionSubmitResultDTO
+     */
+    AjaxResult selectPatientQuestionSubmit(Long taskExecuteRecordId);
 }

postdischarge-manage/src/main/java/com/xinelu/manage/service/patienttaskexecuterecord/impl/PatientTaskExecuteRecordServiceImpl.java

@@ -3,6 +3,7 @@ package com.xinelu.manage.service.patienttaskexecuterecord.impl;
 import com.xinelu.common.core.domain.AjaxResult;
 import com.xinelu.common.utils.AgeUtil;
 import com.xinelu.manage.domain.patienttaskexecuterecord.PatientTaskExecuteRecord;
+import com.xinelu.manage.mapper.patientquestionsubmitresult.PatientQuestionSubmitResultMapper;
 import com.xinelu.manage.mapper.patienttaskexecuterecord.PatientTaskExecuteRecordMapper;
 import com.xinelu.manage.service.patienttaskexecuterecord.IPatientTaskExecuteRecordService;
 import com.xinelu.manage.vo.patienttaskexecuterecord.PatientTaskExecuteRecordVO;
@@ -22,6 +23,8 @@ import java.util.List;
 public class PatientTaskExecuteRecordServiceImpl implements IPatientTaskExecuteRecordService {
     @Resource
     private PatientTaskExecuteRecordMapper patientTaskExecuteRecordMapper;
+    @Resource
+    private PatientQuestionSubmitResultMapper submitResultMapper;
 
     /**
      * 查询患者管理任务执行记录
@@ -103,4 +106,15 @@ public class PatientTaskExecuteRecordServiceImpl implements IPatientTaskExecuteR
         patientTaskExecuteRecordVO.setAge(AgeUtil.getAgeMonth(patientTaskExecuteRecordVO.getBirthDate().toString()));
         return AjaxResult.success(patientTaskExecuteRecordVO);
     }
+
+    /**
+     * 根据任务执行记录查询患者问卷信息
+     *
+     * @param taskExecuteRecordId 患者管理任务执行记录表id
+     * @return PatientQuestionSubmitResultDTO
+     */
+    @Override
+    public AjaxResult selectPatientQuestionSubmit(Long taskExecuteRecordId) {
+        return AjaxResult.success(submitResultMapper.selectResultByTaskExecuteRecordId(taskExecuteRecordId));
+    }
 }

postdischarge-manage/src/main/java/com/xinelu/manage/vo/patientquestionsubjectresult/PatientQuestionSubjectResultDTO.java

@@ -17,7 +17,13 @@ import java.util.List;
 @Data
 public class PatientQuestionSubjectResultDTO extends PatientQuestionSubjectResult {
 
-    private Long subjectResult;
+    /*
+     * 患者问卷题目提交结果信息对象id
+     */
+    private Long subjectResultId;
 
+    /**
+     * 选项表信息
+     */
     List<PatientQuestionOptionResult> optionResults;
 }

postdischarge-manage/src/main/resources/mapper/manage/patientquestionsubmitresult/PatientQuestionSubmitResultMapper.xml

@@ -34,7 +34,7 @@
 
     <resultMap type="com.xinelu.manage.vo.patientquestionsubmitresult.PatientQuestionSubmitResultDTO"
                id="PatientQuestionSubmitResultDTO">
-        <result property="submitResulId" column="id"/>
+        <result property="submitResulId" column="submitResulId"/>
         <result property="questionnaireName" column="questionnaire_name"/>
         <result property="questionnaireDescription" column="questionnaire_description"/>
         <collection property="subjectResultList" javaType="java.util.List"
@@ -42,7 +42,7 @@
     </resultMap>
     <resultMap type="com.xinelu.manage.vo.patientquestionsubjectresult.PatientQuestionSubjectResultDTO"
                id="PatientQuestionSubjectResultResult">
-        <result property="subjectResult" column="id"/>
+        <result property="subjectResultId" column="subjectResultId"/>
         <result property="questionSubmitResultId" column="question_submit_result_id"/>
         <result property="questionInfoId" column="question_info_id"/>
         <result property="questionNumber" column="question_number"/>

postdischarge-manage/src/main/resources/mapper/manage/taskpartitiondict/TaskPartitionDictMapper.xml

@@ -15,6 +15,7 @@
         <result property="taskPartitionSort" column="task_partition_sort"/>
         <result property="taskPartitionRemark" column="task_partition_remark"/>
         <result property="taskPartitionContent" column="task_partition_content"/>
+        <result property="templateType" column="template_type"/>
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>
@@ -32,6 +33,7 @@
                task_partition_sort,
                task_partition_remark,
                task_partition_content,
+               template_type,
                create_by,
                create_time,
                update_by,
@@ -66,6 +68,9 @@
             <if test="taskPartitionRemark != null  and taskPartitionRemark != ''">
                 and task_partition_remark = #{taskPartitionRemark}
             </if>
+            <if test="templateType != null  and templateType != ''">
+                and template_type = #{templateType}
+            </if>
         </where>
     </select>
 
@@ -105,6 +110,8 @@
             </if>
             <if test="updateTime != null">update_time,
             </if>
+            <if test="templateType != null">template_type,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="taskTypeId != null">#{taskTypeId},
@@ -133,6 +140,8 @@
             </if>
             <if test="updateTime != null">#{updateTime},
             </if>
+            <if test="templateType != null">#{templateType},
+            </if>
         </trim>
     </insert>
 
@@ -178,6 +187,9 @@
             <if test="updateTime != null">update_time =
                 #{updateTime},
             </if>
+            <if test="templateType != null">template_type =
+                #{templateType},
+            </if>
         </trim>
         where id = #{id}
     </update>