修改文件路径

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.domain.materialsinfo.MaterialsInfo;
-import com.xinelu.manage.service.IMaterialsInfoService;
+import com.xinelu.manage.service.materialsinfo.IMaterialsInfoService;
 import io.swagger.annotations.Api;
 import java.util.List;
 import javax.annotation.Resource;

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.domain.patientblacklist.PatientBlacklist;
-import com.xinelu.manage.dto.PatientBlacklistDto;
+import com.xinelu.manage.dto.patientblacklist.PatientBlacklistDto;
-import com.xinelu.manage.service.IPatientBlacklistService;
+import com.xinelu.manage.service.patientblacklist.IPatientBlacklistService;
-import com.xinelu.manage.vo.PatientBlacklistVo;
+import com.xinelu.manage.vo.patientblacklist.PatientBlacklistVo;
 import java.util.List;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;

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.domain.patientinfo.PatientInfo;
-import com.xinelu.manage.dto.PatientInfoDto;
+import com.xinelu.manage.dto.patientinfo.PatientInfoDto;
-import com.xinelu.manage.service.IPatientInfoService;
+import com.xinelu.manage.service.patientinfo.IPatientInfoService;
 import io.swagger.annotations.Api;
 import java.util.List;
 import javax.annotation.Resource;

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.domain.patientpropaganda.PatientPropaganda;
-import com.xinelu.manage.service.IPatientPropagandaService;
+import com.xinelu.manage.service.patientpropaganda.IPatientPropagandaService;
 import com.xinelu.common.utils.poi.ExcelUtil;
 import com.xinelu.common.core.page.TableDataInfo;
 

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.domain.patientvisitinhospital.PatientVisitInHospital;
-import com.xinelu.manage.service.IPatientVisitInHospitalService;
+import com.xinelu.manage.service.patientvisitinhospital.IPatientVisitInHospitalService;
 import com.xinelu.common.utils.poi.ExcelUtil;
 import com.xinelu.common.core.page.TableDataInfo;
 

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.domain.patientvisitoperation.PatientVisitOperation;
-import com.xinelu.manage.service.IPatientVisitOperationService;
+import com.xinelu.manage.service.patientvisitoperation.IPatientVisitOperationService;
 import com.xinelu.common.utils.poi.ExcelUtil;
 import com.xinelu.common.core.page.TableDataInfo;
 

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.domain.patientvisitouthospital.PatientVisitOutHospital;
-import com.xinelu.manage.service.IPatientVisitOutHospitalService;
+import com.xinelu.manage.service.patientvisitouthospital.IPatientVisitOutHospitalService;
 import com.xinelu.common.utils.poi.ExcelUtil;
 import com.xinelu.common.core.page.TableDataInfo;
 

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.domain.patientvisitrecord.PatientVisitRecord;
-import com.xinelu.manage.dto.PatientVisitRecordDto;
+import com.xinelu.manage.dto.patientvisitrecord.PatientVisitRecordDto;
-import com.xinelu.manage.service.IPatientVisitRecordService;
+import com.xinelu.manage.service.patientvisitrecord.IPatientVisitRecordService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import java.util.List;

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.domain.propagandainfo.PropagandaInfo;
-import com.xinelu.manage.service.IPropagandaInfoService;
+import com.xinelu.manage.service.propagandainfo.IPropagandaInfoService;
 import com.xinelu.common.utils.poi.ExcelUtil;
 import com.xinelu.common.core.page.TableDataInfo;
 

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.domain.propagandamaterials.PropagandaMaterials;
-import com.xinelu.manage.service.IPropagandaMaterialsService;
+import com.xinelu.manage.service.propagandamaterials.IPropagandaMaterialsService;
 import com.xinelu.common.utils.poi.ExcelUtil;
 import com.xinelu.common.core.page.TableDataInfo;
 

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.domain.signpatientinformed.SignPatientInformed;
-import com.xinelu.manage.service.ISignPatientInformedService;
+import com.xinelu.manage.service.signpatientinformed.ISignPatientInformedService;
 import java.util.List;
 import java.util.Objects;
 import javax.annotation.Resource;

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.domain.signpatientpackage.SignPatientPackage;
-import com.xinelu.manage.service.ISignPatientPackageService;
+import com.xinelu.manage.service.signpatientpackage.ISignPatientPackageService;
 import com.xinelu.common.utils.poi.ExcelUtil;
 import com.xinelu.common.core.page.TableDataInfo;
 

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.domain.signpatientpackagehardware.SignPatientPackageHardware;
-import com.xinelu.manage.service.ISignPatientPackageHardwareService;
+import com.xinelu.manage.service.signpatientpackagehardware.ISignPatientPackageHardwareService;
 import com.xinelu.common.utils.poi.ExcelUtil;
 import com.xinelu.common.core.page.TableDataInfo;
 

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.signpatientrecord.SignPatientStatusDto;
-import com.xinelu.manage.dto.PatientSignAddDto;
+import com.xinelu.manage.dto.signpatientrecord.SignPatientAddDto;
-import com.xinelu.manage.dto.SignPatientListDto;
+import com.xinelu.manage.dto.signpatientrecord.SignPatientListDto;
-import com.xinelu.manage.service.ISignPatientRecordService;
+import com.xinelu.manage.service.signpatientrecord.ISignPatientRecordService;
-import com.xinelu.manage.vo.PatientSignInfoVo;
+import com.xinelu.manage.vo.signpatientrecord.SignPatientInfoVo;
-import com.xinelu.manage.vo.PatientSignRecordVo;
+import com.xinelu.manage.vo.signpatientrecord.SignPatientRecordVo;
-import com.xinelu.manage.vo.SignPatientListVo;
+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<PatientSignRecordVo> list = signPatientRecordService.getByPatient(patientId);
+		List<SignPatientRecordVo> 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();
 	}

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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.signpatientinformed.SignPatientInformed;
-import com.xinelu.manage.domain.SignPatientPackage;
+import com.xinelu.manage.domain.signpatientpackage.SignPatientPackage;
-import com.xinelu.manage.domain.SignPatientPackageHardware;
+import com.xinelu.manage.domain.signpatientpackagehardware.SignPatientPackageHardware;
-import com.xinelu.manage.domain.SignPatientRecord;
+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;
 

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;

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;
 

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接口

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.domain.patientblacklist.PatientBlacklist;
-import com.xinelu.manage.dto.PatientBlacklistDto;
+import com.xinelu.manage.dto.patientblacklist.PatientBlacklistDto;
-import com.xinelu.manage.vo.PatientBlacklistVo;
+import com.xinelu.manage.vo.patientblacklist.PatientBlacklistVo;
 import java.util.List;
 
 /**

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.domain.patientinfo.PatientInfo;
-import com.xinelu.manage.dto.PatientInfoDto;
+import com.xinelu.manage.dto.patientinfo.PatientInfoDto;
 import java.util.List;
 
 /**

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接口

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接口

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接口

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接口

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接口

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接口

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接口

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接口

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接口

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接口

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.domain.signpatientrecord.SignPatientRecord;
-import com.xinelu.manage.dto.SignPatientListDto;
+import com.xinelu.manage.dto.signpatientrecord.SignPatientListDto;
-import com.xinelu.manage.vo.PatientSignInfoVo;
+import com.xinelu.manage.vo.signpatientrecord.SignPatientInfoVo;
-import com.xinelu.manage.vo.PatientSignRecordVo;
+import com.xinelu.manage.vo.signpatientrecord.SignPatientRecordVo;
-import com.xinelu.manage.vo.SignPatientListVo;
+import com.xinelu.manage.vo.signpatientrecord.SignPatientListVo;
 import java.util.List;
 
 /**
@@ -29,8 +29,8 @@ public interface SignPatientRecordMapper {
 
 	List<SignPatientListVo> selectList(SignPatientListDto signPatientRecord);
 
-	PatientSignInfoVo getByRecordId(Long patientSignRecordId);
+	SignPatientInfoVo getByRecordId(Long patientSignRecordId);
 
-	List<PatientSignRecordVo> getByPatient(Long patientId);
+	List<SignPatientRecordVo> getByPatient(Long patientId);
 
 }

postdischarge-manage/src/main/java/com/xinelu/manage/service/ISignPatientRecordService.java

@@ -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<SignPatientListVo> selectList(SignPatientListDto signPatientRecord);
-
-	/**
-	 * 根据签约编号查询居民签约信息
-	 * @param patientSignRecordId
-	 * @return
-	 */
-	PatientSignInfoVo getByRecordId(Long patientSignRecordId);
-
-	/**
-	 * 根据患者主键查询患者签约记录列表
-	 * @param patientId
-	 * @return
-	 */
-	List<PatientSignRecordVo> getByPatient(Long patientId);
-
-	int add(PatientSignAddDto body);
-
-	int updateSignStatus(PatientSignStatusDto patientCancelSignDto);
-}

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接口

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.mapper.materialsinfo.MaterialsInfoMapper;
-import com.xinelu.manage.domain.MaterialsInfo;
+import com.xinelu.manage.domain.materialsinfo.MaterialsInfo;
-import com.xinelu.manage.service.IMaterialsInfoService;
+import com.xinelu.manage.service.materialsinfo.IMaterialsInfoService;
 
 /**
  * 素材信息Service业务层处理

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.domain.patientblacklist.PatientBlacklist;
-import com.xinelu.manage.dto.PatientBlacklistDto;
+import com.xinelu.manage.dto.patientblacklist.PatientBlacklistDto;
-import com.xinelu.manage.vo.PatientBlacklistVo;
+import com.xinelu.manage.vo.patientblacklist.PatientBlacklistVo;
 import java.util.List;
 
 /**

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.domain.patientblacklist.PatientBlacklist;
-import com.xinelu.manage.dto.PatientBlacklistDto;
+import com.xinelu.manage.dto.patientblacklist.PatientBlacklistDto;
-import com.xinelu.manage.mapper.PatientBlacklistMapper;
+import com.xinelu.manage.mapper.patientblacklist.PatientBlacklistMapper;
-import com.xinelu.manage.service.IPatientBlacklistService;
+import com.xinelu.manage.service.patientblacklist.IPatientBlacklistService;
-import com.xinelu.manage.vo.PatientBlacklistVo;
+import com.xinelu.manage.vo.patientblacklist.PatientBlacklistVo;
 import java.util.Date;
 import java.util.List;
 import javax.annotation.Resource;

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.domain.patientinfo.PatientInfo;
-import com.xinelu.manage.dto.PatientInfoDto;
+import com.xinelu.manage.dto.patientinfo.PatientInfoDto;
 import java.util.List;
 
 /**

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.domain.patientinfo.PatientInfo;
-import com.xinelu.manage.dto.PatientInfoDto;
+import com.xinelu.manage.dto.patientinfo.PatientInfoDto;
-import com.xinelu.manage.mapper.PatientInfoMapper;
+import com.xinelu.manage.mapper.patientinfo.PatientInfoMapper;
-import com.xinelu.manage.service.IPatientInfoService;
+import com.xinelu.manage.service.patientinfo.IPatientInfoService;
 import java.util.List;
 import javax.annotation.Resource;
 import org.springframework.stereotype.Service;

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接口

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.mapper.patientpropaganda.PatientPropagandaMapper;
-import com.xinelu.manage.domain.PatientPropaganda;
+import com.xinelu.manage.domain.patientpropaganda.PatientPropaganda;
-import com.xinelu.manage.service.IPatientPropagandaService;
+import com.xinelu.manage.service.patientpropaganda.IPatientPropagandaService;
 
 /**
  * 患者宣教信息Service业务层处理

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接口

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.mapper.patientvisitinhospital.PatientVisitInHospitalMapper;
-import com.xinelu.manage.domain.PatientVisitInHospital;
+import com.xinelu.manage.domain.patientvisitinhospital.PatientVisitInHospital;
-import com.xinelu.manage.service.IPatientVisitInHospitalService;
+import com.xinelu.manage.service.patientvisitinhospital.IPatientVisitInHospitalService;
 import org.springframework.util.CollectionUtils;
 
 /**

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接口

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.mapper.patientvisitoperation.PatientVisitOperationMapper;
-import com.xinelu.manage.domain.PatientVisitOperation;
+import com.xinelu.manage.domain.patientvisitoperation.PatientVisitOperation;
-import com.xinelu.manage.service.IPatientVisitOperationService;
+import com.xinelu.manage.service.patientvisitoperation.IPatientVisitOperationService;
 import org.springframework.util.CollectionUtils;
 
 /**

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接口

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.mapper.patientvisitouthospital.PatientVisitOutHospitalMapper;
-import com.xinelu.manage.domain.PatientVisitOutHospital;
+import com.xinelu.manage.domain.patientvisitouthospital.PatientVisitOutHospital;
-import com.xinelu.manage.service.IPatientVisitOutHospitalService;
+import com.xinelu.manage.service.patientvisitouthospital.IPatientVisitOutHospitalService;
 import org.springframework.util.CollectionUtils;
 
 /**

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接口

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.mapper.patientvisitrecord.PatientVisitRecordMapper;
-import com.xinelu.manage.domain.PatientVisitRecord;
+import com.xinelu.manage.domain.patientvisitrecord.PatientVisitRecord;
-import com.xinelu.manage.service.IPatientVisitRecordService;
+import com.xinelu.manage.service.patientvisitrecord.IPatientVisitRecordService;
 
 /**
  * 患者就诊记录基本信息Service业务层处理

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接口

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.mapper.propagandainfo.PropagandaInfoMapper;
-import com.xinelu.manage.domain.PropagandaInfo;
+import com.xinelu.manage.domain.propagandainfo.PropagandaInfo;
-import com.xinelu.manage.service.IPropagandaInfoService;
+import com.xinelu.manage.service.propagandainfo.IPropagandaInfoService;
 
 /**
  * 宣教库管理Service业务层处理

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接口

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.mapper.propagandamaterials.PropagandaMaterialsMapper;
-import com.xinelu.manage.domain.PropagandaMaterials;
+import com.xinelu.manage.domain.propagandamaterials.PropagandaMaterials;
-import com.xinelu.manage.service.IPropagandaMaterialsService;
+import com.xinelu.manage.service.propagandamaterials.IPropagandaMaterialsService;
 
 /**
  * 宣教素材关系Service业务层处理

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;

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.domain.signpatientinformed.SignPatientInformed;
-import com.xinelu.manage.mapper.SignPatientInformedMapper;
+import com.xinelu.manage.mapper.signpatientinformed.SignPatientInformedMapper;
-import com.xinelu.manage.service.ISignPatientInformedService;
+import com.xinelu.manage.service.signpatientinformed.ISignPatientInformedService;
 import java.io.IOException;
 import java.util.List;
 import javax.annotation.Resource;

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接口

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.mapper.signpatientpackage.SignPatientPackageMapper;
-import com.xinelu.manage.domain.SignPatientPackage;
+import com.xinelu.manage.domain.signpatientpackage.SignPatientPackage;
-import com.xinelu.manage.service.ISignPatientPackageService;
+import com.xinelu.manage.service.signpatientpackage.ISignPatientPackageService;
 
 /**
  * 签约患者服务包信息Service业务层处理

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接口

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.mapper.signpatientpackagehardware.SignPatientPackageHardwareMapper;
-import com.xinelu.manage.domain.SignPatientPackageHardware;
+import com.xinelu.manage.domain.signpatientpackagehardware.SignPatientPackageHardware;
-import com.xinelu.manage.service.ISignPatientPackageHardwareService;
+import com.xinelu.manage.service.signpatientpackagehardware.ISignPatientPackageHardwareService;
 
 /**
  * 签约患者服务包硬件信息Service业务层处理

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<SignPatientListVo> selectList(SignPatientListDto signPatientRecord);
+
+	/**
+	 * 根据签约编号查询居民签约信息
+	 * @param patientSignRecordId
+	 * @return
+	 */
+	SignPatientInfoVo getByRecordId(Long patientSignRecordId);
+
+	/**
+	 * 根据患者主键查询患者签约记录列表
+	 * @param patientId
+	 * @return
+	 */
+	List<SignPatientRecordVo> getByPatient(Long patientId);
+
+	int add(SignPatientAddDto body);
+
+	int updateSignStatus(SignPatientStatusDto patientCancelSignDto);
+}

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.signpatientinformed.SignPatientInformed;
-import com.xinelu.manage.domain.SignPatientPackage;
+import com.xinelu.manage.domain.signpatientpackage.SignPatientPackage;
-import com.xinelu.manage.domain.SignPatientPackageHardware;
+import com.xinelu.manage.domain.signpatientpackagehardware.SignPatientPackageHardware;
-import com.xinelu.manage.domain.SignPatientRecord;
+import com.xinelu.manage.domain.signpatientrecord.SignPatientRecord;
-import com.xinelu.manage.dto.PatientSignStatusDto;
+import com.xinelu.manage.dto.signpatientrecord.SignPatientStatusDto;
-import com.xinelu.manage.dto.PatientSignAddDto;
+import com.xinelu.manage.dto.signpatientrecord.SignPatientAddDto;
-import com.xinelu.manage.dto.SignPatientListDto;
+import com.xinelu.manage.dto.signpatientrecord.SignPatientListDto;
-import com.xinelu.manage.mapper.SignPatientInformedMapper;
+import com.xinelu.manage.mapper.signpatientinformed.SignPatientInformedMapper;
-import com.xinelu.manage.mapper.SignPatientPackageHardwareMapper;
+import com.xinelu.manage.mapper.signpatientpackagehardware.SignPatientPackageHardwareMapper;
-import com.xinelu.manage.mapper.SignPatientPackageMapper;
+import com.xinelu.manage.mapper.signpatientpackage.SignPatientPackageMapper;
-import com.xinelu.manage.mapper.SignPatientRecordMapper;
+import com.xinelu.manage.mapper.signpatientrecord.SignPatientRecordMapper;
-import com.xinelu.manage.service.ISignPatientRecordService;
+import com.xinelu.manage.service.signpatientrecord.ISignPatientRecordService;
-import com.xinelu.manage.vo.PatientSignInfoVo;
+import com.xinelu.manage.vo.signpatientrecord.SignPatientInfoVo;
-import com.xinelu.manage.vo.PatientSignRecordVo;
+import com.xinelu.manage.vo.signpatientrecord.SignPatientRecordVo;
-import com.xinelu.manage.vo.SignPatientListVo;
+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<PatientSignRecordVo> getByPatient(Long patientId) {
+	@Override public List<SignPatientRecordVo> 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());

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;

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
 	 */

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;

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

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<MaterialsInfo> 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);
+}

