xinyilu/xinelu-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改测试出来的问题；

Browse Source
This commit is contained in:
mengkuiliang 2023-11-09 08:36:29 +08:00
parent b02fc13a63
commit cd82cc33aa
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/pojo/body/ResidentServiceApplyBody.java
View File

@ -1,5 +1,6 @@
package com.xinelu.familydoctor.applet.pojo.body; package com.xinelu.familydoctor.applet.pojo.body;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.xinelu.familydoctor.applet.pojo.dto.ResidentServiceFormApplyDto; import com.xinelu.familydoctor.applet.pojo.dto.ResidentServiceFormApplyDto;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
@ -47,19 +48,20 @@ public class ResidentServiceApplyBody extends ResidentServiceFormApplyDto{
* 预约时间 * 预约时间
*/ */
@ApiModelProperty(value = "预约时间", required = true) @ApiModelProperty(value = "预约时间", required = true)
@JsonFormat(pattern ="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date bookingTime; private Date bookingTime;
/** /**
* 预约机构编号 * 预约机构编号
*/ */
@ApiModelProperty(value = "预约机构编号", required = true) @ApiModelProperty(value = "预约机构编号", required = true)
private String orgNo; private String hospitalId;
/** /**
* 预约机构名称 * 预约机构名称
*/ */
@ApiModelProperty(value = "预约机构名称", required = true) @ApiModelProperty(value = "预约机构名称", required = true)
private String orgName; private String hospitalName;
/** /**
* 预约团队编号 * 预约团队编号

4
xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/service/impl/ResidentPatientInfoServiceImpl.java
View File

@ -229,6 +229,10 @@ public class ResidentPatientInfoServiceImpl implements IResidentPatientInfoServi
} }
// 注册 // 注册
} else { } else {
List<PatientInfo> list = residentPatientInfoMapper.getList(body.getOpenid(), null);
if(list != null && list.size() >= 8) {
throw new ServiceException("同一个微信最多绑定8个居民");
}
PatientInfo entity = new PatientInfo(); PatientInfo entity = new PatientInfo();
BeanUtils.copyBeanProp(entity, body); BeanUtils.copyBeanProp(entity, body);
// 已绑定openid，将该值置空 // 已绑定openid，将该值置空

4
xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/service/impl/ResidentServiceApplyServiceImpl.java
View File

@ -88,6 +88,8 @@ public class ResidentServiceApplyServiceImpl implements IResidentServiceAppletSe
// 审批状态0:待批准 1:已同意 2:已拒绝 // 审批状态0:待批准 1:已同意 2:已拒绝
entity.setApprovalStatus("0"); entity.setApprovalStatus("0");
entity.setBookingNo(IdUtils.simpleUUID()); entity.setBookingNo(IdUtils.simpleUUID());
entity.setOrgNo(body.getHospitalId());
entity.setOrgName(body.getHospitalName());
if(StringUtils.isBlank(entity.getServiceWay())) { if(StringUtils.isBlank(entity.getServiceWay())) {
entity.setServiceWay("2"); entity.setServiceWay("2");
} }
@ -101,7 +103,7 @@ public class ResidentServiceApplyServiceImpl implements IResidentServiceAppletSe
messagePushBody.setBusType("10"); messagePushBody.setBusType("10");
messagePushBody.setOpenid(patientInfo.getBindOpenid()); messagePushBody.setOpenid(patientInfo.getBindOpenid());
messagePushBody.setReceiveName(patientInfo.getPatientName()); messagePushBody.setReceiveName(patientInfo.getPatientName());
messagePushBody.setText1(body.getOrgName()); messagePushBody.setText1(body.getHospitalName());
messagePushBody.setText2(body.getFormName().length() >= 20? body.getFormName().substring(0,17) + "...": body.getFormName()); messagePushBody.setText2(body.getFormName().length() >= 20? body.getFormName().substring(0,17) + "...": body.getFormName());
messagePushBody.setText3(body.getFormName()); messagePushBody.setText3(body.getFormName());
messagePushBody.setSendTitle("服务预约"); messagePushBody.setSendTitle("服务预约");