From 9d5cd95015b4504de54d42e81906f8ec139a91ef Mon Sep 17 00:00:00 2001 From: zhangheng <3226558941@qq.com> Date: Mon, 29 Apr 2024 16:17:41 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=BB=A1?= =?UTF-8?q?=E6=84=8F=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xinelu/mobile/controller/homepage/HomePageController.java | 4 ++-- .../com/xinelu/mobile/service/homepage/HomePageService.java | 2 +- .../mobile/service/homepage/Impl/HomePageServiceImpl.java | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) 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 6a621f8e..b4882443 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 @@ -53,8 +53,8 @@ public class HomePageController extends BaseController { * 问卷记录信息 */ @GetMapping("/selectQuestionSubmit") - public AjaxResult selectQuestionSubmit(Long patientQuestionSubmitResultId) { - return homePageService.selectQuestionSubmit(patientQuestionSubmitResultId); + public AjaxResult selectQuestionSubmit(Long patientQuestionSubmitResultId,Long patientTaskExecuteRecordId) { + return homePageService.selectQuestionSubmit(patientQuestionSubmitResultId,patientTaskExecuteRecordId); } /** 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 782c6841..ffb89cbb 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 @@ -42,7 +42,7 @@ public interface HomePageService { * @param patientQuestionSubmitResultId 记录表id * @return AjaxResult */ - AjaxResult selectQuestionSubmit(Long patientQuestionSubmitResultId); + AjaxResult selectQuestionSubmit(Long patientQuestionSubmitResultId,Long patientTaskExecuteRecordId); /** * 问卷提交 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 f9400858..4a97f9b2 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 @@ -152,8 +152,8 @@ public class HomePageServiceImpl implements HomePageService { * @return AjaxResult */ @Override - public AjaxResult selectQuestionSubmit(Long patientQuestionSubmitResultId) { - return AjaxResult.success(submitResultMapper.selectResultByTaskExecuteRecordId(null, patientQuestionSubmitResultId)); + public AjaxResult selectQuestionSubmit(Long patientQuestionSubmitResultId, Long patientTaskExecuteRecordId) { + return AjaxResult.success(submitResultMapper.selectResultByTaskExecuteRecordId(patientTaskExecuteRecordId, patientQuestionSubmitResultId)); } /** From 6f76ab1e634df56f978bde595b3342a8c4513e32 Mon Sep 17 00:00:00 2001 From: zhangheng <3226558941@qq.com> Date: Mon, 6 May 2024 09:13:32 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=B8=93=E7=97=85=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SpecialDiseaseNodeServiceImpl.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasenode/impl/SpecialDiseaseNodeServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasenode/impl/SpecialDiseaseNodeServiceImpl.java index 2297c3ce..befcfc00 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasenode/impl/SpecialDiseaseNodeServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasenode/impl/SpecialDiseaseNodeServiceImpl.java @@ -22,6 +22,7 @@ import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.stream.Collectors; /** * 专病路径-管理节点信息Service业务层处理 @@ -116,6 +117,12 @@ public class SpecialDiseaseNodeServiceImpl implements ISpecialDiseaseNodeService if (CollectionUtils.isEmpty(specialDiseaseNode.getSpecialDiseaseNodeList())) { return AjaxResult.success(); } + List routeNodeDayList = specialDiseaseNode.getSpecialDiseaseNodeList().stream().filter(Objects::nonNull).filter(item -> Objects.nonNull(item.getRouteNodeDay())).map(SpecialDiseaseNode::getRouteNodeDay).collect(Collectors.toList()); + long size = routeNodeDayList.stream().distinct().count(); + if (routeNodeDayList.size() != size) { + log.info("专病路径管理节点天数重复"); + throw new ServiceException("专病路径管理节点天数重复！"); + } ArrayList specialDiseaseNodeVOS = new ArrayList<>(); for (SpecialDiseaseNodeVO diseaseNode : specialDiseaseNode.getSpecialDiseaseNodeList()) { if (StringUtils.isNotBlank(diseaseNode.getRouteNodeName()) && Objects.nonNull(diseaseNode.getRouteNodeDay()) && StringUtils.isNotBlank(diseaseNode.getTaskType()) && StringUtils.isNotBlank(diseaseNode.getTaskSubdivision()) && StringUtils.isNotBlank(diseaseNode.getTaskStatus())) { From 491229fc0fa7ea07741e8a6b20f84125e5b23861 Mon Sep 17 00:00:00 2001 From: haown <454902499@qq.com> Date: Tue, 7 May 2024 14:31:45 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PatientPreHospitalizationController.java | 8 ++++---- .../impl/PatientVisitRecordServiceImpl.java | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientprehospitalization/PatientPreHospitalizationController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientprehospitalization/PatientPreHospitalizationController.java index 36c390da..92e4aa30 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientprehospitalization/PatientPreHospitalizationController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientprehospitalization/PatientPreHospitalizationController.java @@ -56,7 +56,7 @@ public class PatientPreHospitalizationController extends BaseController { * 查询预住院患者信息列表 */ @ApiOperation("查询预住院患者信息列表") - @PreAuthorize("@ss.hasPermi('manage:patientInfo:list')") + @PreAuthorize("@ss.hasPermi('manage:preHospitalized:list')") @GetMapping("/list") public TableDataInfo list(PatientInfoDto patientInfo) { startPage(); @@ -67,7 +67,7 @@ public class PatientPreHospitalizationController extends BaseController { /** * 获取住院患者信息详细信息 */ - @PreAuthorize("@ss.hasPermi('manage:patientInfo:query')") + @PreAuthorize("@ss.hasPermi('manage:preHospitalized:query')") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { return AjaxResult.success(preHospitalizationService.getById(id)); @@ -76,7 +76,7 @@ public class PatientPreHospitalizationController extends BaseController { /** * 修改预住院患者信息 */ - @PreAuthorize("@ss.hasPermi('manage:patientInfo:edit')") + @PreAuthorize("@ss.hasPermi('manage:preHospitalized:edit')") @Log(title = "预住院患者", businessType = BusinessType.UPDATE) @PutMapping public R edit(@RequestBody PatientPreHospitalization preHospitalization) { @@ -87,7 +87,7 @@ public class PatientPreHospitalizationController extends BaseController { /** * 删除预住院患者信息 */ - @PreAuthorize("@ss.hasPermi('manage:patientInfo:remove')") + @PreAuthorize("@ss.hasPermi('manage:preHospitalized:remove')") @Log(title = "患者信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) { diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitrecord/impl/PatientVisitRecordServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitrecord/impl/PatientVisitRecordServiceImpl.java index 2624aed7..306bf7aa 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitrecord/impl/PatientVisitRecordServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitrecord/impl/PatientVisitRecordServiceImpl.java @@ -347,7 +347,8 @@ public class PatientVisitRecordServiceImpl implements IPatientVisitRecordService } // 查询院区id if (StringUtils.isNotBlank(item.getCampusAgencyName())) { - agency.setAgencyName(item.getWardName()); + agency.setParentId(patientVisitRecord.getHospitalAgencyId()); + agency.setAgencyName(item.getCampusAgencyName()); agency.setNodeType(NodeTypeConstants.CAMPUS); List campusList = agencyMapper.selectAgencyList(agency); if (CollectionUtils.isNotEmpty(campusList)) {