From c756ba39a38c6cf27772a1133c2c2cb4e734b0f3 Mon Sep 17 00:00:00 2001 From: mengkuiliang <1464081137@qq.com> Date: Tue, 7 Nov 2023 17:39:06 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=B5=8B=E8=AF=95=E4=B8=AD?= =?UTF-8?q?=E5=87=BA=E7=8E=B0=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ResidentRescindApplyServiceImpl.java | 2 +- .../impl/ResidentServiceApplyServiceImpl.java | 6 +++++- .../impl/ResidentSignApplyServiceImpl.java | 2 +- .../manage/domain/patientinfo/PatientInfo.java | 8 ++++++++ .../Impl/MessagePushServiceImpl.java | 2 +- .../impl/ScreeningRecordServiceImpl.java | 2 +- .../manage/patientinfo/PatientInfoMapper.xml | 17 ++++++++++++++--- .../screeningproject/ScreeningProjectMapper.xml | 2 +- 8 files changed, 32 insertions(+), 9 deletions(-) diff --git a/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/service/impl/ResidentRescindApplyServiceImpl.java b/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/service/impl/ResidentRescindApplyServiceImpl.java index e08422a..ec9b016 100644 --- a/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/service/impl/ResidentRescindApplyServiceImpl.java +++ b/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/service/impl/ResidentRescindApplyServiceImpl.java @@ -83,7 +83,7 @@ public class ResidentRescindApplyServiceImpl implements IResidentRescindApplySer MessagePushBody messagePushBody = new MessagePushBody(); messagePushBody.setMessageCategory("4"); messagePushBody.setBusType("10"); - messagePushBody.setOpenid(patientInfo.getOpenid()); + messagePushBody.setOpenid(patientInfo.getBindOpenid()); messagePushBody.setReceiveName(patientInfo.getPatientName()); messagePushBody.setText1(body.getOrgName()); messagePushBody.setText2("解约申请"); diff --git a/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/service/impl/ResidentServiceApplyServiceImpl.java b/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/service/impl/ResidentServiceApplyServiceImpl.java index 01a32aa..27e4388 100644 --- a/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/service/impl/ResidentServiceApplyServiceImpl.java +++ b/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/service/impl/ResidentServiceApplyServiceImpl.java @@ -91,12 +91,15 @@ public class ResidentServiceApplyServiceImpl implements IResidentServiceAppletSe if(StringUtils.isBlank(entity.getServiceWay())) { entity.setServiceWay("2"); } + if(StringUtils.isBlank(entity.getResidentName())) { + entity.setResidentName(patientInfo.getPatientName()); + } residentServiceApplyMapper.insert(entity); MessagePushBody messagePushBody = new MessagePushBody(); messagePushBody.setMessageCategory("4"); messagePushBody.setBusType("10"); - messagePushBody.setOpenid(patientInfo.getOpenid()); + messagePushBody.setOpenid(patientInfo.getBindOpenid()); messagePushBody.setReceiveName(patientInfo.getPatientName()); messagePushBody.setText1(body.getOrgName()); messagePushBody.setText2(body.getFormName().length() >= 20? body.getFormName().substring(0,17) + "...": body.getFormName()); @@ -329,6 +332,7 @@ public class ResidentServiceApplyServiceImpl implements IResidentServiceAppletSe sp.setProjectName(project.getProjectName()); sp.setPrice(project.getPrice()); sp.setDiscountPrice(project.getDiscountPrice()); + sp.setPackageName(project.getHospitalName()); projectList.add(sp); } } diff --git a/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/service/impl/ResidentSignApplyServiceImpl.java b/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/service/impl/ResidentSignApplyServiceImpl.java index e0d3517..80985d2 100644 --- a/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/service/impl/ResidentSignApplyServiceImpl.java +++ b/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/service/impl/ResidentSignApplyServiceImpl.java @@ -100,7 +100,7 @@ public class ResidentSignApplyServiceImpl implements IResidentSignAppletService MessagePushBody messagePushBody = new MessagePushBody(); messagePushBody.setMessageCategory("4"); messagePushBody.setBusType("10"); - messagePushBody.setOpenid(patientInfo.getOpenid()); + messagePushBody.setOpenid(patientInfo.getBindOpenid()); messagePushBody.setReceiveName(body.getResidentName()); messagePushBody.setText1(body.getOrgName()); messagePushBody.setText2("签约申请"); diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/patientinfo/PatientInfo.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/patientinfo/PatientInfo.java index 7999fe7..8c6114d 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/patientinfo/PatientInfo.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/patientinfo/PatientInfo.java @@ -264,6 +264,13 @@ public class PatientInfo extends BaseDomain implements Serializable { */ private String isChecked; + /** + * 同一微信绑定标识openid，用于区分同一账号绑定的居民 + */ + @ApiModelProperty(value = "同一微信绑定标识openid，用于区分同一账号绑定的居民") + @Excel(name = "同一微信绑定标识openid，用于区分同一账号绑定的居民") + private String bindOpenid; + @Override public String toString() { @@ -296,6 +303,7 @@ public class PatientInfo extends BaseDomain implements Serializable { .append("cityCode", getCityCode()) .append("bindingTime", getBindingTime()) .append("isChecked", getIsChecked()) + .append("bindOpenid", getBindOpenid()) .toString(); } } diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/messagepush/Impl/MessagePushServiceImpl.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/messagepush/Impl/MessagePushServiceImpl.java index 1716759..f514061 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/messagepush/Impl/MessagePushServiceImpl.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/messagepush/Impl/MessagePushServiceImpl.java @@ -372,7 +372,7 @@ public class MessagePushServiceImpl implements MessagePushService { } FDWxMegDto wxMegDto = new FDWxMegDto(); - wxMegDto.setTouser(patientInfo.getOpenid()); + wxMegDto.setTouser(patientInfo.getBindOpenid()); wxMegDto.setTemplate_id(MessageTemplateType.getFolllowupTypeByCode(body.getTemplateType()).getTemplateId()); Map meg = new HashMap<>(); switch (body.getTemplateType()) { diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/screeningrecord/impl/ScreeningRecordServiceImpl.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/screeningrecord/impl/ScreeningRecordServiceImpl.java index 41b8f29..bec8bec 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/screeningrecord/impl/ScreeningRecordServiceImpl.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/screeningrecord/impl/ScreeningRecordServiceImpl.java @@ -135,7 +135,7 @@ public class ScreeningRecordServiceImpl implements IScreeningRecordService { int flag = screeningRecordMapper.insert(recordBody); if(flag > 0) { // 组装发送消息通知参数 - result.put("openid", registerVo.getOpenid()); + result.put("openid", registerVo.getBindOpenid()); result.put("receiveName", registerVo.getPatientName()); result.put("text1", body.getHospitalName()); result.put("text2", (body.getProjectName().length() >= 17? (body.getProjectName().substring(0, 17) + "..."): body.getProjectName())); diff --git a/xinelu-nurse-manage/src/main/resources/mapper/manage/patientinfo/PatientInfoMapper.xml b/xinelu-nurse-manage/src/main/resources/mapper/manage/patientinfo/PatientInfoMapper.xml index d22a3ae..12d1313 100644 --- a/xinelu-nurse-manage/src/main/resources/mapper/manage/patientinfo/PatientInfoMapper.xml +++ b/xinelu-nurse-manage/src/main/resources/mapper/manage/patientinfo/PatientInfoMapper.xml @@ -46,6 +46,7 @@ + @@ -85,7 +86,8 @@ disease, city_code, binding_time, - is_checked + is_checked, + bind_openid from patient_info @@ -122,6 +124,7 @@ pi.create_time, pi.disabling_condition, pi.disabling_reason, + pi.bind_openid, sa.area_name from patient_info pi left join sys_area sa on sa.area_code = pi.area_code @@ -217,6 +220,7 @@ pi.create_time, pi.disabling_condition, pi.disabling_reason, + pi.bind_openid, sa.area_name from patient_info pi INNER join sys_area sa on sa.area_code = pi.area_code @@ -305,6 +309,7 @@ is_checked, + bind_openid, #{communityCode}, @@ -385,6 +390,7 @@ #{isChecked}, + #{bindOpenid}, @@ -508,6 +514,9 @@ is_checked = #{isChecked}, + + bind_openid = #{bindOpenid}, + where id = #{id} @@ -565,7 +574,8 @@ disabling_condition, disabling_reason, city_code, - binding_time + binding_time, + bind_openid FROM patient_info WHERE id = #{id} and del_flag = 0 @@ -603,7 +613,8 @@ birth_date, personal_wechat_code_url, disabling_condition, - disabling_reason + disabling_reason, + bind_openid FROM patient_info WHERE card_no = #{cardNo} and del_flag = 0 limit 1 diff --git a/xinelu-nurse-manage/src/main/resources/mapper/manage/screeningproject/ScreeningProjectMapper.xml b/xinelu-nurse-manage/src/main/resources/mapper/manage/screeningproject/ScreeningProjectMapper.xml index c0921f0..700ad3a 100644 --- a/xinelu-nurse-manage/src/main/resources/mapper/manage/screeningproject/ScreeningProjectMapper.xml +++ b/xinelu-nurse-manage/src/main/resources/mapper/manage/screeningproject/ScreeningProjectMapper.xml @@ -51,7 +51,7 @@ and date_format(create_time,'%Y%m%d') = date_format(#{createTime},'%Y%m%d') - order By id desc + order By hospital_id asc