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)) {