postdischarge-manage/src/main/resources/mapper/manage/materialsinfo/MaterialsInfoMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xinelu.manage.mapper.MaterialsInfoMapper">
+<mapper namespace="com.xinelu.manage.mapper.materialsinfo.MaterialsInfoMapper">
 
     <resultMap type="MaterialsInfo" id="MaterialsInfoResult">
             <result property="id" column="id"/>

postdischarge-manage/src/main/resources/mapper/manage/patientblacklist/PatientBlacklistMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xinelu.manage.mapper.PatientBlacklistMapper">
+<mapper namespace="com.xinelu.manage.mapper.patientblacklist.PatientBlacklistMapper">
 
     <resultMap type="PatientBlacklist" id="PatientBlacklistResult">
             <result property="id" column="id"/>
@@ -25,7 +25,7 @@
                function_limitation, blacklist_source, del_flag, create_by, create_time, update_by, update_time from patient_blacklist
     </sql>
 
-    <select id="selectPatientBlacklistList" parameterType="com.xinelu.manage.dto.PatientBlacklistDto" resultMap="PatientBlacklistResult">
+    <select id="selectPatientBlacklistList" parameterType="com.xinelu.manage.dto.patientblacklist.PatientBlacklistDto" resultMap="PatientBlacklistResult">
 	    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,

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">
 
