解决测试中出现的问题；
This commit is contained in:
mengkuiliang
parent
bb69917dc6
commit
c756ba39a3
@ -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("解约申请");
|
||||
|
||||
@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
@ -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("签约申请");
|
||||
|
||||
@ -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();
|
||||
}
|
||||
}
|
||||
|
||||
@ -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<String, TemplateData> meg = new HashMap<>();
|
||||
switch (body.getTemplateType()) {
|
||||
|
||||
@ -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()));
|
||||
|
||||
@ -46,6 +46,7 @@
|
||||
<result property="cityCode" column="city_code"/>
|
||||
<result property="bindingTime" column="binding_time"/>
|
||||
<result property="isChecked" column="is_checked"/>
|
||||
<result property="bindOpenid" column="bind_openid"/>
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectPatientInfoVo">
|
||||
@ -85,7 +86,8 @@
|
||||
disease,
|
||||
city_code,
|
||||
binding_time,
|
||||
is_checked
|
||||
is_checked,
|
||||
bind_openid
|
||||
from patient_info
|
||||
</sql>
|
||||
|
||||
@ -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 @@
|
||||
</if>
|
||||
<if test="isChecked != null">is_checked,
|
||||
</if>
|
||||
<if test="bindOpenid != null">bind_openid,</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="communityCode != null and communityCode != ''">#{communityCode},
|
||||
@ -385,6 +390,7 @@
|
||||
</if>
|
||||
<if test="isChecked != null">#{isChecked},
|
||||
</if>
|
||||
<if test="bindOpenid != null">#{bindOpenid},</if>
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
@ -508,6 +514,9 @@
|
||||
<if test="isChecked != null">is_checked =
|
||||
#{isChecked},
|
||||
</if>
|
||||
<if test="bindOpenid != null">
|
||||
bind_openid = #{bindOpenid},
|
||||
</if>
|
||||
</trim>
|
||||
where id = #{id}
|
||||
</update>
|
||||
@ -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
|
||||
|
||||
@ -51,7 +51,7 @@
|
||||
<if test="createTime != null">
|
||||
and date_format(create_time,'%Y%m%d') = date_format(#{createTime},'%Y%m%d')
|
||||
</if>
|
||||
order By id desc
|
||||
order By hospital_id asc
|
||||
</select>
|
||||
|
||||
<select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
|
||||
|
||||
Loading…
Reference in New Issue
Block a user