diff --git a/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/advisoryinfo/entity/AdvisoryInfoEntity.java b/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/advisoryinfo/entity/AdvisoryInfoEntity.java index e56252d..892d472 100644 --- a/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/advisoryinfo/entity/AdvisoryInfoEntity.java +++ b/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/advisoryinfo/entity/AdvisoryInfoEntity.java @@ -64,13 +64,13 @@ public class AdvisoryInfoEntity implements Serializable { /**所属部门*/ private String sysOrgCode; - /**老人姓名*/ + /**长者姓名*/ private String oldManName; - /**老人年龄*/ + /**长者年龄*/ private String oldManAge; /**医保类型*/ private String medicalInsuranceType; - /**老人性别*/ + /**长者性别*/ private String oldManSex; /**报销类型*/ private String reimbType; diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nubaseelder/service/impl/NuBaseElderServiceImpl.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nubaseelder/service/impl/NuBaseElderServiceImpl.java index c6a11d7..6a9aa8f 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nubaseelder/service/impl/NuBaseElderServiceImpl.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nubaseelder/service/impl/NuBaseElderServiceImpl.java @@ -31,7 +31,7 @@ public class NuBaseElderServiceImpl extends ServiceImpl editNuBizAdvisoryInfo(@RequestBody NuBizAdvisoryInfoEntity nuBizAdvisoryInfo) { advisoryInfoApi.editNuBizAdvisoryInfo(nuBizAdvisoryInfo); - //通知对应机构修改老人家属信息 + //通知对应机构修改长者家属信息 //护理单元信息 List nuElderList = nuBaseElderApi.queryByOpenId(nuBizAdvisoryInfo.getOpenId(), null); if (nuElderList != null && nuElderList.size() > 0) { @@ -295,20 +295,20 @@ public class ElderApi { //长者id String id = elderInfoEntity.getSysOrgCode() + IdUtil.simpleUUID(); - //先判断对应机构此老人（根据身份证号）是否已经入住护理单元 + //先判断对应机构此长者（根据身份证号）是否已经入住护理单元 { //切换数据源 DynamicDataSourceContextHolder.push(elderInfoEntity.getSysOrgCode()); try { NuBaseInfoEntity judgeResult = nuBaseInfoApi.queryByElderIdNum(elderInfoEntity.getIdCard()); if (judgeResult != null) { - //这个是老人id跟护理单元还绑定中（认为是还在住） + //这个是长者id跟护理单元还绑定中（认为是还在住） if (StringUtils.isNotBlank(judgeResult.getElderId())) { - return Result.error("老人已入住机构，不可重复添加"); + return Result.error("长者已入住机构，不可重复添加"); } - //这个是入住任何护理单元 但是有盖老人信息 在业务端会更新长者信息 + //这个是入住任何护理单元 但是有盖长者信息 在业务端会更新长者信息 if (StringUtils.isBlank(judgeResult.getElderId()) && StringUtils.isNotBlank(judgeResult.getElderTableId())) { - //老人之前在机构入住过 + //长者之前在机构入住过 id = judgeResult.getElderTableId(); } } @@ -327,7 +327,7 @@ public class ElderApi { mqdto.setId(id); rabbitMQUtil.sendToExchange("hldy.elder", elderInfoEntity.getOrgCode() + ".elder.addelder", mqdto); - //处理管理端老人信息 + //处理管理端长者信息 ElderInfoEntity elderInfoEn = new ElderInfoEntity(); BeanUtils.copyProperties(mqdto, elderInfoEn); elderInfoApi.addElder(elderInfoEn); diff --git a/nursing-unit-api/src/main/java/com/nu/modules/wechat/nubaseinfo/api/NuBaseInfoApi.java b/nursing-unit-api/src/main/java/com/nu/modules/wechat/nubaseinfo/api/NuBaseInfoApi.java index d27e4f5..a7943c8 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/wechat/nubaseinfo/api/NuBaseInfoApi.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/wechat/nubaseinfo/api/NuBaseInfoApi.java @@ -110,7 +110,7 @@ public class NuBaseInfoApi { } /** - * 获取用户下对应的护理单元及老人信息 + * 获取用户下对应的护理单元及长者信息 * * @param openId * @return @@ -172,7 +172,7 @@ public class NuBaseInfoApi { elderIndex.put(elderId, i); } } - //老人信息 + //长者信息 if (StringUtils.isNotBlank(elderIds)) { List elderList = elderInfoApi.queryByElderIds(elderIds.substring(1).split(",")); if (elderList != null && elderList.size() > 0) { diff --git a/nursing-unit-common/src/main/java/com/nu/dto/ElderInfoMQDto.java b/nursing-unit-common/src/main/java/com/nu/dto/ElderInfoMQDto.java index 09f3edc..b39ca0d 100644 --- a/nursing-unit-common/src/main/java/com/nu/dto/ElderInfoMQDto.java +++ b/nursing-unit-common/src/main/java/com/nu/dto/ElderInfoMQDto.java @@ -153,7 +153,7 @@ public class ElderInfoMQDto implements Serializable { */ private String guardianName; /** - * 监护人与老人关系 + * 监护人与长者关系 */ private String relationship; /** diff --git a/nursing-unit-common/src/main/java/com/nu/entity/ElderInfoEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/ElderInfoEntity.java index d3cf289..8afef16 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/ElderInfoEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/ElderInfoEntity.java @@ -136,7 +136,7 @@ public class ElderInfoEntity implements Serializable { */ private String guardianName; /** - * 监护人与老人关系 + * 监护人与长者关系 */ private String relationship; /** diff --git a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/entity/ElderInfo.java b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/entity/ElderInfo.java index 604f23c..03d6265 100644 --- a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/entity/ElderInfo.java +++ b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/entity/ElderInfo.java @@ -198,10 +198,10 @@ public class ElderInfo implements Serializable { @ApiModelProperty(value = "监护人姓名") private java.lang.String guardianName; /** - * 监护人与老人关系 + * 监护人与长者关系 */ - @Excel(name = "监护人与老人关系", width = 15) - @ApiModelProperty(value = "监护人与老人关系") + @Excel(name = "监护人与长者关系", width = 15) + @ApiModelProperty(value = "监护人与长者关系") private java.lang.String relationship; /** * 监护人身份证号 diff --git a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/mq/eldertag/listener/ElderTaggMQListener.java b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/mq/eldertag/listener/ElderTaggMQListener.java index d753720..0d4bdb9 100644 --- a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/mq/eldertag/listener/ElderTaggMQListener.java +++ b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/mq/eldertag/listener/ElderTaggMQListener.java @@ -121,7 +121,7 @@ public class ElderTaggMQListener { nuWxNotice.setIzRead("N"); nuWxNotice.setOrgCode(dto.getOrgCode()); nuWxNotice.setTitle("监护人信息变更审批"); - nuWxNotice.setContent("您好，您提交的" + dto.getName() + "老人的家属信息变更申请已通过"); + nuWxNotice.setContent("您好，您提交的" + dto.getName() + "长者的家属信息变更申请已通过"); nuWxNotice.setType("elder_jhr_info_update_list"); Map extend = Maps.newHashMap(); extend.put("orgCode", dto.getOrgCode()); @@ -173,7 +173,7 @@ public class ElderTaggMQListener { nuWxNotice.setIzRead("N"); nuWxNotice.setOrgCode(dto.getOrgCode()); nuWxNotice.setTitle("监护人信息变更审批"); - nuWxNotice.setContent("您好，您提交的" + dto.getName() + "老人的家属信息变更申请未通过"); + nuWxNotice.setContent("您好，您提交的" + dto.getName() + "长者的家属信息变更申请未通过"); nuWxNotice.setType("elder_jhr_info_update_list"); Map extend = Maps.newHashMap(); extend.put("orgCode", dto.getOrgCode());