-<mapper namespace="com.xinelu.manage.mapper.PatientInfoMapper">
+<mapper namespace="com.xinelu.manage.mapper.patientinfo.PatientInfoMapper">
-	<resultMap type="com.xinelu.manage.domain.PatientInfo" id="PatientInfoResult">
+	<resultMap type="com.xinelu.manage.domain.patientinfo.PatientInfo" id="PatientInfoResult">
 		<result property="id" column="id" />
 		<result property="patientName" column="patient_name" />
 		<result property="patientPhone" column="patient_phone" />
@@ -72,7 +72,7 @@
 		from patient_info
 	</sql>
 
-	<select id="selectPatientInfoList" parameterType="com.xinelu.manage.dto.PatientInfoDto" resultMap="PatientInfoResult">
+	<select id="selectPatientInfoList" parameterType="com.xinelu.manage.dto.patientinfo.PatientInfoDto" resultMap="PatientInfoResult">
 		<include refid="selectPatientInfoVo" />
 		<where>
 			del_flag = 0
@@ -161,7 +161,7 @@
 		where id = #{id}
 	</select>
 
-	<insert id="insertPatientInfo" parameterType="com.xinelu.manage.domain.PatientInfo" useGeneratedKeys="true" keyProperty="id">
+	<insert id="insertPatientInfo" parameterType="com.xinelu.manage.domain.patientinfo.PatientInfo" useGeneratedKeys="true" keyProperty="id">
 		insert into patient_info
 		<trim prefix="(" suffix=")" suffixOverrides=",">
 			<if test="patientName != null">
