From d8a5b60d366bd8d3c4924fefe8e528978cc0b499 Mon Sep 17 00:00:00 2001 From: zhangheng <3226558941@qq.com> Date: Thu, 1 Aug 2024 15:00:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E8=AE=B0=E5=BD=95=E5=B0=B1?= =?UTF-8?q?=E8=AF=8A=E8=AE=B0=E5=BD=95=E4=BF=AE=E6=94=B9=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PatientTaskExecuteRecordController.java | 4 +-- .../PatientTaskExecuteRecordMapper.java | 4 +-- .../IPatientTaskExecuteRecordService.java | 3 +- .../PatientTaskExecuteRecordServiceImpl.java | 8 ++--- .../PatientTaskExecuteRecordMapper.xml | 35 +++++++------------ .../vo/homepage/MessageTabulationVO.java | 2 ++ .../mapper/homepage/HomePageMapper.xml | 1 + 7 files changed, 25 insertions(+), 32 deletions(-) diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patienttaskexecuterecord/PatientTaskExecuteRecordController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patienttaskexecuterecord/PatientTaskExecuteRecordController.java index a1d8630d..bbe9eb36 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patienttaskexecuterecord/PatientTaskExecuteRecordController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patienttaskexecuterecord/PatientTaskExecuteRecordController.java @@ -81,8 +81,8 @@ public class PatientTaskExecuteRecordController extends BaseController { * 根据患者信息查询就诊记录 */ @GetMapping("/selectVisitRecord") - public AjaxResult selectVisitRecord(Long id, Long patientId) { - return patientTaskExecuteRecordService.selectVisitRecord(id, patientId); + public AjaxResult selectVisitRecord(Long patientId) { + return patientTaskExecuteRecordService.selectVisitRecord(patientId); } /** diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patienttaskexecuterecord/PatientTaskExecuteRecordMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patienttaskexecuterecord/PatientTaskExecuteRecordMapper.java index 22a0f702..ea47b590 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patienttaskexecuterecord/PatientTaskExecuteRecordMapper.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patienttaskexecuterecord/PatientTaskExecuteRecordMapper.java @@ -72,8 +72,8 @@ public interface PatientTaskExecuteRecordMapper { /** * 根据患者信息查询就诊记录 * - * @param id id + * @param patientId id * @return AjaxResult */ - PatientTaskExecuteRecordVO selectVisitRecord(@Param("id") Long id, @Param("patientId") Long patientId); + PatientTaskExecuteRecordVO selectVisitRecord(@Param("patientId") Long patientId); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patienttaskexecuterecord/IPatientTaskExecuteRecordService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patienttaskexecuterecord/IPatientTaskExecuteRecordService.java index 1313e7f8..3e36c481 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patienttaskexecuterecord/IPatientTaskExecuteRecordService.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patienttaskexecuterecord/IPatientTaskExecuteRecordService.java @@ -64,11 +64,10 @@ public interface IPatientTaskExecuteRecordService { /** * 根据患者信息查询就诊记录 * - * @param id 记录id * @param patientId 患者id * @return AjaxResult */ - AjaxResult selectVisitRecord(Long id, Long patientId); + AjaxResult selectVisitRecord(Long patientId); /** * 根据任务执行记录查询患者问卷信息 diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patienttaskexecuterecord/impl/PatientTaskExecuteRecordServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patienttaskexecuterecord/impl/PatientTaskExecuteRecordServiceImpl.java index 8b62af37..db6398e4 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patienttaskexecuterecord/impl/PatientTaskExecuteRecordServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patienttaskexecuterecord/impl/PatientTaskExecuteRecordServiceImpl.java @@ -100,15 +100,15 @@ public class PatientTaskExecuteRecordServiceImpl implements IPatientTaskExecuteR /** * 根据患者信息查询就诊记录 * - * @param id id + * @param patientId id * @return AjaxResult */ @Override - public AjaxResult selectVisitRecord(Long id, Long patientId) { - if (Objects.isNull(id) && Objects.isNull(patientId)){ + public AjaxResult selectVisitRecord(Long patientId) { + if (Objects.isNull(patientId)) { return AjaxResult.error("请选择要查询的信息！"); } - PatientTaskExecuteRecordVO patientTaskExecuteRecordVO = patientTaskExecuteRecordMapper.selectVisitRecord(id, patientId); + PatientTaskExecuteRecordVO patientTaskExecuteRecordVO = patientTaskExecuteRecordMapper.selectVisitRecord(patientId); if (Objects.nonNull(patientTaskExecuteRecordVO) && Objects.nonNull(patientTaskExecuteRecordVO.getBirthDate())) { patientTaskExecuteRecordVO.setAge(AgeUtil.getAgeMonth(patientTaskExecuteRecordVO.getBirthDate().toString())); } diff --git a/postdischarge-manage/src/main/resources/mapper/manage/patienttaskexecuterecord/PatientTaskExecuteRecordMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/patienttaskexecuterecord/PatientTaskExecuteRecordMapper.xml index c06ba3f4..ddc0e698 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/patienttaskexecuterecord/PatientTaskExecuteRecordMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/patienttaskexecuterecord/PatientTaskExecuteRecordMapper.xml @@ -303,28 +303,19 @@ \ No newline at end of file diff --git a/postdischarge-mobile/src/main/java/com/xinelu/mobile/vo/homepage/MessageTabulationVO.java b/postdischarge-mobile/src/main/java/com/xinelu/mobile/vo/homepage/MessageTabulationVO.java index 829abebb..7f8aeba3 100644 --- a/postdischarge-mobile/src/main/java/com/xinelu/mobile/vo/homepage/MessageTabulationVO.java +++ b/postdischarge-mobile/src/main/java/com/xinelu/mobile/vo/homepage/MessageTabulationVO.java @@ -62,4 +62,6 @@ public class MessageTabulationVO { * 模版名称 */ private String manageRouteNodeName; + + private String nodeFinishDate; } diff --git a/postdischarge-mobile/src/main/resources/mapper/homepage/HomePageMapper.xml b/postdischarge-mobile/src/main/resources/mapper/homepage/HomePageMapper.xml index 873ce9dc..e5ed6bf6 100644 --- a/postdischarge-mobile/src/main/resources/mapper/homepage/HomePageMapper.xml +++ b/postdischarge-mobile/src/main/resources/mapper/homepage/HomePageMapper.xml @@ -158,6 +158,7 @@ IF(pter.id is NULL, 0, 1) sign, pter.id patientTaskExecuteRecordId, spmrn.task_node_type, + spmrn.node_finish_date, CASE WHEN spmrn.task_node_type = 'QUESTIONNAIRE_SCALE' THEN spmrn.questionnaire_name WHEN spmrn.task_node_type = 'PROPAGANDA_ARTICLE' THEN spmrn.propaganda_title