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 afbda666..8b62af37 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 @@ -105,6 +105,9 @@ public class PatientTaskExecuteRecordServiceImpl implements IPatientTaskExecuteR */ @Override public AjaxResult selectVisitRecord(Long id, Long patientId) { + if (Objects.isNull(id) && Objects.isNull(patientId)){ + return AjaxResult.error("请选择要查询的信息!"); + } PatientTaskExecuteRecordVO patientTaskExecuteRecordVO = patientTaskExecuteRecordMapper.selectVisitRecord(id, 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 cb0f15f9..c06ba3f4 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/patienttaskexecuterecord/PatientTaskExecuteRecordMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/patienttaskexecuterecord/PatientTaskExecuteRecordMapper.xml @@ -316,7 +316,7 @@ ri.address FROM patient_info pi LEFT JOIN patient_task_execute_record pter ON pi.id = pter.patient_id - LEFT JOIN patient_visit_record pvr ON pter.visit_record_id = pvr.id + LEFT JOIN patient_visit_record pvr ON pvr.id = pi.patient_visit_record_id LEFT JOIN resident_info ri ON ri.id = pi.resident_id diff --git a/postdischarge-mobile/src/main/java/com/xinelu/mobile/controller/homepage/HomePageController.java b/postdischarge-mobile/src/main/java/com/xinelu/mobile/controller/homepage/HomePageController.java index 2cd6e9b4..638c207c 100644 --- a/postdischarge-mobile/src/main/java/com/xinelu/mobile/controller/homepage/HomePageController.java +++ b/postdischarge-mobile/src/main/java/com/xinelu/mobile/controller/homepage/HomePageController.java @@ -119,4 +119,12 @@ public class HomePageController extends BaseController { public AjaxResult nodeExecuteStatus(Long manageRouteNodeId) { return homePageService.nodeExecuteStatus(manageRouteNodeId); } + + /** + * 保存宣教文章查看时间 + */ + @PostMapping("/viewPropaganda") + public AjaxResult viewPropaganda(Long manageRouteNodeId) { + return homePageService.viewPropaganda(manageRouteNodeId); + } } \ No newline at end of file diff --git a/postdischarge-mobile/src/main/java/com/xinelu/mobile/service/homepage/HomePageService.java b/postdischarge-mobile/src/main/java/com/xinelu/mobile/service/homepage/HomePageService.java index 461b20fe..408976e7 100644 --- a/postdischarge-mobile/src/main/java/com/xinelu/mobile/service/homepage/HomePageService.java +++ b/postdischarge-mobile/src/main/java/com/xinelu/mobile/service/homepage/HomePageService.java @@ -105,4 +105,12 @@ public interface HomePageService { * @return AjaxResult */ AjaxResult nodeExecuteStatus(Long manageRouteNodeId); + + /** + * 保存宣教文章查看时间 + * + * @param manageRouteNodeId 节点id + * @return AjaxResult + */ + AjaxResult viewPropaganda(Long manageRouteNodeId); } \ No newline at end of file diff --git a/postdischarge-mobile/src/main/java/com/xinelu/mobile/service/homepage/Impl/HomePageServiceImpl.java b/postdischarge-mobile/src/main/java/com/xinelu/mobile/service/homepage/Impl/HomePageServiceImpl.java index e77a24e5..557ad25e 100644 --- a/postdischarge-mobile/src/main/java/com/xinelu/mobile/service/homepage/Impl/HomePageServiceImpl.java +++ b/postdischarge-mobile/src/main/java/com/xinelu/mobile/service/homepage/Impl/HomePageServiceImpl.java @@ -400,4 +400,19 @@ public class HomePageServiceImpl implements HomePageService { } return AjaxResult.success(nodeExecuteStatus); } + + /** + * 保存宣教文章查看时间 + * + * @param manageRouteNodeId 节点id + * @return AjaxResult + */ + @Override + public AjaxResult viewPropaganda(Long manageRouteNodeId) { + SignPatientManageRouteNode signPatientManageRouteNode = new SignPatientManageRouteNode(); + signPatientManageRouteNode.setId(manageRouteNodeId); + signPatientManageRouteNode.setNodeFinishDate(LocalDateTime.now()); + signPatientManageRouteNodeMapper.updateSignPatientManageRouteNode(signPatientManageRouteNode); + return AjaxResult.success(); + } } \ No newline at end of file