@@ -352,7 +352,7 @@
 		</trim>
 	</insert>
 
-	<update id="updatePatientInfo" parameterType="com.xinelu.manage.domain.PatientInfo">
+	<update id="updatePatientInfo" parameterType="com.xinelu.manage.domain.patientinfo.PatientInfo">
 		update patient_info
 		<trim prefix="SET" suffixOverrides=",">
 			<if test="patientName != null">

postdischarge-manage/src/main/resources/mapper/manage/patientpropaganda/PatientPropagandaMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xinelu.manage.mapper.PatientPropagandaMapper">
+<mapper namespace="com.xinelu.manage.mapper.patientpropaganda.PatientPropagandaMapper">
 
     <resultMap type="PatientPropaganda" id="PatientPropagandaResult">
             <result property="id" column="id"/>

postdischarge-manage/src/main/resources/mapper/manage/patientvisitinhospital/PatientVisitInHospitalMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xinelu.manage.mapper.PatientVisitInHospitalMapper">
+<mapper namespace="com.xinelu.manage.mapper.patientvisitinhospital.PatientVisitInHospitalMapper">
 
     <resultMap type="PatientVisitInHospital" id="PatientVisitInHospitalResult">
             <result property="id" column="id"/>

postdischarge-manage/src/main/resources/mapper/manage/patientvisitoperation/PatientVisitOperationMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xinelu.manage.mapper.PatientVisitOperationMapper">
+<mapper namespace="com.xinelu.manage.mapper.patientvisitoperation.PatientVisitOperationMapper">
 
     <resultMap type="PatientVisitOperation" id="PatientVisitOperationResult">
             <result property="id" column="id"/>

