From 458fe51b68b7672082a0d0b984f902122b3c5721 Mon Sep 17 00:00:00 2001 From: haown <454902499@qq.com> Date: Thu, 29 Feb 2024 13:51:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6=E8=B7=AF?= =?UTF-8?q?=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MaterialsInfoController.java | 6 +- .../PatientBlacklistController.java | 10 +-- .../PatientInfoController.java | 8 +-- .../PatientPropagandaController.java | 6 +- .../PatientVisitInHospitalController.java | 6 +- .../PatientVisitOperationController.java | 6 +- .../PatientVisitOutHospitalController.java | 6 +- .../PatientVisitRecordController.java | 8 +-- .../PropagandaInfoController.java | 6 +- .../PropagandaMaterialsController.java | 6 +- .../SignPatientInformedController.java | 6 +- .../SignPatientPackageController.java | 6 +- .../SignPatientPackageHardwareController.java | 6 +- .../SignPatientRecordController.java | 24 ++++---- .../{ => materialsinfo}/MaterialsInfo.java | 2 +- .../PatientBlacklist.java | 2 +- .../domain/{ => patientinfo}/PatientInfo.java | 2 +- .../PatientPropaganda.java | 2 +- .../PatientVisitInHospital.java | 2 +- .../PatientVisitOperation.java | 2 +- .../PatientVisitOutHospital.java | 2 +- .../PatientVisitRecord.java | 2 +- .../{ => propagandainfo}/PropagandaInfo.java | 2 +- .../PropagandaMaterials.java | 2 +- .../SignPatientInformed.java | 2 +- .../SignPatientPackage.java | 2 +- .../SignPatientPackageHardware.java | 2 +- .../SignPatientRecord.java | 2 +- .../com/xinelu/manage/dto/ManageTestDTO.java | 0 .../PatientBlacklistDto.java | 2 +- .../dto/{ => patientinfo}/PatientInfoDto.java | 2 +- .../PatientVisitRecordDto.java | 2 +- .../SignPatientAddDto.java} | 12 ++-- .../SignPatientListDto.java | 2 +- .../SignPatientStatusDto.java} | 4 +- .../MaterialsInfoMapper.java | 4 +- .../PatientBlacklistMapper.java | 8 +-- .../{ => patientinfo}/PatientInfoMapper.java | 6 +- .../PatientPropagandaMapper.java | 4 +- .../PatientVisitInHospitalMapper.java | 4 +- .../PatientVisitOperationMapper.java | 4 +- .../PatientVisitOutHospitalMapper.java | 4 +- .../PatientVisitRecordMapper.java | 6 +- .../PropagandaInfoMapper.java | 4 +- .../PropagandaMaterialsMapper.java | 4 +- .../SignPatientInformedMapper.java | 4 +- .../SignPatientPackageMapper.java | 4 +- .../SignPatientPackageHardwareMapper.java | 4 +- .../SignPatientRecordMapper.java | 16 ++--- .../service/ISignPatientRecordService.java | 37 ----------- .../IMaterialsInfoService.java | 4 +- .../impl/MaterialsInfoServiceImpl.java | 8 +-- .../IPatientBlacklistService.java | 8 +-- .../impl/PatientBlacklistServiceImpl.java | 12 ++-- .../IPatientInfoService.java | 6 +- .../impl/PatientInfoServiceImpl.java | 10 +-- .../IPatientPropagandaService.java | 4 +- .../impl/PatientPropagandaServiceImpl.java | 8 +-- .../IPatientVisitInHospitalService.java | 4 +- .../PatientVisitInHospitalServiceImpl.java | 8 +-- .../IPatientVisitOperationService.java | 4 +- .../PatientVisitOperationServiceImpl.java | 8 +-- .../IPatientVisitOutHospitalService.java | 4 +- .../PatientVisitOutHospitalServiceImpl.java | 8 +-- .../IPatientVisitRecordService.java | 6 +- .../impl/PatientVisitRecordServiceImpl.java | 10 +-- .../IPropagandaInfoService.java | 4 +- .../impl/PropagandaInfoServiceImpl.java | 8 +-- .../IPropagandaMaterialsService.java | 4 +- .../impl/PropagandaMaterialsServiceImpl.java | 8 +-- .../ISignPatientInformedService.java | 4 +- .../impl/SignPatientInformedServiceImpl.java | 8 +-- .../ISignPatientPackageService.java | 4 +- .../impl/SignPatientPackageServiceImpl.java | 8 +-- .../ISignPatientPackageHardwareService.java | 4 +- ...SignPatientPackageHardwareServiceImpl.java | 8 +-- .../ISignPatientRecordService.java | 37 +++++++++++ .../impl/SignPatientRecordServiceImpl.java | 40 ++++++------ .../PatientBlacklistVo.java | 2 +- .../SignPatientInfoVo.java} | 6 +- .../SignPatientListVo.java | 2 +- .../SignPatientRecordVo.java} | 4 +- .../materialsinfo/MaterialsInfoMapper.java | 61 +++++++++++++++++++ .../MaterialsInfoMapper.xml | 2 +- .../PatientBlacklistMapper.xml | 4 +- .../{ => patientinfo}/PatientInfoMapper.xml | 10 +-- .../PatientPropagandaMapper.xml | 2 +- .../PatientVisitInHospitalMapper.xml | 2 +- .../PatientVisitOperationMapper.xml | 2 +- .../PatientVisitOutHospitalMapper.xml | 2 +- .../PatientVisitRecordMapper.xml | 4 +- .../PropagandaInfoMapper.xml | 2 +- .../PropagandaMaterialsMapper.xml | 2 +- .../SignPatientInformedMapper.xml | 2 +- .../SignPatientPackageMapper.xml | 2 +- .../SignPatientPackageHardwareMapper.xml | 2 +- .../SignPatientRecordMapper.xml | 22 +++---- 97 files changed, 360 insertions(+), 299 deletions(-) rename postdischarge-manage/src/main/java/com/xinelu/manage/controller/{ => materialsinfo}/MaterialsInfoController.java (95%) rename postdischarge-manage/src/main/java/com/xinelu/manage/controller/{ => patientblacklist}/PatientBlacklistController.java (91%) rename postdischarge-manage/src/main/java/com/xinelu/manage/controller/{ => patientinfo}/PatientInfoController.java (93%) rename postdischarge-manage/src/main/java/com/xinelu/manage/controller/{ => patientpropaganda}/PatientPropagandaController.java (95%) rename postdischarge-manage/src/main/java/com/xinelu/manage/controller/{ => patientvisitinhospital}/PatientVisitInHospitalController.java (95%) rename postdischarge-manage/src/main/java/com/xinelu/manage/controller/{ => patientvisitoperation}/PatientVisitOperationController.java (95%) rename postdischarge-manage/src/main/java/com/xinelu/manage/controller/{ => patientvisitouthospital}/PatientVisitOutHospitalController.java (94%) rename postdischarge-manage/src/main/java/com/xinelu/manage/controller/{ => patientvisitrecord}/PatientVisitRecordController.java (93%) rename postdischarge-manage/src/main/java/com/xinelu/manage/controller/{ => propagandainfo}/PropagandaInfoController.java (95%) rename postdischarge-manage/src/main/java/com/xinelu/manage/controller/{ => propagandamaterials}/PropagandaMaterialsController.java (94%) rename postdischarge-manage/src/main/java/com/xinelu/manage/controller/{ => signpatientinformed}/SignPatientInformedController.java (95%) rename postdischarge-manage/src/main/java/com/xinelu/manage/controller/{ => signpatientpackage}/SignPatientPackageController.java (95%) rename postdischarge-manage/src/main/java/com/xinelu/manage/controller/{ => signpatientpackagehardware}/SignPatientPackageHardwareController.java (94%) rename postdischarge-manage/src/main/java/com/xinelu/manage/controller/{ => signpatientrecord}/SignPatientRecordController.java (76%) rename postdischarge-manage/src/main/java/com/xinelu/manage/domain/{ => materialsinfo}/MaterialsInfo.java (98%) rename postdischarge-manage/src/main/java/com/xinelu/manage/domain/{ => patientblacklist}/PatientBlacklist.java (97%) rename postdischarge-manage/src/main/java/com/xinelu/manage/domain/{ => patientinfo}/PatientInfo.java (99%) rename postdischarge-manage/src/main/java/com/xinelu/manage/domain/{ => patientpropaganda}/PatientPropaganda.java (98%) rename postdischarge-manage/src/main/java/com/xinelu/manage/domain/{ => patientvisitinhospital}/PatientVisitInHospital.java (98%) rename postdischarge-manage/src/main/java/com/xinelu/manage/domain/{ => patientvisitoperation}/PatientVisitOperation.java (97%) rename postdischarge-manage/src/main/java/com/xinelu/manage/domain/{ => patientvisitouthospital}/PatientVisitOutHospital.java (97%) rename postdischarge-manage/src/main/java/com/xinelu/manage/domain/{ => patientvisitrecord}/PatientVisitRecord.java (98%) rename postdischarge-manage/src/main/java/com/xinelu/manage/domain/{ => propagandainfo}/PropagandaInfo.java (98%) rename postdischarge-manage/src/main/java/com/xinelu/manage/domain/{ => propagandamaterials}/PropagandaMaterials.java (96%) rename postdischarge-manage/src/main/java/com/xinelu/manage/domain/{ => signpatientinformed}/SignPatientInformed.java (95%) rename postdischarge-manage/src/main/java/com/xinelu/manage/domain/{ => signpatientpackage}/SignPatientPackage.java (98%) rename postdischarge-manage/src/main/java/com/xinelu/manage/domain/{ => signpatientpackagehardware}/SignPatientPackageHardware.java (97%) rename postdischarge-manage/src/main/java/com/xinelu/manage/domain/{ => signpatientrecord}/SignPatientRecord.java (98%) delete mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/dto/ManageTestDTO.java rename postdischarge-manage/src/main/java/com/xinelu/manage/dto/{ => patientblacklist}/PatientBlacklistDto.java (96%) rename postdischarge-manage/src/main/java/com/xinelu/manage/dto/{ => patientinfo}/PatientInfoDto.java (98%) rename postdischarge-manage/src/main/java/com/xinelu/manage/dto/{ => patientvisitrecord}/PatientVisitRecordDto.java (92%) rename postdischarge-manage/src/main/java/com/xinelu/manage/dto/{PatientSignAddDto.java => signpatientrecord/SignPatientAddDto.java} (51%) rename postdischarge-manage/src/main/java/com/xinelu/manage/dto/{ => signpatientrecord}/SignPatientListDto.java (98%) rename postdischarge-manage/src/main/java/com/xinelu/manage/dto/{PatientSignStatusDto.java => signpatientrecord/SignPatientStatusDto.java} (90%) rename postdischarge-manage/src/main/java/com/xinelu/manage/mapper/{ => materialsinfo}/MaterialsInfoMapper.java (91%) rename postdischarge-manage/src/main/java/com/xinelu/manage/mapper/{ => patientblacklist}/PatientBlacklistMapper.java (85%) rename postdischarge-manage/src/main/java/com/xinelu/manage/mapper/{ => patientinfo}/PatientInfoMapper.java (87%) rename postdischarge-manage/src/main/java/com/xinelu/manage/mapper/{ => patientpropaganda}/PatientPropagandaMapper.java (91%) rename postdischarge-manage/src/main/java/com/xinelu/manage/mapper/{ => patientvisitinhospital}/PatientVisitInHospitalMapper.java (92%) rename postdischarge-manage/src/main/java/com/xinelu/manage/mapper/{ => patientvisitoperation}/PatientVisitOperationMapper.java (92%) rename postdischarge-manage/src/main/java/com/xinelu/manage/mapper/{ => patientvisitouthospital}/PatientVisitOutHospitalMapper.java (92%) rename postdischarge-manage/src/main/java/com/xinelu/manage/mapper/{ => patientvisitrecord}/PatientVisitRecordMapper.java (88%) rename postdischarge-manage/src/main/java/com/xinelu/manage/mapper/{ => propagandainfo}/PropagandaInfoMapper.java (91%) rename postdischarge-manage/src/main/java/com/xinelu/manage/mapper/{ => propagandamaterials}/PropagandaMaterialsMapper.java (91%) rename postdischarge-manage/src/main/java/com/xinelu/manage/mapper/{ => signpatientinformed}/SignPatientInformedMapper.java (92%) rename postdischarge-manage/src/main/java/com/xinelu/manage/mapper/{ => signpatientpackage}/SignPatientPackageMapper.java (92%) rename postdischarge-manage/src/main/java/com/xinelu/manage/mapper/{ => signpatientpackagehardware}/SignPatientPackageHardwareMapper.java (92%) rename postdischarge-manage/src/main/java/com/xinelu/manage/mapper/{ => signpatientrecord}/SignPatientRecordMapper.java (56%) delete mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/service/ISignPatientRecordService.java rename postdischarge-manage/src/main/java/com/xinelu/manage/service/{ => materialsinfo}/IMaterialsInfoService.java (91%) rename postdischarge-manage/src/main/java/com/xinelu/manage/service/{ => materialsinfo}/impl/MaterialsInfoServiceImpl.java (89%) rename postdischarge-manage/src/main/java/com/xinelu/manage/service/{ => patientblacklist}/IPatientBlacklistService.java (85%) rename postdischarge-manage/src/main/java/com/xinelu/manage/service/{ => patientblacklist}/impl/PatientBlacklistServiceImpl.java (86%) rename postdischarge-manage/src/main/java/com/xinelu/manage/service/{ => patientinfo}/IPatientInfoService.java (88%) rename postdischarge-manage/src/main/java/com/xinelu/manage/service/{ => patientinfo}/impl/PatientInfoServiceImpl.java (87%) rename postdischarge-manage/src/main/java/com/xinelu/manage/service/{ => patientpropaganda}/IPatientPropagandaService.java (92%) rename postdischarge-manage/src/main/java/com/xinelu/manage/service/{ => patientpropaganda}/impl/PatientPropagandaServiceImpl.java (89%) rename postdischarge-manage/src/main/java/com/xinelu/manage/service/{ => patientvisitinhospital}/IPatientVisitInHospitalService.java (93%) rename postdischarge-manage/src/main/java/com/xinelu/manage/service/{ => patientvisitinhospital}/impl/PatientVisitInHospitalServiceImpl.java (91%) rename postdischarge-manage/src/main/java/com/xinelu/manage/service/{ => patientvisitoperation}/IPatientVisitOperationService.java (93%) rename postdischarge-manage/src/main/java/com/xinelu/manage/service/{ => patientvisitoperation}/impl/PatientVisitOperationServiceImpl.java (91%) rename postdischarge-manage/src/main/java/com/xinelu/manage/service/{ => patientvisitouthospital}/IPatientVisitOutHospitalService.java (92%) rename postdischarge-manage/src/main/java/com/xinelu/manage/service/{ => patientvisitouthospital}/impl/PatientVisitOutHospitalServiceImpl.java (91%) rename postdischarge-manage/src/main/java/com/xinelu/manage/service/{ => patientvisitrecord}/IPatientVisitRecordService.java (89%) rename postdischarge-manage/src/main/java/com/xinelu/manage/service/{ => patientvisitrecord}/impl/PatientVisitRecordServiceImpl.java (87%) rename postdischarge-manage/src/main/java/com/xinelu/manage/service/{ => propagandainfo}/IPropagandaInfoService.java (92%) rename postdischarge-manage/src/main/java/com/xinelu/manage/service/{ => propagandainfo}/impl/PropagandaInfoServiceImpl.java (89%) rename postdischarge-manage/src/main/java/com/xinelu/manage/service/{ => propagandamaterials}/IPropagandaMaterialsService.java (91%) rename postdischarge-manage/src/main/java/com/xinelu/manage/service/{ => propagandamaterials}/impl/PropagandaMaterialsServiceImpl.java (89%) rename postdischarge-manage/src/main/java/com/xinelu/manage/service/{ => signpatientinformed}/ISignPatientInformedService.java (93%) rename postdischarge-manage/src/main/java/com/xinelu/manage/service/{ => signpatientinformed}/impl/SignPatientInformedServiceImpl.java (92%) rename postdischarge-manage/src/main/java/com/xinelu/manage/service/{ => signpatientpackage}/ISignPatientPackageService.java (92%) rename postdischarge-manage/src/main/java/com/xinelu/manage/service/{ => signpatientpackage}/impl/SignPatientPackageServiceImpl.java (89%) rename postdischarge-manage/src/main/java/com/xinelu/manage/service/{ => signpatientpackagehardware}/ISignPatientPackageHardwareService.java (92%) rename postdischarge-manage/src/main/java/com/xinelu/manage/service/{ => signpatientpackagehardware}/impl/SignPatientPackageHardwareServiceImpl.java (89%) create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientrecord/ISignPatientRecordService.java rename postdischarge-manage/src/main/java/com/xinelu/manage/service/{ => signpatientrecord}/impl/SignPatientRecordServiceImpl.java (71%) rename postdischarge-manage/src/main/java/com/xinelu/manage/vo/{ => patientblacklist}/PatientBlacklistVo.java (97%) rename postdischarge-manage/src/main/java/com/xinelu/manage/vo/{PatientSignInfoVo.java => signpatientrecord/SignPatientInfoVo.java} (96%) rename postdischarge-manage/src/main/java/com/xinelu/manage/vo/{ => signpatientrecord}/SignPatientListVo.java (98%) rename postdischarge-manage/src/main/java/com/xinelu/manage/vo/{PatientSignRecordVo.java => signpatientrecord/SignPatientRecordVo.java} (93%) create mode 100644 postdischarge-manage/src/main/resources/mapper/manage/materialsinfo/MaterialsInfoMapper.java rename postdischarge-manage/src/main/resources/mapper/manage/{ => materialsinfo}/MaterialsInfoMapper.xml (99%) rename postdischarge-manage/src/main/resources/mapper/manage/{ => patientblacklist}/PatientBlacklistMapper.xml (97%) rename postdischarge-manage/src/main/resources/mapper/manage/{ => patientinfo}/PatientInfoMapper.xml (97%) rename postdischarge-manage/src/main/resources/mapper/manage/{ => patientpropaganda}/PatientPropagandaMapper.xml (99%) rename postdischarge-manage/src/main/resources/mapper/manage/{ => patientvisitinhospital}/PatientVisitInHospitalMapper.xml (99%) rename postdischarge-manage/src/main/resources/mapper/manage/{ => patientvisitoperation}/PatientVisitOperationMapper.xml (98%) rename postdischarge-manage/src/main/resources/mapper/manage/{ => patientvisitouthospital}/PatientVisitOutHospitalMapper.xml (98%) rename postdischarge-manage/src/main/resources/mapper/manage/{ => patientvisitrecord}/PatientVisitRecordMapper.xml (98%) rename postdischarge-manage/src/main/resources/mapper/manage/{ => propagandainfo}/PropagandaInfoMapper.xml (99%) rename postdischarge-manage/src/main/resources/mapper/manage/{ => propagandamaterials}/PropagandaMaterialsMapper.xml (98%) rename postdischarge-manage/src/main/resources/mapper/manage/{ => signpatientinformed}/SignPatientInformedMapper.xml (98%) rename postdischarge-manage/src/main/resources/mapper/manage/{ => signpatientpackage}/SignPatientPackageMapper.xml (98%) rename postdischarge-manage/src/main/resources/mapper/manage/{ => signpatientpackagehardware}/SignPatientPackageHardwareMapper.xml (98%) rename postdischarge-manage/src/main/resources/mapper/manage/{ => signpatientrecord}/SignPatientRecordMapper.xml (96%) diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/MaterialsInfoController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/materialsinfo/MaterialsInfoController.java similarity index 95% rename from postdischarge-manage/src/main/java/com/xinelu/manage/controller/MaterialsInfoController.java rename to postdischarge-manage/src/main/java/com/xinelu/manage/controller/materialsinfo/MaterialsInfoController.java index bf36b15e..57461157 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/MaterialsInfoController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/materialsinfo/MaterialsInfoController.java @@ -1,4 +1,4 @@ -package com.xinelu.manage.controller; +package com.xinelu.manage.controller.materialsinfo; import com.xinelu.common.annotation.Log; import com.xinelu.common.core.controller.BaseController; @@ -6,8 +6,8 @@ import com.xinelu.common.core.domain.AjaxResult; import com.xinelu.common.core.page.TableDataInfo; import com.xinelu.common.enums.BusinessType; import com.xinelu.common.utils.poi.ExcelUtil; -import com.xinelu.manage.domain.MaterialsInfo; -import com.xinelu.manage.service.IMaterialsInfoService; +import com.xinelu.manage.domain.materialsinfo.MaterialsInfo; +import com.xinelu.manage.service.materialsinfo.IMaterialsInfoService; import io.swagger.annotations.Api; import java.util.List; import javax.annotation.Resource; diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/PatientBlacklistController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientblacklist/PatientBlacklistController.java similarity index 91% rename from postdischarge-manage/src/main/java/com/xinelu/manage/controller/PatientBlacklistController.java rename to postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientblacklist/PatientBlacklistController.java index beee3694..25835cd5 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/PatientBlacklistController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientblacklist/PatientBlacklistController.java @@ -1,4 +1,4 @@ -package com.xinelu.manage.controller; +package com.xinelu.manage.controller.patientblacklist; import com.xinelu.common.annotation.Log; import com.xinelu.common.core.controller.BaseController; @@ -6,10 +6,10 @@ import com.xinelu.common.core.domain.AjaxResult; import com.xinelu.common.core.page.TableDataInfo; import com.xinelu.common.enums.BusinessType; import com.xinelu.common.utils.poi.ExcelUtil; -import com.xinelu.manage.domain.PatientBlacklist; -import com.xinelu.manage.dto.PatientBlacklistDto; -import com.xinelu.manage.service.IPatientBlacklistService; -import com.xinelu.manage.vo.PatientBlacklistVo; +import com.xinelu.manage.domain.patientblacklist.PatientBlacklist; +import com.xinelu.manage.dto.patientblacklist.PatientBlacklistDto; +import com.xinelu.manage.service.patientblacklist.IPatientBlacklistService; +import com.xinelu.manage.vo.patientblacklist.PatientBlacklistVo; import java.util.List; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/PatientInfoController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientinfo/PatientInfoController.java similarity index 93% rename from postdischarge-manage/src/main/java/com/xinelu/manage/controller/PatientInfoController.java rename to postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientinfo/PatientInfoController.java index 22a8ce46..20572c49 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/PatientInfoController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientinfo/PatientInfoController.java @@ -1,4 +1,4 @@ -package com.xinelu.manage.controller; +package com.xinelu.manage.controller.patientinfo; import com.xinelu.common.annotation.Log; import com.xinelu.common.core.controller.BaseController; @@ -6,9 +6,9 @@ import com.xinelu.common.core.domain.AjaxResult; import com.xinelu.common.core.page.TableDataInfo; import com.xinelu.common.enums.BusinessType; import com.xinelu.common.utils.poi.ExcelUtil; -import com.xinelu.manage.domain.PatientInfo; -import com.xinelu.manage.dto.PatientInfoDto; -import com.xinelu.manage.service.IPatientInfoService; +import com.xinelu.manage.domain.patientinfo.PatientInfo; +import com.xinelu.manage.dto.patientinfo.PatientInfoDto; +import com.xinelu.manage.service.patientinfo.IPatientInfoService; import io.swagger.annotations.Api; import java.util.List; import javax.annotation.Resource; diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/PatientPropagandaController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientpropaganda/PatientPropagandaController.java similarity index 95% rename from postdischarge-manage/src/main/java/com/xinelu/manage/controller/PatientPropagandaController.java rename to postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientpropaganda/PatientPropagandaController.java index da313c09..d670bf81 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/PatientPropagandaController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientpropaganda/PatientPropagandaController.java @@ -1,4 +1,4 @@ -package com.xinelu.manage.controller; +package com.xinelu.manage.controller.patientpropaganda; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -19,8 +19,8 @@ import com.xinelu.common.annotation.Log; import com.xinelu.common.core.controller.BaseController; import com.xinelu.common.core.domain.AjaxResult; import com.xinelu.common.enums.BusinessType; -import com.xinelu.manage.domain.PatientPropaganda; -import com.xinelu.manage.service.IPatientPropagandaService; +import com.xinelu.manage.domain.patientpropaganda.PatientPropaganda; +import com.xinelu.manage.service.patientpropaganda.IPatientPropagandaService; import com.xinelu.common.utils.poi.ExcelUtil; import com.xinelu.common.core.page.TableDataInfo; diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/PatientVisitInHospitalController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientvisitinhospital/PatientVisitInHospitalController.java similarity index 95% rename from postdischarge-manage/src/main/java/com/xinelu/manage/controller/PatientVisitInHospitalController.java rename to postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientvisitinhospital/PatientVisitInHospitalController.java index 2936be18..d7b2e77a 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/PatientVisitInHospitalController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientvisitinhospital/PatientVisitInHospitalController.java @@ -1,4 +1,4 @@ -package com.xinelu.manage.controller; +package com.xinelu.manage.controller.patientvisitinhospital; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -19,8 +19,8 @@ import com.xinelu.common.annotation.Log; import com.xinelu.common.core.controller.BaseController; import com.xinelu.common.core.domain.AjaxResult; import com.xinelu.common.enums.BusinessType; -import com.xinelu.manage.domain.PatientVisitInHospital; -import com.xinelu.manage.service.IPatientVisitInHospitalService; +import com.xinelu.manage.domain.patientvisitinhospital.PatientVisitInHospital; +import com.xinelu.manage.service.patientvisitinhospital.IPatientVisitInHospitalService; import com.xinelu.common.utils.poi.ExcelUtil; import com.xinelu.common.core.page.TableDataInfo; diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/PatientVisitOperationController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientvisitoperation/PatientVisitOperationController.java similarity index 95% rename from postdischarge-manage/src/main/java/com/xinelu/manage/controller/PatientVisitOperationController.java rename to postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientvisitoperation/PatientVisitOperationController.java index fcb74027..6bc0820d 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/PatientVisitOperationController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientvisitoperation/PatientVisitOperationController.java @@ -1,4 +1,4 @@ -package com.xinelu.manage.controller; +package com.xinelu.manage.controller.patientvisitoperation; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -19,8 +19,8 @@ import com.xinelu.common.annotation.Log; import com.xinelu.common.core.controller.BaseController; import com.xinelu.common.core.domain.AjaxResult; import com.xinelu.common.enums.BusinessType; -import com.xinelu.manage.domain.PatientVisitOperation; -import com.xinelu.manage.service.IPatientVisitOperationService; +import com.xinelu.manage.domain.patientvisitoperation.PatientVisitOperation; +import com.xinelu.manage.service.patientvisitoperation.IPatientVisitOperationService; import com.xinelu.common.utils.poi.ExcelUtil; import com.xinelu.common.core.page.TableDataInfo; diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/PatientVisitOutHospitalController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientvisitouthospital/PatientVisitOutHospitalController.java similarity index 94% rename from postdischarge-manage/src/main/java/com/xinelu/manage/controller/PatientVisitOutHospitalController.java rename to postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientvisitouthospital/PatientVisitOutHospitalController.java index 28e393e3..87217a85 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/PatientVisitOutHospitalController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientvisitouthospital/PatientVisitOutHospitalController.java @@ -1,4 +1,4 @@ -package com.xinelu.manage.controller; +package com.xinelu.manage.controller.patientvisitouthospital; import io.swagger.annotations.Api; import java.util.List; @@ -18,8 +18,8 @@ import com.xinelu.common.annotation.Log; import com.xinelu.common.core.controller.BaseController; import com.xinelu.common.core.domain.AjaxResult; import com.xinelu.common.enums.BusinessType; -import com.xinelu.manage.domain.PatientVisitOutHospital; -import com.xinelu.manage.service.IPatientVisitOutHospitalService; +import com.xinelu.manage.domain.patientvisitouthospital.PatientVisitOutHospital; +import com.xinelu.manage.service.patientvisitouthospital.IPatientVisitOutHospitalService; import com.xinelu.common.utils.poi.ExcelUtil; import com.xinelu.common.core.page.TableDataInfo; diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/PatientVisitRecordController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientvisitrecord/PatientVisitRecordController.java similarity index 93% rename from postdischarge-manage/src/main/java/com/xinelu/manage/controller/PatientVisitRecordController.java rename to postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientvisitrecord/PatientVisitRecordController.java index 6539ae76..4cc69d59 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/PatientVisitRecordController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientvisitrecord/PatientVisitRecordController.java @@ -1,4 +1,4 @@ -package com.xinelu.manage.controller; +package com.xinelu.manage.controller.patientvisitrecord; import com.xinelu.common.annotation.Log; import com.xinelu.common.core.controller.BaseController; @@ -6,9 +6,9 @@ import com.xinelu.common.core.domain.AjaxResult; import com.xinelu.common.core.page.TableDataInfo; import com.xinelu.common.enums.BusinessType; import com.xinelu.common.utils.poi.ExcelUtil; -import com.xinelu.manage.domain.PatientVisitRecord; -import com.xinelu.manage.dto.PatientVisitRecordDto; -import com.xinelu.manage.service.IPatientVisitRecordService; +import com.xinelu.manage.domain.patientvisitrecord.PatientVisitRecord; +import com.xinelu.manage.dto.patientvisitrecord.PatientVisitRecordDto; +import com.xinelu.manage.service.patientvisitrecord.IPatientVisitRecordService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import java.util.List; diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/PropagandaInfoController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/propagandainfo/PropagandaInfoController.java similarity index 95% rename from postdischarge-manage/src/main/java/com/xinelu/manage/controller/PropagandaInfoController.java rename to postdischarge-manage/src/main/java/com/xinelu/manage/controller/propagandainfo/PropagandaInfoController.java index f6a6a830..efba444c 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/PropagandaInfoController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/propagandainfo/PropagandaInfoController.java @@ -1,4 +1,4 @@ -package com.xinelu.manage.controller; +package com.xinelu.manage.controller.propagandainfo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -19,8 +19,8 @@ import com.xinelu.common.annotation.Log; import com.xinelu.common.core.controller.BaseController; import com.xinelu.common.core.domain.AjaxResult; import com.xinelu.common.enums.BusinessType; -import com.xinelu.manage.domain.PropagandaInfo; -import com.xinelu.manage.service.IPropagandaInfoService; +import com.xinelu.manage.domain.propagandainfo.PropagandaInfo; +import com.xinelu.manage.service.propagandainfo.IPropagandaInfoService; import com.xinelu.common.utils.poi.ExcelUtil; import com.xinelu.common.core.page.TableDataInfo; diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/PropagandaMaterialsController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/propagandamaterials/PropagandaMaterialsController.java similarity index 94% rename from postdischarge-manage/src/main/java/com/xinelu/manage/controller/PropagandaMaterialsController.java rename to postdischarge-manage/src/main/java/com/xinelu/manage/controller/propagandamaterials/PropagandaMaterialsController.java index 3e9ac2bc..84f2e3f2 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/PropagandaMaterialsController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/propagandamaterials/PropagandaMaterialsController.java @@ -1,4 +1,4 @@ -package com.xinelu.manage.controller; +package com.xinelu.manage.controller.propagandamaterials; import java.util.List; import javax.servlet.http.HttpServletResponse; @@ -17,8 +17,8 @@ import com.xinelu.common.annotation.Log; import com.xinelu.common.core.controller.BaseController; import com.xinelu.common.core.domain.AjaxResult; import com.xinelu.common.enums.BusinessType; -import com.xinelu.manage.domain.PropagandaMaterials; -import com.xinelu.manage.service.IPropagandaMaterialsService; +import com.xinelu.manage.domain.propagandamaterials.PropagandaMaterials; +import com.xinelu.manage.service.propagandamaterials.IPropagandaMaterialsService; import com.xinelu.common.utils.poi.ExcelUtil; import com.xinelu.common.core.page.TableDataInfo; diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/SignPatientInformedController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/signpatientinformed/SignPatientInformedController.java similarity index 95% rename from postdischarge-manage/src/main/java/com/xinelu/manage/controller/SignPatientInformedController.java rename to postdischarge-manage/src/main/java/com/xinelu/manage/controller/signpatientinformed/SignPatientInformedController.java index 89885abb..d5b669ec 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/SignPatientInformedController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/signpatientinformed/SignPatientInformedController.java @@ -1,4 +1,4 @@ -package com.xinelu.manage.controller; +package com.xinelu.manage.controller.signpatientinformed; import com.xinelu.common.annotation.Log; import com.xinelu.common.constant.Constants; @@ -7,8 +7,8 @@ import com.xinelu.common.core.domain.AjaxResult; import com.xinelu.common.core.page.TableDataInfo; import com.xinelu.common.enums.BusinessType; import com.xinelu.common.utils.poi.ExcelUtil; -import com.xinelu.manage.domain.SignPatientInformed; -import com.xinelu.manage.service.ISignPatientInformedService; +import com.xinelu.manage.domain.signpatientinformed.SignPatientInformed; +import com.xinelu.manage.service.signpatientinformed.ISignPatientInformedService; import java.util.List; import java.util.Objects; import javax.annotation.Resource; diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/SignPatientPackageController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/signpatientpackage/SignPatientPackageController.java similarity index 95% rename from postdischarge-manage/src/main/java/com/xinelu/manage/controller/SignPatientPackageController.java rename to postdischarge-manage/src/main/java/com/xinelu/manage/controller/signpatientpackage/SignPatientPackageController.java index 81e646ba..d8bf117b 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/SignPatientPackageController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/signpatientpackage/SignPatientPackageController.java @@ -1,4 +1,4 @@ -package com.xinelu.manage.controller; +package com.xinelu.manage.controller.signpatientpackage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -19,8 +19,8 @@ import com.xinelu.common.annotation.Log; import com.xinelu.common.core.controller.BaseController; import com.xinelu.common.core.domain.AjaxResult; import com.xinelu.common.enums.BusinessType; -import com.xinelu.manage.domain.SignPatientPackage; -import com.xinelu.manage.service.ISignPatientPackageService; +import com.xinelu.manage.domain.signpatientpackage.SignPatientPackage; +import com.xinelu.manage.service.signpatientpackage.ISignPatientPackageService; import com.xinelu.common.utils.poi.ExcelUtil; import com.xinelu.common.core.page.TableDataInfo; diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/SignPatientPackageHardwareController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/signpatientpackagehardware/SignPatientPackageHardwareController.java similarity index 94% rename from postdischarge-manage/src/main/java/com/xinelu/manage/controller/SignPatientPackageHardwareController.java rename to postdischarge-manage/src/main/java/com/xinelu/manage/controller/signpatientpackagehardware/SignPatientPackageHardwareController.java index 17b413f2..d41c3026 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/SignPatientPackageHardwareController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/signpatientpackagehardware/SignPatientPackageHardwareController.java @@ -1,4 +1,4 @@ -package com.xinelu.manage.controller; +package com.xinelu.manage.controller.signpatientpackagehardware; import java.util.List; import javax.servlet.http.HttpServletResponse; @@ -17,8 +17,8 @@ import com.xinelu.common.annotation.Log; import com.xinelu.common.core.controller.BaseController; import com.xinelu.common.core.domain.AjaxResult; import com.xinelu.common.enums.BusinessType; -import com.xinelu.manage.domain.SignPatientPackageHardware; -import com.xinelu.manage.service.ISignPatientPackageHardwareService; +import com.xinelu.manage.domain.signpatientpackagehardware.SignPatientPackageHardware; +import com.xinelu.manage.service.signpatientpackagehardware.ISignPatientPackageHardwareService; import com.xinelu.common.utils.poi.ExcelUtil; import com.xinelu.common.core.page.TableDataInfo; diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/SignPatientRecordController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/signpatientrecord/SignPatientRecordController.java similarity index 76% rename from postdischarge-manage/src/main/java/com/xinelu/manage/controller/SignPatientRecordController.java rename to postdischarge-manage/src/main/java/com/xinelu/manage/controller/signpatientrecord/SignPatientRecordController.java index 23a4c0b1..eb062237 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/SignPatientRecordController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/signpatientrecord/SignPatientRecordController.java @@ -1,15 +1,15 @@ -package com.xinelu.manage.controller; +package com.xinelu.manage.controller.signpatientrecord; import com.xinelu.common.core.controller.BaseController; import com.xinelu.common.core.domain.AjaxResult; import com.xinelu.common.core.page.TableDataInfo; -import com.xinelu.manage.dto.PatientSignStatusDto; -import com.xinelu.manage.dto.PatientSignAddDto; -import com.xinelu.manage.dto.SignPatientListDto; -import com.xinelu.manage.service.ISignPatientRecordService; -import com.xinelu.manage.vo.PatientSignInfoVo; -import com.xinelu.manage.vo.PatientSignRecordVo; -import com.xinelu.manage.vo.SignPatientListVo; +import com.xinelu.manage.dto.signpatientrecord.SignPatientStatusDto; +import com.xinelu.manage.dto.signpatientrecord.SignPatientAddDto; +import com.xinelu.manage.dto.signpatientrecord.SignPatientListDto; +import com.xinelu.manage.service.signpatientrecord.ISignPatientRecordService; +import com.xinelu.manage.vo.signpatientrecord.SignPatientInfoVo; +import com.xinelu.manage.vo.signpatientrecord.SignPatientRecordVo; +import com.xinelu.manage.vo.signpatientrecord.SignPatientListVo; import io.swagger.annotations.ApiOperation; import java.util.List; import javax.annotation.Resource; @@ -51,7 +51,7 @@ public class SignPatientRecordController extends BaseController { @ApiOperation("签约") @PreAuthorize("@ss.hasPermi('manage:signRecord:add')") @PostMapping("/sign") - public AjaxResult sign(@RequestBody PatientSignAddDto body) { + public AjaxResult sign(@RequestBody SignPatientAddDto body) { return toAjax(signPatientRecordService.add(body)); } @@ -62,7 +62,7 @@ public class SignPatientRecordController extends BaseController { @PreAuthorize("@ss.hasPermi('manage:signRecord:list')") @GetMapping("/getByPatient/{patientId}") public AjaxResult getByPatient(@PathVariable("patientId") Long patientId) { - List list = signPatientRecordService.getByPatient(patientId); + List list = signPatientRecordService.getByPatient(patientId); return AjaxResult.success(list); } @@ -73,7 +73,7 @@ public class SignPatientRecordController extends BaseController { @PreAuthorize("@ss.hasPermi('manage:signRecord:list')") @GetMapping("/getByRecordId/{patientSignRecordId}") public AjaxResult getByRecordId(@PathVariable("patientSignRecordId") Long patientSignRecordId) { - PatientSignInfoVo signInfo = signPatientRecordService.getByRecordId(patientSignRecordId); + SignPatientInfoVo signInfo = signPatientRecordService.getByRecordId(patientSignRecordId); return AjaxResult.success(signInfo); } @@ -83,7 +83,7 @@ public class SignPatientRecordController extends BaseController { @ApiOperation("解约") @PreAuthorize("@ss.hasPermi('manage:signRecord:edit')") @PostMapping("/updateSignStatus") - public AjaxResult updateSignStatus(@RequestBody PatientSignStatusDto updateSignStatus) { + public AjaxResult updateSignStatus(@RequestBody SignPatientStatusDto updateSignStatus) { int flag = signPatientRecordService.updateSignStatus(updateSignStatus); return flag < 0 ? AjaxResult.error() : AjaxResult.success(); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/MaterialsInfo.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/materialsinfo/MaterialsInfo.java similarity index 98% rename from postdischarge-manage/src/main/java/com/xinelu/manage/domain/MaterialsInfo.java rename to postdischarge-manage/src/main/java/com/xinelu/manage/domain/materialsinfo/MaterialsInfo.java index 2c82f8b5..5b6e1f9a 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/MaterialsInfo.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/materialsinfo/MaterialsInfo.java @@ -1,4 +1,4 @@ -package com.xinelu.manage.domain; +package com.xinelu.manage.domain.materialsinfo; import com.xinelu.common.annotation.Excel; import com.xinelu.common.core.domain.BaseEntity; diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/PatientBlacklist.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientblacklist/PatientBlacklist.java similarity index 97% rename from postdischarge-manage/src/main/java/com/xinelu/manage/domain/PatientBlacklist.java rename to postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientblacklist/PatientBlacklist.java index c56829ba..6be55243 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/PatientBlacklist.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientblacklist/PatientBlacklist.java @@ -1,4 +1,4 @@ -package com.xinelu.manage.domain; +package com.xinelu.manage.domain.patientblacklist; import com.xinelu.common.annotation.Excel; import com.xinelu.common.core.domain.BaseEntity; diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/PatientInfo.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientinfo/PatientInfo.java similarity index 99% rename from postdischarge-manage/src/main/java/com/xinelu/manage/domain/PatientInfo.java rename to postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientinfo/PatientInfo.java index d98b34cb..5723d877 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/PatientInfo.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientinfo/PatientInfo.java @@ -1,4 +1,4 @@ -package com.xinelu.manage.domain; +package com.xinelu.manage.domain.patientinfo; import com.fasterxml.jackson.annotation.JsonFormat; import com.xinelu.common.annotation.Excel; diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/PatientPropaganda.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientpropaganda/PatientPropaganda.java similarity index 98% rename from postdischarge-manage/src/main/java/com/xinelu/manage/domain/PatientPropaganda.java rename to postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientpropaganda/PatientPropaganda.java index fd1abb5c..1fc48bfa 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/PatientPropaganda.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientpropaganda/PatientPropaganda.java @@ -1,4 +1,4 @@ -package com.xinelu.manage.domain; +package com.xinelu.manage.domain.patientpropaganda; import com.xinelu.common.annotation.Excel; import com.xinelu.common.core.domain.BaseEntity; diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/PatientVisitInHospital.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientvisitinhospital/PatientVisitInHospital.java similarity index 98% rename from postdischarge-manage/src/main/java/com/xinelu/manage/domain/PatientVisitInHospital.java rename to postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientvisitinhospital/PatientVisitInHospital.java index e6133ced..28a3f5d5 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/PatientVisitInHospital.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientvisitinhospital/PatientVisitInHospital.java @@ -1,4 +1,4 @@ -package com.xinelu.manage.domain; +package com.xinelu.manage.domain.patientvisitinhospital; import com.fasterxml.jackson.annotation.JsonFormat; import com.xinelu.common.annotation.Excel; diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/PatientVisitOperation.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientvisitoperation/PatientVisitOperation.java similarity index 97% rename from postdischarge-manage/src/main/java/com/xinelu/manage/domain/PatientVisitOperation.java rename to postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientvisitoperation/PatientVisitOperation.java index d975765b..956184e2 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/PatientVisitOperation.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientvisitoperation/PatientVisitOperation.java @@ -1,4 +1,4 @@ -package com.xinelu.manage.domain; +package com.xinelu.manage.domain.patientvisitoperation; import com.fasterxml.jackson.annotation.JsonFormat; import com.xinelu.common.annotation.Excel; diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/PatientVisitOutHospital.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientvisitouthospital/PatientVisitOutHospital.java similarity index 97% rename from postdischarge-manage/src/main/java/com/xinelu/manage/domain/PatientVisitOutHospital.java rename to postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientvisitouthospital/PatientVisitOutHospital.java index 9370ac48..61e7a1f2 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/PatientVisitOutHospital.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientvisitouthospital/PatientVisitOutHospital.java @@ -1,4 +1,4 @@ -package com.xinelu.manage.domain; +package com.xinelu.manage.domain.patientvisitouthospital; import com.xinelu.common.annotation.Excel; import com.xinelu.common.core.domain.BaseEntity; diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/PatientVisitRecord.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientvisitrecord/PatientVisitRecord.java similarity index 98% rename from postdischarge-manage/src/main/java/com/xinelu/manage/domain/PatientVisitRecord.java rename to postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientvisitrecord/PatientVisitRecord.java index ee2dea04..9ca5d642 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/PatientVisitRecord.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientvisitrecord/PatientVisitRecord.java @@ -1,4 +1,4 @@ -package com.xinelu.manage.domain; +package com.xinelu.manage.domain.patientvisitrecord; import com.fasterxml.jackson.annotation.JsonFormat; import com.xinelu.common.annotation.Excel; diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/PropagandaInfo.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/propagandainfo/PropagandaInfo.java similarity index 98% rename from postdischarge-manage/src/main/java/com/xinelu/manage/domain/PropagandaInfo.java rename to postdischarge-manage/src/main/java/com/xinelu/manage/domain/propagandainfo/PropagandaInfo.java index db554cfd..746f6bed 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/PropagandaInfo.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/propagandainfo/PropagandaInfo.java @@ -1,4 +1,4 @@ -package com.xinelu.manage.domain; +package com.xinelu.manage.domain.propagandainfo; import com.xinelu.common.annotation.Excel; import com.xinelu.common.core.domain.BaseEntity; diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/PropagandaMaterials.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/propagandamaterials/PropagandaMaterials.java similarity index 96% rename from postdischarge-manage/src/main/java/com/xinelu/manage/domain/PropagandaMaterials.java rename to postdischarge-manage/src/main/java/com/xinelu/manage/domain/propagandamaterials/PropagandaMaterials.java index 60dd955f..f8b09c39 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/PropagandaMaterials.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/propagandamaterials/PropagandaMaterials.java @@ -1,4 +1,4 @@ -package com.xinelu.manage.domain; +package com.xinelu.manage.domain.propagandamaterials; import com.xinelu.common.annotation.Excel; import com.xinelu.common.core.domain.BaseEntity; diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/SignPatientInformed.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/signpatientinformed/SignPatientInformed.java similarity index 95% rename from postdischarge-manage/src/main/java/com/xinelu/manage/domain/SignPatientInformed.java rename to postdischarge-manage/src/main/java/com/xinelu/manage/domain/signpatientinformed/SignPatientInformed.java index f0473517..a50ab520 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/SignPatientInformed.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/signpatientinformed/SignPatientInformed.java @@ -1,4 +1,4 @@ -package com.xinelu.manage.domain; +package com.xinelu.manage.domain.signpatientinformed; import com.xinelu.common.annotation.Excel; import com.xinelu.common.core.domain.BaseEntity; diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/SignPatientPackage.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/signpatientpackage/SignPatientPackage.java similarity index 98% rename from postdischarge-manage/src/main/java/com/xinelu/manage/domain/SignPatientPackage.java rename to postdischarge-manage/src/main/java/com/xinelu/manage/domain/signpatientpackage/SignPatientPackage.java index 1a3efb81..22441b64 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/SignPatientPackage.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/signpatientpackage/SignPatientPackage.java @@ -1,4 +1,4 @@ -package com.xinelu.manage.domain; +package com.xinelu.manage.domain.signpatientpackage; import com.fasterxml.jackson.annotation.JsonFormat; import com.xinelu.common.annotation.Excel; diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/SignPatientPackageHardware.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/signpatientpackagehardware/SignPatientPackageHardware.java similarity index 97% rename from postdischarge-manage/src/main/java/com/xinelu/manage/domain/SignPatientPackageHardware.java rename to postdischarge-manage/src/main/java/com/xinelu/manage/domain/signpatientpackagehardware/SignPatientPackageHardware.java index 4b975143..9b96dec2 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/SignPatientPackageHardware.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/signpatientpackagehardware/SignPatientPackageHardware.java @@ -1,4 +1,4 @@ -package com.xinelu.manage.domain; +package com.xinelu.manage.domain.signpatientpackagehardware; import com.xinelu.common.annotation.Excel; import com.xinelu.common.core.domain.BaseEntity; diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/SignPatientRecord.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/signpatientrecord/SignPatientRecord.java similarity index 98% rename from postdischarge-manage/src/main/java/com/xinelu/manage/domain/SignPatientRecord.java rename to postdischarge-manage/src/main/java/com/xinelu/manage/domain/signpatientrecord/SignPatientRecord.java index 12658b37..1602fdb7 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/SignPatientRecord.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/signpatientrecord/SignPatientRecord.java @@ -1,4 +1,4 @@ -package com.xinelu.manage.domain; +package com.xinelu.manage.domain.signpatientrecord; import com.xinelu.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/ManageTestDTO.java b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/ManageTestDTO.java deleted file mode 100644 index e69de29b..00000000 diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/PatientBlacklistDto.java b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientblacklist/PatientBlacklistDto.java similarity index 96% rename from postdischarge-manage/src/main/java/com/xinelu/manage/dto/PatientBlacklistDto.java rename to postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientblacklist/PatientBlacklistDto.java index 5794fd5b..06811219 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/PatientBlacklistDto.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientblacklist/PatientBlacklistDto.java @@ -1,4 +1,4 @@ -package com.xinelu.manage.dto; +package com.xinelu.manage.dto.patientblacklist; import com.xinelu.common.annotation.Excel; import io.swagger.annotations.ApiModelProperty; diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/PatientInfoDto.java b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientinfo/PatientInfoDto.java similarity index 98% rename from postdischarge-manage/src/main/java/com/xinelu/manage/dto/PatientInfoDto.java rename to postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientinfo/PatientInfoDto.java index 20498c75..9e6297de 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/PatientInfoDto.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientinfo/PatientInfoDto.java @@ -1,4 +1,4 @@ -package com.xinelu.manage.dto; +package com.xinelu.manage.dto.patientinfo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/PatientVisitRecordDto.java b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordDto.java similarity index 92% rename from postdischarge-manage/src/main/java/com/xinelu/manage/dto/PatientVisitRecordDto.java rename to postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordDto.java index 9705072a..b7e39149 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/PatientVisitRecordDto.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordDto.java @@ -1,4 +1,4 @@ -package com.xinelu.manage.dto; +package com.xinelu.manage.dto.patientvisitrecord; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/PatientSignAddDto.java b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientrecord/SignPatientAddDto.java similarity index 51% rename from postdischarge-manage/src/main/java/com/xinelu/manage/dto/PatientSignAddDto.java rename to postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientrecord/SignPatientAddDto.java index 0a8243e3..b6e66322 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/PatientSignAddDto.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientrecord/SignPatientAddDto.java @@ -1,9 +1,9 @@ -package com.xinelu.manage.dto; +package com.xinelu.manage.dto.signpatientrecord; -import com.xinelu.manage.domain.SignPatientInformed; -import com.xinelu.manage.domain.SignPatientPackage; -import com.xinelu.manage.domain.SignPatientPackageHardware; -import com.xinelu.manage.domain.SignPatientRecord; +import com.xinelu.manage.domain.signpatientinformed.SignPatientInformed; +import com.xinelu.manage.domain.signpatientpackage.SignPatientPackage; +import com.xinelu.manage.domain.signpatientpackagehardware.SignPatientPackageHardware; +import com.xinelu.manage.domain.signpatientrecord.SignPatientRecord; import io.swagger.annotations.ApiModel; import java.util.List; import lombok.Data; @@ -15,7 +15,7 @@ import lombok.Data; **/ @ApiModel("患者签约传输对象") @Data -public class PatientSignAddDto { +public class SignPatientAddDto { private SignPatientRecord record; diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/SignPatientListDto.java b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientrecord/SignPatientListDto.java similarity index 98% rename from postdischarge-manage/src/main/java/com/xinelu/manage/dto/SignPatientListDto.java rename to postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientrecord/SignPatientListDto.java index af805fd5..3a2d50c8 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/SignPatientListDto.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientrecord/SignPatientListDto.java @@ -1,4 +1,4 @@ -package com.xinelu.manage.dto; +package com.xinelu.manage.dto.signpatientrecord; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/PatientSignStatusDto.java b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientrecord/SignPatientStatusDto.java similarity index 90% rename from postdischarge-manage/src/main/java/com/xinelu/manage/dto/PatientSignStatusDto.java rename to postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientrecord/SignPatientStatusDto.java index 1c200ef4..1992d7a7 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/PatientSignStatusDto.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientrecord/SignPatientStatusDto.java @@ -1,4 +1,4 @@ -package com.xinelu.manage.dto; +package com.xinelu.manage.dto.signpatientrecord; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -9,7 +9,7 @@ import lombok.Data; * @create: 2024-02-29 10:29 **/ @Data -public class PatientSignStatusDto { +public class SignPatientStatusDto { private Long id; diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/MaterialsInfoMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/materialsinfo/MaterialsInfoMapper.java similarity index 91% rename from postdischarge-manage/src/main/java/com/xinelu/manage/mapper/MaterialsInfoMapper.java rename to postdischarge-manage/src/main/java/com/xinelu/manage/mapper/materialsinfo/MaterialsInfoMapper.java index f793e286..7ea98fee 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/MaterialsInfoMapper.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/materialsinfo/MaterialsInfoMapper.java @@ -1,8 +1,8 @@ -package com.xinelu.manage.mapper; +package com.xinelu.manage.mapper.materialsinfo; import java.util.List; -import com.xinelu.manage.domain.MaterialsInfo; +import com.xinelu.manage.domain.materialsinfo.MaterialsInfo; /** * 素材信息Mapper接口 diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/PatientBlacklistMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientblacklist/PatientBlacklistMapper.java similarity index 85% rename from postdischarge-manage/src/main/java/com/xinelu/manage/mapper/PatientBlacklistMapper.java rename to postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientblacklist/PatientBlacklistMapper.java index 31447435..62c9ac6b 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/PatientBlacklistMapper.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientblacklist/PatientBlacklistMapper.java @@ -1,8 +1,8 @@ -package com.xinelu.manage.mapper; +package com.xinelu.manage.mapper.patientblacklist; -import com.xinelu.manage.domain.PatientBlacklist; -import com.xinelu.manage.dto.PatientBlacklistDto; -import com.xinelu.manage.vo.PatientBlacklistVo; +import com.xinelu.manage.domain.patientblacklist.PatientBlacklist; +import com.xinelu.manage.dto.patientblacklist.PatientBlacklistDto; +import com.xinelu.manage.vo.patientblacklist.PatientBlacklistVo; import java.util.List; /** diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/PatientInfoMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientinfo/PatientInfoMapper.java similarity index 87% rename from postdischarge-manage/src/main/java/com/xinelu/manage/mapper/PatientInfoMapper.java rename to postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientinfo/PatientInfoMapper.java index 0e111164..c9bcb296 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/PatientInfoMapper.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientinfo/PatientInfoMapper.java @@ -1,7 +1,7 @@ -package com.xinelu.manage.mapper; +package com.xinelu.manage.mapper.patientinfo; -import com.xinelu.manage.domain.PatientInfo; -import com.xinelu.manage.dto.PatientInfoDto; +import com.xinelu.manage.domain.patientinfo.PatientInfo; +import com.xinelu.manage.dto.patientinfo.PatientInfoDto; import java.util.List; /** diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/PatientPropagandaMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientpropaganda/PatientPropagandaMapper.java similarity index 91% rename from postdischarge-manage/src/main/java/com/xinelu/manage/mapper/PatientPropagandaMapper.java rename to postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientpropaganda/PatientPropagandaMapper.java index 384157dd..36411a3c 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/PatientPropagandaMapper.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientpropaganda/PatientPropagandaMapper.java @@ -1,8 +1,8 @@ -package com.xinelu.manage.mapper; +package com.xinelu.manage.mapper.patientpropaganda; import java.util.List; -import com.xinelu.manage.domain.PatientPropaganda; +import com.xinelu.manage.domain.patientpropaganda.PatientPropaganda; /** * 患者宣教信息Mapper接口 diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/PatientVisitInHospitalMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientvisitinhospital/PatientVisitInHospitalMapper.java similarity index 92% rename from postdischarge-manage/src/main/java/com/xinelu/manage/mapper/PatientVisitInHospitalMapper.java rename to postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientvisitinhospital/PatientVisitInHospitalMapper.java index f313923e..079e1f49 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/PatientVisitInHospitalMapper.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientvisitinhospital/PatientVisitInHospitalMapper.java @@ -1,8 +1,8 @@ -package com.xinelu.manage.mapper; +package com.xinelu.manage.mapper.patientvisitinhospital; import java.util.List; -import com.xinelu.manage.domain.PatientVisitInHospital; +import com.xinelu.manage.domain.patientvisitinhospital.PatientVisitInHospital; /** * 患者就诊入院记录信息Mapper接口 diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/PatientVisitOperationMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientvisitoperation/PatientVisitOperationMapper.java similarity index 92% rename from postdischarge-manage/src/main/java/com/xinelu/manage/mapper/PatientVisitOperationMapper.java rename to postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientvisitoperation/PatientVisitOperationMapper.java index a4ccbaeb..ef6f6d98 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/PatientVisitOperationMapper.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientvisitoperation/PatientVisitOperationMapper.java @@ -1,8 +1,8 @@ -package com.xinelu.manage.mapper; +package com.xinelu.manage.mapper.patientvisitoperation; import java.util.List; -import com.xinelu.manage.domain.PatientVisitOperation; +import com.xinelu.manage.domain.patientvisitoperation.PatientVisitOperation; /** * 患者就诊手术记录信息Mapper接口 diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/PatientVisitOutHospitalMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientvisitouthospital/PatientVisitOutHospitalMapper.java similarity index 92% rename from postdischarge-manage/src/main/java/com/xinelu/manage/mapper/PatientVisitOutHospitalMapper.java rename to postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientvisitouthospital/PatientVisitOutHospitalMapper.java index 8a835127..4d5b3e76 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/PatientVisitOutHospitalMapper.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientvisitouthospital/PatientVisitOutHospitalMapper.java @@ -1,8 +1,8 @@ -package com.xinelu.manage.mapper; +package com.xinelu.manage.mapper.patientvisitouthospital; import java.util.List; -import com.xinelu.manage.domain.PatientVisitOutHospital; +import com.xinelu.manage.domain.patientvisitouthospital.PatientVisitOutHospital; /** * 患者就诊出院记录信息Mapper接口 diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/PatientVisitRecordMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientvisitrecord/PatientVisitRecordMapper.java similarity index 88% rename from postdischarge-manage/src/main/java/com/xinelu/manage/mapper/PatientVisitRecordMapper.java rename to postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientvisitrecord/PatientVisitRecordMapper.java index 033f55fb..8d866ee5 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/PatientVisitRecordMapper.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientvisitrecord/PatientVisitRecordMapper.java @@ -1,9 +1,9 @@ -package com.xinelu.manage.mapper; +package com.xinelu.manage.mapper.patientvisitrecord; -import com.xinelu.manage.dto.PatientVisitRecordDto; +import com.xinelu.manage.dto.patientvisitrecord.PatientVisitRecordDto; import java.util.List; -import com.xinelu.manage.domain.PatientVisitRecord; +import com.xinelu.manage.domain.patientvisitrecord.PatientVisitRecord; /** * 患者就诊记录基本信息Mapper接口 diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/PropagandaInfoMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/propagandainfo/PropagandaInfoMapper.java similarity index 91% rename from postdischarge-manage/src/main/java/com/xinelu/manage/mapper/PropagandaInfoMapper.java rename to postdischarge-manage/src/main/java/com/xinelu/manage/mapper/propagandainfo/PropagandaInfoMapper.java index fb2ad185..ba3a25ec 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/PropagandaInfoMapper.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/propagandainfo/PropagandaInfoMapper.java @@ -1,8 +1,8 @@ -package com.xinelu.manage.mapper; +package com.xinelu.manage.mapper.propagandainfo; import java.util.List; -import com.xinelu.manage.domain.PropagandaInfo; +import com.xinelu.manage.domain.propagandainfo.PropagandaInfo; /** * 宣教库管理Mapper接口 diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/PropagandaMaterialsMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/propagandamaterials/PropagandaMaterialsMapper.java similarity index 91% rename from postdischarge-manage/src/main/java/com/xinelu/manage/mapper/PropagandaMaterialsMapper.java rename to postdischarge-manage/src/main/java/com/xinelu/manage/mapper/propagandamaterials/PropagandaMaterialsMapper.java index f00be719..4527c6aa 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/PropagandaMaterialsMapper.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/propagandamaterials/PropagandaMaterialsMapper.java @@ -1,8 +1,8 @@ -package com.xinelu.manage.mapper; +package com.xinelu.manage.mapper.propagandamaterials; import java.util.List; -import com.xinelu.manage.domain.PropagandaMaterials; +import com.xinelu.manage.domain.propagandamaterials.PropagandaMaterials; /** * 宣教素材关系Mapper接口 diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/SignPatientInformedMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/signpatientinformed/SignPatientInformedMapper.java similarity index 92% rename from postdischarge-manage/src/main/java/com/xinelu/manage/mapper/SignPatientInformedMapper.java rename to postdischarge-manage/src/main/java/com/xinelu/manage/mapper/signpatientinformed/SignPatientInformedMapper.java index 090fefe2..c3a632e1 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/SignPatientInformedMapper.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/signpatientinformed/SignPatientInformedMapper.java @@ -1,8 +1,8 @@ -package com.xinelu.manage.mapper; +package com.xinelu.manage.mapper.signpatientinformed; import java.util.List; -import com.xinelu.manage.domain.SignPatientInformed; +import com.xinelu.manage.domain.signpatientinformed.SignPatientInformed; /** * 签约知情同意书信息Mapper接口 diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/SignPatientPackageMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/signpatientpackage/SignPatientPackageMapper.java similarity index 92% rename from postdischarge-manage/src/main/java/com/xinelu/manage/mapper/SignPatientPackageMapper.java rename to postdischarge-manage/src/main/java/com/xinelu/manage/mapper/signpatientpackage/SignPatientPackageMapper.java index 1c33927f..92377d96 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/SignPatientPackageMapper.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/signpatientpackage/SignPatientPackageMapper.java @@ -1,8 +1,8 @@ -package com.xinelu.manage.mapper; +package com.xinelu.manage.mapper.signpatientpackage; import java.util.List; -import com.xinelu.manage.domain.SignPatientPackage; +import com.xinelu.manage.domain.signpatientpackage.SignPatientPackage; /** * 签约患者服务包信息Mapper接口 diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/SignPatientPackageHardwareMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/signpatientpackagehardware/SignPatientPackageHardwareMapper.java similarity index 92% rename from postdischarge-manage/src/main/java/com/xinelu/manage/mapper/SignPatientPackageHardwareMapper.java rename to postdischarge-manage/src/main/java/com/xinelu/manage/mapper/signpatientpackagehardware/SignPatientPackageHardwareMapper.java index 47a829d7..c816996c 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/SignPatientPackageHardwareMapper.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/signpatientpackagehardware/SignPatientPackageHardwareMapper.java @@ -1,8 +1,8 @@ -package com.xinelu.manage.mapper; +package com.xinelu.manage.mapper.signpatientpackagehardware; import java.util.List; -import com.xinelu.manage.domain.SignPatientPackageHardware; +import com.xinelu.manage.domain.signpatientpackagehardware.SignPatientPackageHardware; /** * 签约患者服务包硬件信息Mapper接口 diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/SignPatientRecordMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/signpatientrecord/SignPatientRecordMapper.java similarity index 56% rename from postdischarge-manage/src/main/java/com/xinelu/manage/mapper/SignPatientRecordMapper.java rename to postdischarge-manage/src/main/java/com/xinelu/manage/mapper/signpatientrecord/SignPatientRecordMapper.java index 774a5ac9..a5a60ee8 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/SignPatientRecordMapper.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/signpatientrecord/SignPatientRecordMapper.java @@ -1,10 +1,10 @@ -package com.xinelu.manage.mapper; +package com.xinelu.manage.mapper.signpatientrecord; -import com.xinelu.manage.domain.SignPatientRecord; -import com.xinelu.manage.dto.SignPatientListDto; -import com.xinelu.manage.vo.PatientSignInfoVo; -import com.xinelu.manage.vo.PatientSignRecordVo; -import com.xinelu.manage.vo.SignPatientListVo; +import com.xinelu.manage.domain.signpatientrecord.SignPatientRecord; +import com.xinelu.manage.dto.signpatientrecord.SignPatientListDto; +import com.xinelu.manage.vo.signpatientrecord.SignPatientInfoVo; +import com.xinelu.manage.vo.signpatientrecord.SignPatientRecordVo; +import com.xinelu.manage.vo.signpatientrecord.SignPatientListVo; import java.util.List; /** @@ -29,8 +29,8 @@ public interface SignPatientRecordMapper { List selectList(SignPatientListDto signPatientRecord); - PatientSignInfoVo getByRecordId(Long patientSignRecordId); + SignPatientInfoVo getByRecordId(Long patientSignRecordId); - List getByPatient(Long patientId); + List getByPatient(Long patientId); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/ISignPatientRecordService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/ISignPatientRecordService.java deleted file mode 100644 index 7751a815..00000000 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/ISignPatientRecordService.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.xinelu.manage.service; - -import com.xinelu.manage.dto.PatientSignStatusDto; -import com.xinelu.manage.dto.PatientSignAddDto; -import com.xinelu.manage.dto.SignPatientListDto; -import com.xinelu.manage.vo.PatientSignInfoVo; -import com.xinelu.manage.vo.PatientSignRecordVo; -import com.xinelu.manage.vo.SignPatientListVo; -import java.util.List; - -/** -* @author haown -* @description 针对表【sign_patient_record(签约记录表)】的数据库操作Service -* @createDate 2024-02-28 15:05:02 -*/ -public interface ISignPatientRecordService { - - List selectList(SignPatientListDto signPatientRecord); - - /** - * 根据签约编号查询居民签约信息 - * @param patientSignRecordId - * @return - */ - PatientSignInfoVo getByRecordId(Long patientSignRecordId); - - /** - * 根据患者主键查询患者签约记录列表 - * @param patientId - * @return - */ - List getByPatient(Long patientId); - - int add(PatientSignAddDto body); - - int updateSignStatus(PatientSignStatusDto patientCancelSignDto); -} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/IMaterialsInfoService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/materialsinfo/IMaterialsInfoService.java similarity index 91% rename from postdischarge-manage/src/main/java/com/xinelu/manage/service/IMaterialsInfoService.java rename to postdischarge-manage/src/main/java/com/xinelu/manage/service/materialsinfo/IMaterialsInfoService.java index d4089468..51a848ad 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/IMaterialsInfoService.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/materialsinfo/IMaterialsInfoService.java @@ -1,8 +1,8 @@ -package com.xinelu.manage.service; +package com.xinelu.manage.service.materialsinfo; import java.util.List; -import com.xinelu.manage.domain.MaterialsInfo; +import com.xinelu.manage.domain.materialsinfo.MaterialsInfo; /** * 素材信息Service接口 diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/impl/MaterialsInfoServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/materialsinfo/impl/MaterialsInfoServiceImpl.java similarity index 89% rename from postdischarge-manage/src/main/java/com/xinelu/manage/service/impl/MaterialsInfoServiceImpl.java rename to postdischarge-manage/src/main/java/com/xinelu/manage/service/materialsinfo/impl/MaterialsInfoServiceImpl.java index f364f332..bbf5ec33 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/impl/MaterialsInfoServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/materialsinfo/impl/MaterialsInfoServiceImpl.java @@ -1,12 +1,12 @@ -package com.xinelu.manage.service.impl; +package com.xinelu.manage.service.materialsinfo.impl; import java.util.List; import com.xinelu.common.utils.DateUtils; import javax.annotation.Resource; import org.springframework.stereotype.Service; -import com.xinelu.manage.mapper.MaterialsInfoMapper; -import com.xinelu.manage.domain.MaterialsInfo; -import com.xinelu.manage.service.IMaterialsInfoService; +import com.xinelu.manage.mapper.materialsinfo.MaterialsInfoMapper; +import com.xinelu.manage.domain.materialsinfo.MaterialsInfo; +import com.xinelu.manage.service.materialsinfo.IMaterialsInfoService; /** * 素材信息Service业务层处理 diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/IPatientBlacklistService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientblacklist/IPatientBlacklistService.java similarity index 85% rename from postdischarge-manage/src/main/java/com/xinelu/manage/service/IPatientBlacklistService.java rename to postdischarge-manage/src/main/java/com/xinelu/manage/service/patientblacklist/IPatientBlacklistService.java index 923f1d0a..27a2578e 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/IPatientBlacklistService.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientblacklist/IPatientBlacklistService.java @@ -1,8 +1,8 @@ -package com.xinelu.manage.service; +package com.xinelu.manage.service.patientblacklist; -import com.xinelu.manage.domain.PatientBlacklist; -import com.xinelu.manage.dto.PatientBlacklistDto; -import com.xinelu.manage.vo.PatientBlacklistVo; +import com.xinelu.manage.domain.patientblacklist.PatientBlacklist; +import com.xinelu.manage.dto.patientblacklist.PatientBlacklistDto; +import com.xinelu.manage.vo.patientblacklist.PatientBlacklistVo; import java.util.List; /** diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/impl/PatientBlacklistServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientblacklist/impl/PatientBlacklistServiceImpl.java similarity index 86% rename from postdischarge-manage/src/main/java/com/xinelu/manage/service/impl/PatientBlacklistServiceImpl.java rename to postdischarge-manage/src/main/java/com/xinelu/manage/service/patientblacklist/impl/PatientBlacklistServiceImpl.java index e7337b85..ae2a4d41 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/impl/PatientBlacklistServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientblacklist/impl/PatientBlacklistServiceImpl.java @@ -1,11 +1,11 @@ -package com.xinelu.manage.service.impl; +package com.xinelu.manage.service.patientblacklist.impl; import com.xinelu.common.utils.DateUtils; -import com.xinelu.manage.domain.PatientBlacklist; -import com.xinelu.manage.dto.PatientBlacklistDto; -import com.xinelu.manage.mapper.PatientBlacklistMapper; -import com.xinelu.manage.service.IPatientBlacklistService; -import com.xinelu.manage.vo.PatientBlacklistVo; +import com.xinelu.manage.domain.patientblacklist.PatientBlacklist; +import com.xinelu.manage.dto.patientblacklist.PatientBlacklistDto; +import com.xinelu.manage.mapper.patientblacklist.PatientBlacklistMapper; +import com.xinelu.manage.service.patientblacklist.IPatientBlacklistService; +import com.xinelu.manage.vo.patientblacklist.PatientBlacklistVo; import java.util.Date; import java.util.List; import javax.annotation.Resource; diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/IPatientInfoService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientinfo/IPatientInfoService.java similarity index 88% rename from postdischarge-manage/src/main/java/com/xinelu/manage/service/IPatientInfoService.java rename to postdischarge-manage/src/main/java/com/xinelu/manage/service/patientinfo/IPatientInfoService.java index 4c91d01e..bf8db962 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/IPatientInfoService.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientinfo/IPatientInfoService.java @@ -1,7 +1,7 @@ -package com.xinelu.manage.service; +package com.xinelu.manage.service.patientinfo; -import com.xinelu.manage.domain.PatientInfo; -import com.xinelu.manage.dto.PatientInfoDto; +import com.xinelu.manage.domain.patientinfo.PatientInfo; +import com.xinelu.manage.dto.patientinfo.PatientInfoDto; import java.util.List; /** diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/impl/PatientInfoServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientinfo/impl/PatientInfoServiceImpl.java similarity index 87% rename from postdischarge-manage/src/main/java/com/xinelu/manage/service/impl/PatientInfoServiceImpl.java rename to postdischarge-manage/src/main/java/com/xinelu/manage/service/patientinfo/impl/PatientInfoServiceImpl.java index 8a14ba0a..b0430ac5 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/impl/PatientInfoServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientinfo/impl/PatientInfoServiceImpl.java @@ -1,10 +1,10 @@ -package com.xinelu.manage.service.impl; +package com.xinelu.manage.service.patientinfo.impl; import com.xinelu.common.utils.DateUtils; -import com.xinelu.manage.domain.PatientInfo; -import com.xinelu.manage.dto.PatientInfoDto; -import com.xinelu.manage.mapper.PatientInfoMapper; -import com.xinelu.manage.service.IPatientInfoService; +import com.xinelu.manage.domain.patientinfo.PatientInfo; +import com.xinelu.manage.dto.patientinfo.PatientInfoDto; +import com.xinelu.manage.mapper.patientinfo.PatientInfoMapper; +import com.xinelu.manage.service.patientinfo.IPatientInfoService; import java.util.List; import javax.annotation.Resource; import org.springframework.stereotype.Service; diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/IPatientPropagandaService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientpropaganda/IPatientPropagandaService.java similarity index 92% rename from postdischarge-manage/src/main/java/com/xinelu/manage/service/IPatientPropagandaService.java rename to postdischarge-manage/src/main/java/com/xinelu/manage/service/patientpropaganda/IPatientPropagandaService.java index ad50fc4d..99bc0b84 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/IPatientPropagandaService.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientpropaganda/IPatientPropagandaService.java @@ -1,8 +1,8 @@ -package com.xinelu.manage.service; +package com.xinelu.manage.service.patientpropaganda; import java.util.List; -import com.xinelu.manage.domain.PatientPropaganda; +import com.xinelu.manage.domain.patientpropaganda.PatientPropaganda; /** * 患者宣教信息Service接口 diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/impl/PatientPropagandaServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientpropaganda/impl/PatientPropagandaServiceImpl.java similarity index 89% rename from postdischarge-manage/src/main/java/com/xinelu/manage/service/impl/PatientPropagandaServiceImpl.java rename to postdischarge-manage/src/main/java/com/xinelu/manage/service/patientpropaganda/impl/PatientPropagandaServiceImpl.java index 8c922730..0fde1f51 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/impl/PatientPropagandaServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientpropaganda/impl/PatientPropagandaServiceImpl.java @@ -1,12 +1,12 @@ -package com.xinelu.manage.service.impl; +package com.xinelu.manage.service.patientpropaganda.impl; import java.util.List; import com.xinelu.common.utils.DateUtils; import javax.annotation.Resource; import org.springframework.stereotype.Service; -import com.xinelu.manage.mapper.PatientPropagandaMapper; -import com.xinelu.manage.domain.PatientPropaganda; -import com.xinelu.manage.service.IPatientPropagandaService; +import com.xinelu.manage.mapper.patientpropaganda.PatientPropagandaMapper; +import com.xinelu.manage.domain.patientpropaganda.PatientPropaganda; +import com.xinelu.manage.service.patientpropaganda.IPatientPropagandaService; /** * 患者宣教信息Service业务层处理 diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/IPatientVisitInHospitalService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitinhospital/IPatientVisitInHospitalService.java similarity index 93% rename from postdischarge-manage/src/main/java/com/xinelu/manage/service/IPatientVisitInHospitalService.java rename to postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitinhospital/IPatientVisitInHospitalService.java index 265e6bfa..aa9dc3b2 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/IPatientVisitInHospitalService.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitinhospital/IPatientVisitInHospitalService.java @@ -1,8 +1,8 @@ -package com.xinelu.manage.service; +package com.xinelu.manage.service.patientvisitinhospital; import java.util.List; -import com.xinelu.manage.domain.PatientVisitInHospital; +import com.xinelu.manage.domain.patientvisitinhospital.PatientVisitInHospital; /** * 患者就诊入院记录信息Service接口 diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/impl/PatientVisitInHospitalServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitinhospital/impl/PatientVisitInHospitalServiceImpl.java similarity index 91% rename from postdischarge-manage/src/main/java/com/xinelu/manage/service/impl/PatientVisitInHospitalServiceImpl.java rename to postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitinhospital/impl/PatientVisitInHospitalServiceImpl.java index 08c875b1..53d52e62 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/impl/PatientVisitInHospitalServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitinhospital/impl/PatientVisitInHospitalServiceImpl.java @@ -1,12 +1,12 @@ -package com.xinelu.manage.service.impl; +package com.xinelu.manage.service.patientvisitinhospital.impl; import java.util.List; import com.xinelu.common.utils.DateUtils; import javax.annotation.Resource; import org.springframework.stereotype.Service; -import com.xinelu.manage.mapper.PatientVisitInHospitalMapper; -import com.xinelu.manage.domain.PatientVisitInHospital; -import com.xinelu.manage.service.IPatientVisitInHospitalService; +import com.xinelu.manage.mapper.patientvisitinhospital.PatientVisitInHospitalMapper; +import com.xinelu.manage.domain.patientvisitinhospital.PatientVisitInHospital; +import com.xinelu.manage.service.patientvisitinhospital.IPatientVisitInHospitalService; import org.springframework.util.CollectionUtils; /** diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/IPatientVisitOperationService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitoperation/IPatientVisitOperationService.java similarity index 93% rename from postdischarge-manage/src/main/java/com/xinelu/manage/service/IPatientVisitOperationService.java rename to postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitoperation/IPatientVisitOperationService.java index 07f4cfb3..b5b8b540 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/IPatientVisitOperationService.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitoperation/IPatientVisitOperationService.java @@ -1,8 +1,8 @@ -package com.xinelu.manage.service; +package com.xinelu.manage.service.patientvisitoperation; import java.util.List; -import com.xinelu.manage.domain.PatientVisitOperation; +import com.xinelu.manage.domain.patientvisitoperation.PatientVisitOperation; /** * 患者就诊手术记录信息Service接口 diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/impl/PatientVisitOperationServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitoperation/impl/PatientVisitOperationServiceImpl.java similarity index 91% rename from postdischarge-manage/src/main/java/com/xinelu/manage/service/impl/PatientVisitOperationServiceImpl.java rename to postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitoperation/impl/PatientVisitOperationServiceImpl.java index 0442dc7b..02b2c44f 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/impl/PatientVisitOperationServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitoperation/impl/PatientVisitOperationServiceImpl.java @@ -1,12 +1,12 @@ -package com.xinelu.manage.service.impl; +package com.xinelu.manage.service.patientvisitoperation.impl; import java.util.List; import com.xinelu.common.utils.DateUtils; import javax.annotation.Resource; import org.springframework.stereotype.Service; -import com.xinelu.manage.mapper.PatientVisitOperationMapper; -import com.xinelu.manage.domain.PatientVisitOperation; -import com.xinelu.manage.service.IPatientVisitOperationService; +import com.xinelu.manage.mapper.patientvisitoperation.PatientVisitOperationMapper; +import com.xinelu.manage.domain.patientvisitoperation.PatientVisitOperation; +import com.xinelu.manage.service.patientvisitoperation.IPatientVisitOperationService; import org.springframework.util.CollectionUtils; /** diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/IPatientVisitOutHospitalService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitouthospital/IPatientVisitOutHospitalService.java similarity index 92% rename from postdischarge-manage/src/main/java/com/xinelu/manage/service/IPatientVisitOutHospitalService.java rename to postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitouthospital/IPatientVisitOutHospitalService.java index 911885e4..4b201194 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/IPatientVisitOutHospitalService.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitouthospital/IPatientVisitOutHospitalService.java @@ -1,8 +1,8 @@ -package com.xinelu.manage.service; +package com.xinelu.manage.service.patientvisitouthospital; import java.util.List; -import com.xinelu.manage.domain.PatientVisitOutHospital; +import com.xinelu.manage.domain.patientvisitouthospital.PatientVisitOutHospital; /** * 患者就诊出院记录信息Service接口 diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/impl/PatientVisitOutHospitalServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitouthospital/impl/PatientVisitOutHospitalServiceImpl.java similarity index 91% rename from postdischarge-manage/src/main/java/com/xinelu/manage/service/impl/PatientVisitOutHospitalServiceImpl.java rename to postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitouthospital/impl/PatientVisitOutHospitalServiceImpl.java index 41c1491b..d71a742e 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/impl/PatientVisitOutHospitalServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitouthospital/impl/PatientVisitOutHospitalServiceImpl.java @@ -1,12 +1,12 @@ -package com.xinelu.manage.service.impl; +package com.xinelu.manage.service.patientvisitouthospital.impl; import java.util.List; import com.xinelu.common.utils.DateUtils; import javax.annotation.Resource; import org.springframework.stereotype.Service; -import com.xinelu.manage.mapper.PatientVisitOutHospitalMapper; -import com.xinelu.manage.domain.PatientVisitOutHospital; -import com.xinelu.manage.service.IPatientVisitOutHospitalService; +import com.xinelu.manage.mapper.patientvisitouthospital.PatientVisitOutHospitalMapper; +import com.xinelu.manage.domain.patientvisitouthospital.PatientVisitOutHospital; +import com.xinelu.manage.service.patientvisitouthospital.IPatientVisitOutHospitalService; import org.springframework.util.CollectionUtils; /** diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/IPatientVisitRecordService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitrecord/IPatientVisitRecordService.java similarity index 89% rename from postdischarge-manage/src/main/java/com/xinelu/manage/service/IPatientVisitRecordService.java rename to postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitrecord/IPatientVisitRecordService.java index 8e48c5d8..afab462d 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/IPatientVisitRecordService.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitrecord/IPatientVisitRecordService.java @@ -1,9 +1,9 @@ -package com.xinelu.manage.service; +package com.xinelu.manage.service.patientvisitrecord; -import com.xinelu.manage.dto.PatientVisitRecordDto; +import com.xinelu.manage.dto.patientvisitrecord.PatientVisitRecordDto; import java.util.List; -import com.xinelu.manage.domain.PatientVisitRecord; +import com.xinelu.manage.domain.patientvisitrecord.PatientVisitRecord; /** * 患者就诊记录基本信息Service接口 diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/impl/PatientVisitRecordServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitrecord/impl/PatientVisitRecordServiceImpl.java similarity index 87% rename from postdischarge-manage/src/main/java/com/xinelu/manage/service/impl/PatientVisitRecordServiceImpl.java rename to postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitrecord/impl/PatientVisitRecordServiceImpl.java index 28e026d1..d5a59f8e 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/impl/PatientVisitRecordServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitrecord/impl/PatientVisitRecordServiceImpl.java @@ -1,13 +1,13 @@ -package com.xinelu.manage.service.impl; +package com.xinelu.manage.service.patientvisitrecord.impl; -import com.xinelu.manage.dto.PatientVisitRecordDto; +import com.xinelu.manage.dto.patientvisitrecord.PatientVisitRecordDto; import java.util.List; import com.xinelu.common.utils.DateUtils; import javax.annotation.Resource; import org.springframework.stereotype.Service; -import com.xinelu.manage.mapper.PatientVisitRecordMapper; -import com.xinelu.manage.domain.PatientVisitRecord; -import com.xinelu.manage.service.IPatientVisitRecordService; +import com.xinelu.manage.mapper.patientvisitrecord.PatientVisitRecordMapper; +import com.xinelu.manage.domain.patientvisitrecord.PatientVisitRecord; +import com.xinelu.manage.service.patientvisitrecord.IPatientVisitRecordService; /** * 患者就诊记录基本信息Service业务层处理 diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/IPropagandaInfoService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/propagandainfo/IPropagandaInfoService.java similarity index 92% rename from postdischarge-manage/src/main/java/com/xinelu/manage/service/IPropagandaInfoService.java rename to postdischarge-manage/src/main/java/com/xinelu/manage/service/propagandainfo/IPropagandaInfoService.java index 19447db6..d19da141 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/IPropagandaInfoService.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/propagandainfo/IPropagandaInfoService.java @@ -1,8 +1,8 @@ -package com.xinelu.manage.service; +package com.xinelu.manage.service.propagandainfo; import java.util.List; -import com.xinelu.manage.domain.PropagandaInfo; +import com.xinelu.manage.domain.propagandainfo.PropagandaInfo; /** * 宣教库管理Service接口 diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/impl/PropagandaInfoServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/propagandainfo/impl/PropagandaInfoServiceImpl.java similarity index 89% rename from postdischarge-manage/src/main/java/com/xinelu/manage/service/impl/PropagandaInfoServiceImpl.java rename to postdischarge-manage/src/main/java/com/xinelu/manage/service/propagandainfo/impl/PropagandaInfoServiceImpl.java index c6b8d02e..3b2d89ab 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/impl/PropagandaInfoServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/propagandainfo/impl/PropagandaInfoServiceImpl.java @@ -1,12 +1,12 @@ -package com.xinelu.manage.service.impl; +package com.xinelu.manage.service.propagandainfo.impl; import java.util.List; import com.xinelu.common.utils.DateUtils; import javax.annotation.Resource; import org.springframework.stereotype.Service; -import com.xinelu.manage.mapper.PropagandaInfoMapper; -import com.xinelu.manage.domain.PropagandaInfo; -import com.xinelu.manage.service.IPropagandaInfoService; +import com.xinelu.manage.mapper.propagandainfo.PropagandaInfoMapper; +import com.xinelu.manage.domain.propagandainfo.PropagandaInfo; +import com.xinelu.manage.service.propagandainfo.IPropagandaInfoService; /** * 宣教库管理Service业务层处理 diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/IPropagandaMaterialsService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/propagandamaterials/IPropagandaMaterialsService.java similarity index 91% rename from postdischarge-manage/src/main/java/com/xinelu/manage/service/IPropagandaMaterialsService.java rename to postdischarge-manage/src/main/java/com/xinelu/manage/service/propagandamaterials/IPropagandaMaterialsService.java index b22c56e9..8b9f62f7 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/IPropagandaMaterialsService.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/propagandamaterials/IPropagandaMaterialsService.java @@ -1,8 +1,8 @@ -package com.xinelu.manage.service; +package com.xinelu.manage.service.propagandamaterials; import java.util.List; -import com.xinelu.manage.domain.PropagandaMaterials; +import com.xinelu.manage.domain.propagandamaterials.PropagandaMaterials; /** * 宣教素材关系Service接口 diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/impl/PropagandaMaterialsServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/propagandamaterials/impl/PropagandaMaterialsServiceImpl.java similarity index 89% rename from postdischarge-manage/src/main/java/com/xinelu/manage/service/impl/PropagandaMaterialsServiceImpl.java rename to postdischarge-manage/src/main/java/com/xinelu/manage/service/propagandamaterials/impl/PropagandaMaterialsServiceImpl.java index 159417f9..a1c661cf 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/impl/PropagandaMaterialsServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/propagandamaterials/impl/PropagandaMaterialsServiceImpl.java @@ -1,12 +1,12 @@ -package com.xinelu.manage.service.impl; +package com.xinelu.manage.service.propagandamaterials.impl; import java.util.List; import com.xinelu.common.utils.DateUtils; import javax.annotation.Resource; import org.springframework.stereotype.Service; -import com.xinelu.manage.mapper.PropagandaMaterialsMapper; -import com.xinelu.manage.domain.PropagandaMaterials; -import com.xinelu.manage.service.IPropagandaMaterialsService; +import com.xinelu.manage.mapper.propagandamaterials.PropagandaMaterialsMapper; +import com.xinelu.manage.domain.propagandamaterials.PropagandaMaterials; +import com.xinelu.manage.service.propagandamaterials.IPropagandaMaterialsService; /** * 宣教素材关系Service业务层处理 diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/ISignPatientInformedService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientinformed/ISignPatientInformedService.java similarity index 93% rename from postdischarge-manage/src/main/java/com/xinelu/manage/service/ISignPatientInformedService.java rename to postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientinformed/ISignPatientInformedService.java index 0bb29abd..2d0248b2 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/ISignPatientInformedService.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientinformed/ISignPatientInformedService.java @@ -1,8 +1,8 @@ -package com.xinelu.manage.service; +package com.xinelu.manage.service.signpatientinformed; import com.xinelu.common.core.domain.AjaxResult; import com.xinelu.common.exception.file.InvalidExtensionException; -import com.xinelu.manage.domain.SignPatientInformed; +import com.xinelu.manage.domain.signpatientinformed.SignPatientInformed; import java.io.IOException; import java.util.List; import org.springframework.web.multipart.MultipartFile; diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/impl/SignPatientInformedServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientinformed/impl/SignPatientInformedServiceImpl.java similarity index 92% rename from postdischarge-manage/src/main/java/com/xinelu/manage/service/impl/SignPatientInformedServiceImpl.java rename to postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientinformed/impl/SignPatientInformedServiceImpl.java index da0a08dd..43a45406 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/impl/SignPatientInformedServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientinformed/impl/SignPatientInformedServiceImpl.java @@ -1,4 +1,4 @@ -package com.xinelu.manage.service.impl; +package com.xinelu.manage.service.signpatientinformed.impl; import com.xinelu.common.config.SystemBusinessConfig; import com.xinelu.common.core.domain.AjaxResult; @@ -7,9 +7,9 @@ import com.xinelu.common.exception.file.InvalidExtensionException; import com.xinelu.common.utils.DateUtils; import com.xinelu.common.utils.file.FileUploadUtils; import com.xinelu.common.utils.file.MimeTypeUtils; -import com.xinelu.manage.domain.SignPatientInformed; -import com.xinelu.manage.mapper.SignPatientInformedMapper; -import com.xinelu.manage.service.ISignPatientInformedService; +import com.xinelu.manage.domain.signpatientinformed.SignPatientInformed; +import com.xinelu.manage.mapper.signpatientinformed.SignPatientInformedMapper; +import com.xinelu.manage.service.signpatientinformed.ISignPatientInformedService; import java.io.IOException; import java.util.List; import javax.annotation.Resource; diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/ISignPatientPackageService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientpackage/ISignPatientPackageService.java similarity index 92% rename from postdischarge-manage/src/main/java/com/xinelu/manage/service/ISignPatientPackageService.java rename to postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientpackage/ISignPatientPackageService.java index b4b2f6f2..435459d9 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/ISignPatientPackageService.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientpackage/ISignPatientPackageService.java @@ -1,8 +1,8 @@ -package com.xinelu.manage.service; +package com.xinelu.manage.service.signpatientpackage; import java.util.List; -import com.xinelu.manage.domain.SignPatientPackage; +import com.xinelu.manage.domain.signpatientpackage.SignPatientPackage; /** * 签约患者服务包信息Service接口 diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/impl/SignPatientPackageServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientpackage/impl/SignPatientPackageServiceImpl.java similarity index 89% rename from postdischarge-manage/src/main/java/com/xinelu/manage/service/impl/SignPatientPackageServiceImpl.java rename to postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientpackage/impl/SignPatientPackageServiceImpl.java index b39217c2..182a8a75 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/impl/SignPatientPackageServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientpackage/impl/SignPatientPackageServiceImpl.java @@ -1,12 +1,12 @@ -package com.xinelu.manage.service.impl; +package com.xinelu.manage.service.signpatientpackage.impl; import java.util.List; import com.xinelu.common.utils.DateUtils; import javax.annotation.Resource; import org.springframework.stereotype.Service; -import com.xinelu.manage.mapper.SignPatientPackageMapper; -import com.xinelu.manage.domain.SignPatientPackage; -import com.xinelu.manage.service.ISignPatientPackageService; +import com.xinelu.manage.mapper.signpatientpackage.SignPatientPackageMapper; +import com.xinelu.manage.domain.signpatientpackage.SignPatientPackage; +import com.xinelu.manage.service.signpatientpackage.ISignPatientPackageService; /** * 签约患者服务包信息Service业务层处理 diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/ISignPatientPackageHardwareService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientpackagehardware/ISignPatientPackageHardwareService.java similarity index 92% rename from postdischarge-manage/src/main/java/com/xinelu/manage/service/ISignPatientPackageHardwareService.java rename to postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientpackagehardware/ISignPatientPackageHardwareService.java index 444a2d0c..e5b3f090 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/ISignPatientPackageHardwareService.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientpackagehardware/ISignPatientPackageHardwareService.java @@ -1,8 +1,8 @@ -package com.xinelu.manage.service; +package com.xinelu.manage.service.signpatientpackagehardware; import java.util.List; -import com.xinelu.manage.domain.SignPatientPackageHardware; +import com.xinelu.manage.domain.signpatientpackagehardware.SignPatientPackageHardware; /** * 签约患者服务包硬件信息Service接口 diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/impl/SignPatientPackageHardwareServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientpackagehardware/impl/SignPatientPackageHardwareServiceImpl.java similarity index 89% rename from postdischarge-manage/src/main/java/com/xinelu/manage/service/impl/SignPatientPackageHardwareServiceImpl.java rename to postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientpackagehardware/impl/SignPatientPackageHardwareServiceImpl.java index 39532e85..2619c534 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/impl/SignPatientPackageHardwareServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientpackagehardware/impl/SignPatientPackageHardwareServiceImpl.java @@ -1,12 +1,12 @@ -package com.xinelu.manage.service.impl; +package com.xinelu.manage.service.signpatientpackagehardware.impl; import java.util.List; import com.xinelu.common.utils.DateUtils; import javax.annotation.Resource; import org.springframework.stereotype.Service; -import com.xinelu.manage.mapper.SignPatientPackageHardwareMapper; -import com.xinelu.manage.domain.SignPatientPackageHardware; -import com.xinelu.manage.service.ISignPatientPackageHardwareService; +import com.xinelu.manage.mapper.signpatientpackagehardware.SignPatientPackageHardwareMapper; +import com.xinelu.manage.domain.signpatientpackagehardware.SignPatientPackageHardware; +import com.xinelu.manage.service.signpatientpackagehardware.ISignPatientPackageHardwareService; /** * 签约患者服务包硬件信息Service业务层处理 diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientrecord/ISignPatientRecordService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientrecord/ISignPatientRecordService.java new file mode 100644 index 00000000..e03e6792 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientrecord/ISignPatientRecordService.java @@ -0,0 +1,37 @@ +package com.xinelu.manage.service.signpatientrecord; + +import com.xinelu.manage.dto.signpatientrecord.SignPatientStatusDto; +import com.xinelu.manage.dto.signpatientrecord.SignPatientAddDto; +import com.xinelu.manage.dto.signpatientrecord.SignPatientListDto; +import com.xinelu.manage.vo.signpatientrecord.SignPatientInfoVo; +import com.xinelu.manage.vo.signpatientrecord.SignPatientRecordVo; +import com.xinelu.manage.vo.signpatientrecord.SignPatientListVo; +import java.util.List; + +/** +* @author haown +* @description 针对表【sign_patient_record(签约记录表)】的数据库操作Service +* @createDate 2024-02-28 15:05:02 +*/ +public interface ISignPatientRecordService { + + List selectList(SignPatientListDto signPatientRecord); + + /** + * 根据签约编号查询居民签约信息 + * @param patientSignRecordId + * @return + */ + SignPatientInfoVo getByRecordId(Long patientSignRecordId); + + /** + * 根据患者主键查询患者签约记录列表 + * @param patientId + * @return + */ + List getByPatient(Long patientId); + + int add(SignPatientAddDto body); + + int updateSignStatus(SignPatientStatusDto patientCancelSignDto); +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/impl/SignPatientRecordServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientrecord/impl/SignPatientRecordServiceImpl.java similarity index 71% rename from postdischarge-manage/src/main/java/com/xinelu/manage/service/impl/SignPatientRecordServiceImpl.java rename to postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientrecord/impl/SignPatientRecordServiceImpl.java index 8eed282d..cd562ac0 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/impl/SignPatientRecordServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientrecord/impl/SignPatientRecordServiceImpl.java @@ -1,24 +1,24 @@ -package com.xinelu.manage.service.impl; +package com.xinelu.manage.service.signpatientrecord.impl; import com.xinelu.common.constant.PaymentStatusConstants; import com.xinelu.common.constant.SignRecordServiceStatusConstants; import com.xinelu.common.exception.ServiceException; import com.xinelu.common.utils.DateUtils; -import com.xinelu.manage.domain.SignPatientInformed; -import com.xinelu.manage.domain.SignPatientPackage; -import com.xinelu.manage.domain.SignPatientPackageHardware; -import com.xinelu.manage.domain.SignPatientRecord; -import com.xinelu.manage.dto.PatientSignStatusDto; -import com.xinelu.manage.dto.PatientSignAddDto; -import com.xinelu.manage.dto.SignPatientListDto; -import com.xinelu.manage.mapper.SignPatientInformedMapper; -import com.xinelu.manage.mapper.SignPatientPackageHardwareMapper; -import com.xinelu.manage.mapper.SignPatientPackageMapper; -import com.xinelu.manage.mapper.SignPatientRecordMapper; -import com.xinelu.manage.service.ISignPatientRecordService; -import com.xinelu.manage.vo.PatientSignInfoVo; -import com.xinelu.manage.vo.PatientSignRecordVo; -import com.xinelu.manage.vo.SignPatientListVo; +import com.xinelu.manage.domain.signpatientinformed.SignPatientInformed; +import com.xinelu.manage.domain.signpatientpackage.SignPatientPackage; +import com.xinelu.manage.domain.signpatientpackagehardware.SignPatientPackageHardware; +import com.xinelu.manage.domain.signpatientrecord.SignPatientRecord; +import com.xinelu.manage.dto.signpatientrecord.SignPatientStatusDto; +import com.xinelu.manage.dto.signpatientrecord.SignPatientAddDto; +import com.xinelu.manage.dto.signpatientrecord.SignPatientListDto; +import com.xinelu.manage.mapper.signpatientinformed.SignPatientInformedMapper; +import com.xinelu.manage.mapper.signpatientpackagehardware.SignPatientPackageHardwareMapper; +import com.xinelu.manage.mapper.signpatientpackage.SignPatientPackageMapper; +import com.xinelu.manage.mapper.signpatientrecord.SignPatientRecordMapper; +import com.xinelu.manage.service.signpatientrecord.ISignPatientRecordService; +import com.xinelu.manage.vo.signpatientrecord.SignPatientInfoVo; +import com.xinelu.manage.vo.signpatientrecord.SignPatientRecordVo; +import com.xinelu.manage.vo.signpatientrecord.SignPatientListVo; import java.util.List; import javax.annotation.Resource; import org.apache.commons.lang3.ObjectUtils; @@ -47,15 +47,15 @@ public class SignPatientRecordServiceImpl implements ISignPatientRecordService { return signPatientRecordMapper.selectList(signPatientRecord); } - @Override public PatientSignInfoVo getByRecordId(Long patientSignRecordId) { + @Override public SignPatientInfoVo getByRecordId(Long patientSignRecordId) { return signPatientRecordMapper.getByRecordId(patientSignRecordId); } - @Override public List getByPatient(Long patientId) { + @Override public List getByPatient(Long patientId) { return signPatientRecordMapper.getByPatient(patientId); } - @Override public int add(PatientSignAddDto body) { + @Override public int add(SignPatientAddDto body) { SignPatientPackage signPatientPackage = body.getSignPackage(); if (ObjectUtils.isNotEmpty(body.getRecord())) { SignPatientRecord signPatientRecord = body.getRecord(); @@ -104,7 +104,7 @@ public class SignPatientRecordServiceImpl implements ISignPatientRecordService { return 0; } - @Override public int updateSignStatus(PatientSignStatusDto patientCancelSignDto) { + @Override public int updateSignStatus(SignPatientStatusDto patientCancelSignDto) { // 修改签约记录状态 SignPatientRecord signRecord = new SignPatientRecord(); signRecord.setId(patientCancelSignDto.getId()); diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/PatientBlacklistVo.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/patientblacklist/PatientBlacklistVo.java similarity index 97% rename from postdischarge-manage/src/main/java/com/xinelu/manage/vo/PatientBlacklistVo.java rename to postdischarge-manage/src/main/java/com/xinelu/manage/vo/patientblacklist/PatientBlacklistVo.java index dea38c56..231866b4 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/PatientBlacklistVo.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/patientblacklist/PatientBlacklistVo.java @@ -1,4 +1,4 @@ -package com.xinelu.manage.vo; +package com.xinelu.manage.vo.patientblacklist; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/PatientSignInfoVo.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/signpatientrecord/SignPatientInfoVo.java similarity index 96% rename from postdischarge-manage/src/main/java/com/xinelu/manage/vo/PatientSignInfoVo.java rename to postdischarge-manage/src/main/java/com/xinelu/manage/vo/signpatientrecord/SignPatientInfoVo.java index 9744c0a2..afb7cc4c 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/PatientSignInfoVo.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/signpatientrecord/SignPatientInfoVo.java @@ -1,8 +1,8 @@ -package com.xinelu.manage.vo; +package com.xinelu.manage.vo.signpatientrecord; import com.fasterxml.jackson.annotation.JsonFormat; import com.xinelu.common.annotation.Excel; -import com.xinelu.manage.domain.SignPatientPackageHardware; +import com.xinelu.manage.domain.signpatientpackagehardware.SignPatientPackageHardware; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; @@ -17,7 +17,7 @@ import lombok.Data; **/ @ApiModel("患者签约信息查询返回视图类") @Data -public class PatientSignInfoVo { +public class SignPatientInfoVo { /** * 主键id */ diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/SignPatientListVo.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/signpatientrecord/SignPatientListVo.java similarity index 98% rename from postdischarge-manage/src/main/java/com/xinelu/manage/vo/SignPatientListVo.java rename to postdischarge-manage/src/main/java/com/xinelu/manage/vo/signpatientrecord/SignPatientListVo.java index d5aa314e..aa1e32b6 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/SignPatientListVo.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/signpatientrecord/SignPatientListVo.java @@ -1,4 +1,4 @@ -package com.xinelu.manage.vo; +package com.xinelu.manage.vo.signpatientrecord; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/PatientSignRecordVo.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/signpatientrecord/SignPatientRecordVo.java similarity index 93% rename from postdischarge-manage/src/main/java/com/xinelu/manage/vo/PatientSignRecordVo.java rename to postdischarge-manage/src/main/java/com/xinelu/manage/vo/signpatientrecord/SignPatientRecordVo.java index 985af9e2..a2369e95 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/PatientSignRecordVo.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/signpatientrecord/SignPatientRecordVo.java @@ -1,4 +1,4 @@ -package com.xinelu.manage.vo; +package com.xinelu.manage.vo.signpatientrecord; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; @@ -13,7 +13,7 @@ import lombok.Data; **/ @ApiModel("查询患者签约记录返回视图类") @Data -public class PatientSignRecordVo { +public class SignPatientRecordVo { /** * 主键id diff --git a/postdischarge-manage/src/main/resources/mapper/manage/materialsinfo/MaterialsInfoMapper.java b/postdischarge-manage/src/main/resources/mapper/manage/materialsinfo/MaterialsInfoMapper.java new file mode 100644 index 00000000..7ea98fee --- /dev/null +++ b/postdischarge-manage/src/main/resources/mapper/manage/materialsinfo/MaterialsInfoMapper.java @@ -0,0 +1,61 @@ +package com.xinelu.manage.mapper.materialsinfo; + +import java.util.List; + +import com.xinelu.manage.domain.materialsinfo.MaterialsInfo; + +/** + * 素材信息Mapper接口 + * + * @author haown + * @date 2024-02-26 + */ +public interface MaterialsInfoMapper { + /** + * 查询素材信息 + * + * @param id 素材信息主键 + * @return 素材信息 + */ + public MaterialsInfo selectMaterialsInfoById(Long id); + + /** + * 查询素材信息列表 + * + * @param materialsInfo 素材信息 + * @return 素材信息集合 + */ + public List selectMaterialsInfoList(MaterialsInfo materialsInfo); + + /** + * 新增素材信息 + * + * @param materialsInfo 素材信息 + * @return 结果 + */ + public int insertMaterialsInfo(MaterialsInfo materialsInfo); + + /** + * 修改素材信息 + * + * @param materialsInfo 素材信息 + * @return 结果 + */ + public int updateMaterialsInfo(MaterialsInfo materialsInfo); + + /** + * 删除素材信息 + * + * @param id 素材信息主键 + * @return 结果 + */ + public int deleteMaterialsInfoById(Long id); + + /** + * 批量删除素材信息 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteMaterialsInfoByIds(Long[] ids); +} diff --git a/postdischarge-manage/src/main/resources/mapper/manage/MaterialsInfoMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/materialsinfo/MaterialsInfoMapper.xml similarity index 99% rename from postdischarge-manage/src/main/resources/mapper/manage/MaterialsInfoMapper.xml rename to postdischarge-manage/src/main/resources/mapper/manage/materialsinfo/MaterialsInfoMapper.xml index 48000732..f3e8413f 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/MaterialsInfoMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/materialsinfo/MaterialsInfoMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/postdischarge-manage/src/main/resources/mapper/manage/PatientBlacklistMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/patientblacklist/PatientBlacklistMapper.xml similarity index 97% rename from postdischarge-manage/src/main/resources/mapper/manage/PatientBlacklistMapper.xml rename to postdischarge-manage/src/main/resources/mapper/manage/patientblacklist/PatientBlacklistMapper.xml index 7e22025c..13dbd887 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/PatientBlacklistMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/patientblacklist/PatientBlacklistMapper.xml @@ -2,7 +2,7 @@ - + @@ -25,7 +25,7 @@ function_limitation, blacklist_source, del_flag, create_by, create_time, update_by, update_time from patient_blacklist - select b.id, b.patient_id, b.abnormal_cause_id, b.abnormal_cause_value, b.supplement_illustrate_id, b.supplement_illustrate_value, b.function_limitation, b.blacklist_source, b.create_time, p.patient_name, diff --git a/postdischarge-manage/src/main/resources/mapper/manage/PatientInfoMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/patientinfo/PatientInfoMapper.xml similarity index 97% rename from postdischarge-manage/src/main/resources/mapper/manage/PatientInfoMapper.xml rename to postdischarge-manage/src/main/resources/mapper/manage/patientinfo/PatientInfoMapper.xml index fa1cea58..ff0babc9 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/PatientInfoMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/patientinfo/PatientInfoMapper.xml @@ -2,8 +2,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - + + @@ -72,7 +72,7 @@ from patient_info - del_flag = 0 @@ -161,7 +161,7 @@ where id = #{id} - + insert into patient_info @@ -352,7 +352,7 @@ - + update patient_info diff --git a/postdischarge-manage/src/main/resources/mapper/manage/PatientPropagandaMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/patientpropaganda/PatientPropagandaMapper.xml similarity index 99% rename from postdischarge-manage/src/main/resources/mapper/manage/PatientPropagandaMapper.xml rename to postdischarge-manage/src/main/resources/mapper/manage/patientpropaganda/PatientPropagandaMapper.xml index 4f819450..969b9db5 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/PatientPropagandaMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/patientpropaganda/PatientPropagandaMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/postdischarge-manage/src/main/resources/mapper/manage/PatientVisitInHospitalMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/patientvisitinhospital/PatientVisitInHospitalMapper.xml similarity index 99% rename from postdischarge-manage/src/main/resources/mapper/manage/PatientVisitInHospitalMapper.xml rename to postdischarge-manage/src/main/resources/mapper/manage/patientvisitinhospital/PatientVisitInHospitalMapper.xml index 123f8a8d..3703db0c 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/PatientVisitInHospitalMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/patientvisitinhospital/PatientVisitInHospitalMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/postdischarge-manage/src/main/resources/mapper/manage/PatientVisitOperationMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/patientvisitoperation/PatientVisitOperationMapper.xml similarity index 98% rename from postdischarge-manage/src/main/resources/mapper/manage/PatientVisitOperationMapper.xml rename to postdischarge-manage/src/main/resources/mapper/manage/patientvisitoperation/PatientVisitOperationMapper.xml index 333e2e82..2ab818ab 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/PatientVisitOperationMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/patientvisitoperation/PatientVisitOperationMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/postdischarge-manage/src/main/resources/mapper/manage/PatientVisitOutHospitalMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/patientvisitouthospital/PatientVisitOutHospitalMapper.xml similarity index 98% rename from postdischarge-manage/src/main/resources/mapper/manage/PatientVisitOutHospitalMapper.xml rename to postdischarge-manage/src/main/resources/mapper/manage/patientvisitouthospital/PatientVisitOutHospitalMapper.xml index 1085f7b4..d21baef4 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/PatientVisitOutHospitalMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/patientvisitouthospital/PatientVisitOutHospitalMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/postdischarge-manage/src/main/resources/mapper/manage/PatientVisitRecordMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/patientvisitrecord/PatientVisitRecordMapper.xml similarity index 98% rename from postdischarge-manage/src/main/resources/mapper/manage/PatientVisitRecordMapper.xml rename to postdischarge-manage/src/main/resources/mapper/manage/patientvisitrecord/PatientVisitRecordMapper.xml index 2ecb1655..4961417a 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/PatientVisitRecordMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/patientvisitrecord/PatientVisitRecordMapper.xml @@ -2,7 +2,7 @@ - + @@ -33,7 +33,7 @@ select id, patient_id, visit_dept, visit_name, visit_date, visit_type, patient_name, birthplace, sex, age, nation, marriage, medical_history_narrator, admission_time, discharge_time, record_time, outpatient_visit_info, hospitalization_days, create_by, create_time, update_by, update_time from patient_visit_record - diff --git a/postdischarge-manage/src/main/resources/mapper/manage/PropagandaInfoMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/propagandainfo/PropagandaInfoMapper.xml similarity index 99% rename from postdischarge-manage/src/main/resources/mapper/manage/PropagandaInfoMapper.xml rename to postdischarge-manage/src/main/resources/mapper/manage/propagandainfo/PropagandaInfoMapper.xml index 7b223d4a..af450261 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/PropagandaInfoMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/propagandainfo/PropagandaInfoMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/postdischarge-manage/src/main/resources/mapper/manage/PropagandaMaterialsMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/propagandamaterials/PropagandaMaterialsMapper.xml similarity index 98% rename from postdischarge-manage/src/main/resources/mapper/manage/PropagandaMaterialsMapper.xml rename to postdischarge-manage/src/main/resources/mapper/manage/propagandamaterials/PropagandaMaterialsMapper.xml index 9fd606e4..1b8a1b54 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/PropagandaMaterialsMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/propagandamaterials/PropagandaMaterialsMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/postdischarge-manage/src/main/resources/mapper/manage/SignPatientInformedMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/signpatientinformed/SignPatientInformedMapper.xml similarity index 98% rename from postdischarge-manage/src/main/resources/mapper/manage/SignPatientInformedMapper.xml rename to postdischarge-manage/src/main/resources/mapper/manage/signpatientinformed/SignPatientInformedMapper.xml index 882c9b52..37c648e5 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/SignPatientInformedMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/signpatientinformed/SignPatientInformedMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/postdischarge-manage/src/main/resources/mapper/manage/SignPatientPackageMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/signpatientpackage/SignPatientPackageMapper.xml similarity index 98% rename from postdischarge-manage/src/main/resources/mapper/manage/SignPatientPackageMapper.xml rename to postdischarge-manage/src/main/resources/mapper/manage/signpatientpackage/SignPatientPackageMapper.xml index e6ea3ef5..8e8b56f8 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/SignPatientPackageMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/signpatientpackage/SignPatientPackageMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/postdischarge-manage/src/main/resources/mapper/manage/SignPatientPackageHardwareMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/signpatientpackagehardware/SignPatientPackageHardwareMapper.xml similarity index 98% rename from postdischarge-manage/src/main/resources/mapper/manage/SignPatientPackageHardwareMapper.xml rename to postdischarge-manage/src/main/resources/mapper/manage/signpatientpackagehardware/SignPatientPackageHardwareMapper.xml index 6305b938..43821f61 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/SignPatientPackageHardwareMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/signpatientpackagehardware/SignPatientPackageHardwareMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/postdischarge-manage/src/main/resources/mapper/manage/SignPatientRecordMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/signpatientrecord/SignPatientRecordMapper.xml similarity index 96% rename from postdischarge-manage/src/main/resources/mapper/manage/SignPatientRecordMapper.xml rename to postdischarge-manage/src/main/resources/mapper/manage/signpatientrecord/SignPatientRecordMapper.xml index 2bf4036c..5388a215 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/SignPatientRecordMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/signpatientrecord/SignPatientRecordMapper.xml @@ -2,9 +2,9 @@ - + - + @@ -38,7 +38,7 @@ - + @@ -62,7 +62,7 @@ - + @@ -98,7 +98,7 @@ delete from sign_patient_record where id = #{id,jdbcType=BIGINT} - + insert into sign_patient_record ( id,patient_id,patient_name ,patient_phone,card_no,sign_time @@ -123,7 +123,7 @@ ,#{createBy,jdbcType=VARCHAR},#{createTime,jdbcType=TIMESTAMP},#{updateBy,jdbcType=VARCHAR} ,#{updateTime,jdbcType=TIMESTAMP}) - + insert into sign_patient_record id, @@ -192,7 +192,7 @@ #{updateTime,jdbcType=TIMESTAMP}, - + update sign_patient_record @@ -288,7 +288,7 @@ where id = #{id,jdbcType=BIGINT} - + update sign_patient_record set patient_id = #{patientId,jdbcType=BIGINT}, @@ -323,7 +323,7 @@ update_time = #{updateTime,jdbcType=TIMESTAMP} where id = #{id,jdbcType=BIGINT} - select sign.id,sign.patient_id,sign.patient_name, sign.patient_phone,sign.card_no, sign.sign_time, @@ -384,7 +384,7 @@ - select sign.id,sign.patient_id,sign.patient_name, sign.patient_phone,sign.card_no, sign.sign_time, @@ -405,7 +405,7 @@ - select sign.id,sign.patient_id,sign.patient_name, sign.service_status, p.package_name