From fc5d93177feb7c6f9e04ffbb3f208f15a301192d Mon Sep 17 00:00:00 2001 From: haown <454902499@qq.com> Date: Wed, 8 May 2024 09:27:20 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=82=A3=E8=80=85=E9=85=8D=E7=BD=AE--?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=82=A3=E8=80=85=E5=9F=BA=E6=9C=AC=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../patientinfo/PatientInfoController.java | 12 +++ .../PatientVisitRecordController.java | 8 +- .../dto/patientinfo/PatientBaseInfoDto.java | 79 +++++++++++++++++++ .../patientinfo/IPatientInfoService.java | 11 ++- .../impl/PatientInfoServiceImpl.java | 17 ++-- 5 files changed, 115 insertions(+), 12 deletions(-) create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientinfo/PatientBaseInfoDto.java diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientinfo/PatientInfoController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientinfo/PatientInfoController.java index 5f46f79b..02db950b 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientinfo/PatientInfoController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientinfo/PatientInfoController.java @@ -8,6 +8,7 @@ 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.PatientInfo; +import com.xinelu.manage.dto.patientinfo.PatientBaseInfoDto; import com.xinelu.manage.dto.patientinfo.PatientInfoDto; import com.xinelu.manage.service.patientinfo.IPatientInfoService; import io.swagger.annotations.Api; @@ -92,6 +93,17 @@ public class PatientInfoController extends BaseController { return R.ok(patientInfoService.updatePatientInfo(patientInfo)); } + /** + * 患者配置--修改患者信息 + */ + @ApiOperation("患者配置--修改患者信息") + @PreAuthorize("@ss.hasPermi('manage:patientInfo:edit')") + @Log(title = "患者信息", businessType = BusinessType.UPDATE) + @PutMapping("/updateBaseInfo") + public R updateBaseInfo(@RequestBody PatientBaseInfoDto patientInfo) { + return R.ok(patientInfoService.updateBaseInfo(patientInfo)); + } + /** * 删除患者信息 */ diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientvisitrecord/PatientVisitRecordController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientvisitrecord/PatientVisitRecordController.java index 27b6cb55..1e7848d4 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientvisitrecord/PatientVisitRecordController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientvisitrecord/PatientVisitRecordController.java @@ -93,7 +93,7 @@ public class PatientVisitRecordController extends BaseController { * 新增患者就诊记录基本信息 */ @ApiOperation("新增患者就诊记录基本信息") - @PreAuthorize("@ss.hasPermi('manage:visit:add')") + //@PreAuthorize("@ss.hasPermi('manage:visit:add')") @Log(title = "患者就诊记录基本信息", businessType = BusinessType.INSERT) @PostMapping public R add(@Valid @RequestBody PatientVisitRecordSaveDto patientVisitRecord) { @@ -105,7 +105,7 @@ public class PatientVisitRecordController extends BaseController { * 修改患者就诊记录基本信息 */ @ApiOperation("修改患者就诊记录基本信息") - @PreAuthorize("@ss.hasPermi('manage:visit:edit')") + //@PreAuthorize("@ss.hasPermi('manage:visit:edit')") @Log(title = "患者就诊记录基本信息", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@Valid @RequestBody PatientVisitRecord patientVisitRecord) { @@ -116,7 +116,7 @@ public class PatientVisitRecordController extends BaseController { * 患者配置——就诊信息保存 */ @ApiOperation("患者配置——就诊信息保存") - @PreAuthorize("@ss.hasPermi('manage:visit:add')") + //@PreAuthorize("@ss.hasPermi('manage:visit:add')") @Log(title = "患者就诊记录基本信息", businessType = BusinessType.INSERT) @PostMapping("saveRecord") public R saveRecord(@Valid @RequestBody PatientVisitRecordInfoSaveDto saveDto) { @@ -129,7 +129,7 @@ public class PatientVisitRecordController extends BaseController { * 修改患者就诊记录基本信息 */ @ApiOperation("患者配置——就诊信息修改") - @PreAuthorize("@ss.hasPermi('manage:visit:edit')") + //@PreAuthorize("@ss.hasPermi('manage:visit:edit')") @Log(title = "患者就诊记录基本信息", businessType = BusinessType.UPDATE) @PutMapping("updateRecord") public AjaxResult updateRecord(@Valid @RequestBody PatientVisitRecordInfoSaveDto patientVisitRecord) { diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientinfo/PatientBaseInfoDto.java b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientinfo/PatientBaseInfoDto.java new file mode 100644 index 00000000..6023fbb0 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientinfo/PatientBaseInfoDto.java @@ -0,0 +1,79 @@ +package com.xinelu.manage.dto.patientinfo; + +import io.swagger.annotations.ApiModelProperty; +import java.time.LocalDate; +import lombok.Data; + +/** + * @description: 患者基本信息 + * @author: haown + * @create: 2024-05-08 09:10 + **/ +@Data +public class PatientBaseInfoDto { + + /** + * 主键id + */ + private Long id; + + /** + * 居民信息表id + */ + @ApiModelProperty(value = "居民信息表id") + private Long residentId; + + /** + * 患者姓名 + */ + @ApiModelProperty(value = "患者姓名") + private String patientName; + + /** + * 患者电话 + */ + @ApiModelProperty(value = "患者电话") + private String patientPhone; + + /** + * 家属电话 + */ + @ApiModelProperty(value = "家属电话") + private String familyMemberPhone; + + /** + * 出生日期，格式：yyyy-MM-dd + */ + @ApiModelProperty(value = "出生日期，格式：yyyy-MM-dd") + private LocalDate birthDate; + + /** + * 身份证号 + */ + @ApiModelProperty(value = "身份证号") + private String cardNo; + + /** + * 性别，男：MALE，女：FEMALE + */ + @ApiModelProperty(value = "性别，男：MALE，女：FEMALE") + private String sex; + + /** + * 住址 + */ + @ApiModelProperty(value = "住址") + private String address; + + /** + * 所属医院id + */ + @ApiModelProperty(value = "所属医院id") + private Long hospitalAgencyId; + + /** + * 所属医院名称 + */ + @ApiModelProperty(value = "所属医院名称") + private String hospitalAgencyName; +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientinfo/IPatientInfoService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientinfo/IPatientInfoService.java index 223979f0..b55a82f6 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientinfo/IPatientInfoService.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientinfo/IPatientInfoService.java @@ -1,6 +1,7 @@ package com.xinelu.manage.service.patientinfo; import com.xinelu.manage.domain.patientinfo.PatientInfo; +import com.xinelu.manage.dto.patientinfo.PatientBaseInfoDto; import com.xinelu.manage.dto.patientinfo.PatientInfoDto; import java.util.List; @@ -39,10 +40,18 @@ public interface IPatientInfoService { * 修改患者信息 * * @param patientInfo 患者信息 - * @return 结果 + * @return 患者信息 */ PatientInfo updatePatientInfo(PatientInfo patientInfo); + /** + * 患者基本信息 + * + * @param patientInfo 患者基本信息 + * @return 患者信息 + */ + PatientInfo updateBaseInfo(PatientBaseInfoDto patientInfo); + /** * 批量删除患者信息 * diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientinfo/impl/PatientInfoServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientinfo/impl/PatientInfoServiceImpl.java index f66343fb..7f5551c8 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientinfo/impl/PatientInfoServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientinfo/impl/PatientInfoServiceImpl.java @@ -11,6 +11,7 @@ import com.xinelu.manage.domain.patientinfo.PatientInfo; import com.xinelu.manage.domain.patientvisitrecord.PatientVisitRecord; import com.xinelu.manage.domain.residentinfo.ResidentInfo; import com.xinelu.manage.domain.signpatientrecord.SignPatientRecord; +import com.xinelu.manage.dto.patientinfo.PatientBaseInfoDto; import com.xinelu.manage.dto.patientinfo.PatientInfoDto; import com.xinelu.manage.dto.patientvisitrecord.PatientVisitRecordDto; import com.xinelu.manage.mapper.patientinfo.PatientInfoMapper; @@ -144,12 +145,8 @@ public class PatientInfoServiceImpl implements IPatientInfoService { throw new ServiceException("请输入身份证号"); } // 根据身份证号计算性别出生日期 - if (patientInfo.getBirthDate() == null) { - patientInfo.setBirthDate(BaseUtil.getBirthday(patientInfo.getCardNo())); - } - if (StringUtils.isBlank(patientInfo.getSex())) { - patientInfo.setSex(BaseUtil.getGender(patientInfo.getCardNo())); - } + patientInfo.setBirthDate(BaseUtil.getBirthday(patientInfo.getCardNo())); + patientInfo.setSex(BaseUtil.getGender(patientInfo.getCardNo())); ResidentInfo residentInfo = new ResidentInfo(); if (patientInfo.getResidentId() != null) { residentInfo = residentInfoMapper.selectResidentInfoById(patientInfo.getResidentId()); @@ -187,7 +184,13 @@ public class PatientInfoServiceImpl implements IPatientInfoService { return patientInfo; } - /** + @Override public PatientInfo updateBaseInfo(PatientBaseInfoDto patientInfo) { + PatientInfo patientInfo1 = patientInfoMapper.selectPatientInfoById(patientInfo.getId()); + BeanUtils.copyBeanProp(patientInfo1, patientInfo); + return updatePatientInfo(patientInfo1); + } + + /** * 批量删除患者信息 * * @param ids 需要删除的患者信息主键 From 9a15c0f808418246bd1eb25bb42bfea81bb5642d Mon Sep 17 00:00:00 2001 From: haown <454902499@qq.com> Date: Wed, 8 May 2024 17:19:36 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B0=B1=E8=AF=8A?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xinelu/manage/controller/agency/AgencyController.java | 1 + .../patientvisitrecord/PatientVisitRecordController.java | 2 +- .../impl/PatientVisitRecordServiceImpl.java | 8 +++++++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/agency/AgencyController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/agency/AgencyController.java index 75578486..62af6381 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/agency/AgencyController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/agency/AgencyController.java @@ -48,6 +48,7 @@ public class AgencyController extends BaseController { */ @GetMapping("/selectAgencyList") public AjaxResult selectAgencyByIdList(Agency agency) { + // TODO 根据用户角色确定查询范围 return agencyService.selectAgencyByIdList(agency); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientvisitrecord/PatientVisitRecordController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientvisitrecord/PatientVisitRecordController.java index 1e7848d4..9ece377b 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientvisitrecord/PatientVisitRecordController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientvisitrecord/PatientVisitRecordController.java @@ -52,7 +52,7 @@ public class PatientVisitRecordController extends BaseController { * 查询患者就诊记录基本信息列表 */ @ApiOperation("查询患者就诊记录基本信息列表") - @PreAuthorize("@ss.hasPermi('manage:visit:list')") + //@PreAuthorize("@ss.hasPermi('manage:visit:list')") @GetMapping("/getList") public AjaxResult getList(PatientVisitRecordDto patientVisitRecord) { List list = patientVisitRecordService.selectPatientVisitRecordList(patientVisitRecord); diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitrecord/impl/PatientVisitRecordServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitrecord/impl/PatientVisitRecordServiceImpl.java index 306bf7aa..782115d4 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitrecord/impl/PatientVisitRecordServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitrecord/impl/PatientVisitRecordServiceImpl.java @@ -209,6 +209,9 @@ public class PatientVisitRecordServiceImpl implements IPatientVisitRecordService @Override @Transactional(rollbackFor = Exception.class) public int saveRecord(PatientVisitRecordInfoSaveDto saveDto) { + if (saveDto.getPatientId() == null) { + throw new ServiceException("患者信息传输错误！"); + } PatientVisitRecord patientVisitRecord = new PatientVisitRecord(); // 查询患者基本信息 PatientBaseInfoVo patientBaseInfo = patientMapper.getPatientBaseInfo(saveDto.getPatientId()); @@ -249,11 +252,14 @@ public class PatientVisitRecordServiceImpl implements IPatientVisitRecordService * @return 结果 */ @Override - @Transactional + @Transactional(rollbackFor = Exception.class) public int updateRecord(PatientVisitRecordInfoSaveDto updDto) { if (updDto.getId() == null) { throw new ServiceException("数据传输错误"); } + if (updDto.getPatientId() == null) { + throw new ServiceException("患者信息传输错误！"); + } PatientVisitRecord patientVisitRecord = new PatientVisitRecord(); BeanUtils.copyBeanProp(patientVisitRecord, updDto); patientVisitRecord.setUpdateBy(SecurityUtils.getLoginUser().getUser().getNickName()); From ad14309baac46850d6e68d5939d13905e0b66da1 Mon Sep 17 00:00:00 2001 From: zhangheng <3226558941@qq.com> Date: Thu, 9 May 2024 14:31:21 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E7=97=85=E7=A7=8D=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/xinelu/common/constant/Constants.java | 5 +++++ .../impl/DepartmentDiseaseTypeServiceImpl.java | 5 +++++ .../xinelu/manage/service/info/impl/InfoServiceImpl.java | 5 ----- .../mapper/manage/propagandainfo/PropagandaInfoMapper.xml | 8 ++------ .../mapper/manage/scriptInfo/ScriptInfoMapper.xml | 8 ++------ .../mapper/manage/servicepackage/ServicePackageMapper.xml | 8 ++------ .../mapper/manage/textmessage/TextMessageMapper.xml | 8 ++------ .../mapper/manage/wechattemplate/WechatTemplateMapper.xml | 8 ++------ 8 files changed, 20 insertions(+), 35 deletions(-) diff --git a/postdischarge-common/src/main/java/com/xinelu/common/constant/Constants.java b/postdischarge-common/src/main/java/com/xinelu/common/constant/Constants.java index 5a2a6d4e..4707cd62 100644 --- a/postdischarge-common/src/main/java/com/xinelu/common/constant/Constants.java +++ b/postdischarge-common/src/main/java/com/xinelu/common/constant/Constants.java @@ -199,6 +199,11 @@ public class Constants { */ public static final String AGENCY_CODE = "AYC"; + /** + * 科室病种编码 + */ + public static final String DISEASE_TYPE_CODE = "DTC"; + /** * 任务状态编码 */ diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/departmentdiseasetype/impl/DepartmentDiseaseTypeServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/departmentdiseasetype/impl/DepartmentDiseaseTypeServiceImpl.java index 3eb2f036..15b46175 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/departmentdiseasetype/impl/DepartmentDiseaseTypeServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/departmentdiseasetype/impl/DepartmentDiseaseTypeServiceImpl.java @@ -1,6 +1,8 @@ package com.xinelu.manage.service.departmentdiseasetype.impl; +import com.xinelu.common.constant.Constants; import com.xinelu.common.core.domain.AjaxResult; +import com.xinelu.common.utils.codes.GenerateSystemCodeUtil; import com.xinelu.manage.domain.departmentdiseasetype.DepartmentDiseaseType; import com.xinelu.manage.mapper.departmentdiseasetype.DepartmentDiseaseTypeMapper; import com.xinelu.manage.service.departmentdiseasetype.IDepartmentDiseaseTypeService; @@ -24,6 +26,8 @@ import java.util.List; public class DepartmentDiseaseTypeServiceImpl implements IDepartmentDiseaseTypeService { @Resource private DepartmentDiseaseTypeMapper departmentDiseaseTypeMapper; + @Resource + private GenerateSystemCodeUtil generateSystemCodeUtil; /** * 查询科室病种信息 @@ -56,6 +60,7 @@ public class DepartmentDiseaseTypeServiceImpl implements IDepartmentDiseaseTypeS @Override public int insertDepartmentDiseaseType(DepartmentDiseaseType departmentDiseaseType) { departmentDiseaseType.setCreateTime(LocalDateTime.now()); + departmentDiseaseType.setDiseaseTypeCode(Constants.DISEASE_TYPE_CODE + generateSystemCodeUtil.generateSystemCode(Constants.DISEASE_TYPE_CODE)); return departmentDiseaseTypeMapper.insertDepartmentDiseaseType(departmentDiseaseType); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/info/impl/InfoServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/info/impl/InfoServiceImpl.java index 6704c2f1..8a1e470b 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/info/impl/InfoServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/info/impl/InfoServiceImpl.java @@ -93,7 +93,6 @@ public class InfoServiceImpl implements IInfoService { if (Objects.isNull(infoByID)) { return AjaxResult.error("当前资讯信息不存在，无法修改，请联系管理员！"); } - //添加修改人 修改时间 info.setInfoReviser(SecurityUtils.getUsername()); info.setInfoModifyTime(LocalDateTime.now()); @@ -101,12 +100,10 @@ public class InfoServiceImpl implements IInfoService { if (count <= 0) { throw new ServiceException("修改资讯信息失败，请联系管理员！"); } - //如果两个图片不相等，删除之前的图片 if (!info.getInfoLargePictureUrl().equals(infoByID.getInfoLargePictureUrl())) { deletePictureUrl(infoByID.getInfoLargePictureUrl()); } - //遍历修改前后内容相不相等，如果不为空且不相等，寻找遍历前后图片的差集，然后删除. if (StringUtils.isNotBlank(info.getInfoContent()) && StringUtils.isNotBlank(infoByID.getInfoContent()) && !info.getInfoContent().equals(infoByID.getInfoContent())) { @@ -117,7 +114,6 @@ public class InfoServiceImpl implements IInfoService { //遍历删除图片 List subList = new ArrayList<>(CollectionUtils.subtract(infoImgSrc, infoByIDImgSrc)); for (String picUrl : subList) { - if (StringUtils.isBlank(picUrl)) { //删除富文本图片 continue; } @@ -126,7 +122,6 @@ public class InfoServiceImpl implements IInfoService { //删除富文本图片 deletePictureUrl(substring); } - } return AjaxResult.success(); } diff --git a/postdischarge-manage/src/main/resources/mapper/manage/propagandainfo/PropagandaInfoMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/propagandainfo/PropagandaInfoMapper.xml index 1bd13fc6..ac1fae9e 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/propagandainfo/PropagandaInfoMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/propagandainfo/PropagandaInfoMapper.xml @@ -206,12 +206,8 @@ voicebroadcast = #{voicebroadcast}, - disease_type_id = - #{diseaseTypeId}, - - disease_type_name = - #{diseaseTypeName}, - + disease_type_id = #{diseaseTypeId}, + disease_type_name = #{diseaseTypeName}, propaganda_link = #{propagandaLink}, diff --git a/postdischarge-manage/src/main/resources/mapper/manage/scriptInfo/ScriptInfoMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/scriptInfo/ScriptInfoMapper.xml index 23edb95d..781aa722 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/scriptInfo/ScriptInfoMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/scriptInfo/ScriptInfoMapper.xml @@ -224,12 +224,8 @@ department_name = #{departmentName}, - disease_type_id = - #{diseaseTypeId}, - - disease_type_name = - #{diseaseTypeName}, - + disease_type_id = #{diseaseTypeId}, + disease_type_name = #{diseaseTypeName}, common_script_name = #{commonScriptName}, diff --git a/postdischarge-manage/src/main/resources/mapper/manage/servicepackage/ServicePackageMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/servicepackage/ServicePackageMapper.xml index ecf5fe67..91110841 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/servicepackage/ServicePackageMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/servicepackage/ServicePackageMapper.xml @@ -330,12 +330,8 @@ department_name = #{departmentName}, - disease_type_id = - #{diseaseTypeId}, - - disease_type_name = - #{diseaseTypeName}, - + disease_type_id = #{diseaseTypeId}, + disease_type_name = #{diseaseTypeName}, package_name = #{packageName}, diff --git a/postdischarge-manage/src/main/resources/mapper/manage/textmessage/TextMessageMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/textmessage/TextMessageMapper.xml index fc87f1c1..d6456163 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/textmessage/TextMessageMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/textmessage/TextMessageMapper.xml @@ -246,12 +246,8 @@ department_name = #{departmentName}, - disease_type_id = - #{diseaseTypeId}, - - disease_type_name = - #{diseaseTypeName}, - + disease_type_id = #{diseaseTypeId}, + disease_type_name = #{diseaseTypeName}, text_message_name = #{textMessageName}, diff --git a/postdischarge-manage/src/main/resources/mapper/manage/wechattemplate/WechatTemplateMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/wechattemplate/WechatTemplateMapper.xml index b8d371cd..abe848a2 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/wechattemplate/WechatTemplateMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/wechattemplate/WechatTemplateMapper.xml @@ -277,12 +277,8 @@ department_name = #{departmentName}, - disease_type_id = - #{diseaseTypeId}, - - disease_type_name = - #{diseaseTypeName}, - + disease_type_id = #{diseaseTypeId}, + disease_type_name = #{diseaseTypeName}, wechat_template_name = #{wechatTemplateName}, From e7369c777962c9f7b043333e3dd0df690d28ed42 Mon Sep 17 00:00:00 2001 From: zhangheng <3226558941@qq.com> Date: Mon, 13 May 2024 17:55:04 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=9C=BA=E6=9E=84=E7=B1=BB=E5=88=AB?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xinelu/manage/domain/agencycategory/AgencyCategory.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/agencycategory/AgencyCategory.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/agencycategory/AgencyCategory.java index f99265d1..5f5028b2 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/agencycategory/AgencyCategory.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/agencycategory/AgencyCategory.java @@ -34,7 +34,6 @@ public class AgencyCategory extends BaseEntity { * 父级类别id */ @ApiModelProperty(value = "父级类别id") - @Excel(name = "父级类别id") private Long parentCategoryId; /** @@ -48,7 +47,6 @@ public class AgencyCategory extends BaseEntity { * 类别编码 */ @ApiModelProperty(value = "类别编码") - @Excel(name = "类别编码") private String categoryCode; /**