postdischarge-manage/src/main/resources/mapper/manage/patientvisitouthospital/PatientVisitOutHospitalMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xinelu.manage.mapper.PatientVisitOutHospitalMapper">
+<mapper namespace="com.xinelu.manage.mapper.patientvisitouthospital.PatientVisitOutHospitalMapper">
 
     <resultMap type="PatientVisitOutHospital" id="PatientVisitOutHospitalResult">
             <result property="id" column="id"/>

postdischarge-manage/src/main/resources/mapper/manage/patientvisitrecord/PatientVisitRecordMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xinelu.manage.mapper.PatientVisitRecordMapper">
+<mapper namespace="com.xinelu.manage.mapper.patientvisitrecord.PatientVisitRecordMapper">
 
     <resultMap type="PatientVisitRecord" id="PatientVisitRecordResult">
             <result property="id" column="id"/>
@@ -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
     </sql>
 
-    <select id="selectPatientVisitRecordList" parameterType="com.xinelu.manage.dto.PatientVisitRecordDto" resultMap="PatientVisitRecordResult">
+    <select id="selectPatientVisitRecordList" parameterType="com.xinelu.manage.dto.patientvisitrecord.PatientVisitRecordDto" resultMap="PatientVisitRecordResult">
         <include refid="selectPatientVisitRecordVo"/>
         <where>
             <if test="patientId != null ">

postdischarge-manage/src/main/resources/mapper/manage/propagandainfo/PropagandaInfoMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xinelu.manage.mapper.PropagandaInfoMapper">
+<mapper namespace="com.xinelu.manage.mapper.propagandainfo.PropagandaInfoMapper">
 
     <resultMap type="PropagandaInfo" id="PropagandaInfoResult">
             <result property="id" column="id"/>

postdischarge-manage/src/main/resources/mapper/manage/propagandamaterials/PropagandaMaterialsMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xinelu.manage.mapper.PropagandaMaterialsMapper">
+<mapper namespace="com.xinelu.manage.mapper.propagandamaterials.PropagandaMaterialsMapper">
 
     <resultMap type="PropagandaMaterials" id="PropagandaMaterialsResult">
             <result property="id" column="id"/>

postdischarge-manage/src/main/resources/mapper/manage/signpatientinformed/SignPatientInformedMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xinelu.manage.mapper.SignPatientInformedMapper">
+<mapper namespace="com.xinelu.manage.mapper.signpatientinformed.SignPatientInformedMapper">
 
     <resultMap type="SignPatientInformed" id="SignPatientInformedResult">
             <result property="id" column="id"/>

postdischarge-manage/src/main/resources/mapper/manage/signpatientpackage/SignPatientPackageMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xinelu.manage.mapper.SignPatientPackageMapper">
+<mapper namespace="com.xinelu.manage.mapper.signpatientpackage.SignPatientPackageMapper">
 
     <resultMap type="SignPatientPackage" id="SignPatientPackageResult">
             <result property="id" column="id"/>

postdischarge-manage/src/main/resources/mapper/manage/signpatientpackagehardware/SignPatientPackageHardwareMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xinelu.manage.mapper.SignPatientPackageHardwareMapper">
+<mapper namespace="com.xinelu.manage.mapper.signpatientpackagehardware.SignPatientPackageHardwareMapper">
 
     <resultMap type="SignPatientPackageHardware" id="SignPatientPackageHardwareResult">
             <result property="id" column="id"/>

postdischarge-manage/src/main/resources/mapper/manage/signpatientrecord/SignPatientRecordMapper.xml

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xinelu.manage.mapper.SignPatientRecordMapper">
+<mapper namespace="com.xinelu.manage.mapper.signpatientrecord.SignPatientRecordMapper">
 
-    <resultMap id="BaseResultMap" type="com.xinelu.manage.domain.SignPatientRecord">
+    <resultMap id="BaseResultMap" type="com.xinelu.manage.domain.signpatientrecord.SignPatientRecord">
             <id property="id" column="id" jdbcType="BIGINT"/>
             <result property="patientId" column="patient_id" jdbcType="BIGINT"/>
             <result property="patientName" column="patient_name" jdbcType="VARCHAR"/>
@@ -38,7 +38,7 @@
             <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
     </resultMap>
 
-	<resultMap id="SignInfoResultMap" type="com.xinelu.manage.vo.PatientSignInfoVo">
+	<resultMap id="SignInfoResultMap" type="com.xinelu.manage.vo.signpatientrecord.SignPatientInfoVo">
 		<id property="id" column="id" jdbcType="BIGINT"/>
 		<result property="patientId" column="patient_id" jdbcType="BIGINT"/>
 		<result property="patientName" column="patient_name" jdbcType="VARCHAR"/>
@@ -62,7 +62,7 @@
 		<result property="serviceStartTime" column="service_start_time"/>
 		<result property="serviceEndTime" column="service_end_time"/>
 		<result property="serviceCycle" column="service_cycle"/>
-		<collection property="signDevices" ofType="com.xinelu.manage.domain.SignPatientPackageHardware">
+		<collection property="signDevices" ofType="com.xinelu.manage.domain.signpatientpackagehardware.SignPatientPackageHardware">
 			<result property="id" column="id"/>
 			<result property="hardwareType" column="hardware_type"/>
 			<result property="snCode" column="sn_code"/>
@@ -98,7 +98,7 @@
         delete from sign_patient_record
         where  id = #{id,jdbcType=BIGINT} 
     </delete>
-    <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.xinelu.manage.domain.SignPatientRecord" useGeneratedKeys="true">
+    <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.xinelu.manage.domain.signpatientrecord.SignPatientRecord" useGeneratedKeys="true">
         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>
-    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.xinelu.manage.domain.SignPatientRecord" useGeneratedKeys="true">
+    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.xinelu.manage.domain.signpatientrecord.SignPatientRecord" useGeneratedKeys="true">
         insert into sign_patient_record
         <trim prefix="(" suffix=")" suffixOverrides=",">
                 <if test="id != null">id,</if>
@@ -192,7 +192,7 @@
                 <if test="updateTime != null">#{updateTime,jdbcType=TIMESTAMP},</if>
         </trim>
     </insert>
-    <update id="updateByPrimaryKeySelective" parameterType="com.xinelu.manage.domain.SignPatientRecord">
+    <update id="updateByPrimaryKeySelective" parameterType="com.xinelu.manage.domain.signpatientrecord.SignPatientRecord">
         update sign_patient_record
         <set>
                 <if test="patientId != null">
@@ -288,7 +288,7 @@
         </set>
         where   id = #{id,jdbcType=BIGINT} 
     </update>
-    <update id="updateByPrimaryKey" parameterType="com.xinelu.manage.domain.SignPatientRecord">
+    <update id="updateByPrimaryKey" parameterType="com.xinelu.manage.domain.signpatientrecord.SignPatientRecord">
         update sign_patient_record
         set 
             patient_id =  #{patientId,jdbcType=BIGINT},
@@ -323,7 +323,7 @@
             update_time =  #{updateTime,jdbcType=TIMESTAMP}
         where   id = #{id,jdbcType=BIGINT} 
     </update>
-	<select id="selectList" parameterType="com.xinelu.manage.domain.SignPatientRecord" resultType="com.xinelu.manage.vo.SignPatientListVo">
+	<select id="selectList" parameterType="com.xinelu.manage.domain.signpatientrecord.SignPatientRecord" resultType="com.xinelu.manage.vo.signpatientrecord.SignPatientListVo">
 		select
 		sign.id,sign.patient_id,sign.patient_name,
 		sign.patient_phone,sign.card_no, sign.sign_time,
@@ -384,7 +384,7 @@
 			</if>
 		</where>
 	</select>
-	<select id="getByRecordId" parameterType="java.lang.Long" resultType="com.xinelu.manage.vo.PatientSignInfoVo">
+	<select id="getByRecordId" parameterType="java.lang.Long" resultType="com.xinelu.manage.vo.signpatientrecord.SignPatientInfoVo">
 		select
 		sign.id,sign.patient_id,sign.patient_name,
 		sign.patient_phone,sign.card_no, sign.sign_time,
@@ -405,7 +405,7 @@
 		</where>
 	</select>
 
-	<select id="getByPatient" parameterType="java.lang.Long" resultType="com.xinelu.manage.vo.PatientSignRecordVo">
+	<select id="getByPatient" parameterType="java.lang.Long" resultType="com.xinelu.manage.vo.signpatientrecord.SignPatientRecordVo">
 		select
 		sign.id,sign.patient_id,sign.patient_name,
 		sign.service_status, p.package_name