|
|
@ -1,5 +1,6 @@
|
|
|
package com.yihu.wlyy.service.app.sign;
|
|
|
|
|
|
import com.yihu.device.entity.DeviceDetail;
|
|
|
import com.yihu.wlyy.entity.address.Country;
|
|
|
import com.yihu.wlyy.entity.address.Street;
|
|
|
import com.yihu.wlyy.entity.address.Town;
|
|
|
@ -15,6 +16,7 @@ import com.yihu.wlyy.entity.doctor.team.sign.DoctorTeamMember;
|
|
|
import com.yihu.wlyy.entity.message.Message;
|
|
|
import com.yihu.wlyy.entity.patient.*;
|
|
|
import com.yihu.wlyy.entity.wechat.WechatTemplateConfig;
|
|
|
import com.yihu.wlyy.health.repository.DeviceDetailDao;
|
|
|
import com.yihu.wlyy.repository.address.CountryDao;
|
|
|
import com.yihu.wlyy.repository.address.StreetDao;
|
|
|
import com.yihu.wlyy.repository.address.TownDao;
|
|
|
@ -139,6 +141,8 @@ public class SignWebService extends BaseService {
|
|
|
private PatientDeviceDao patientDeviceDao;
|
|
|
@Autowired
|
|
|
private PatientDeviceLogDao patientDeviceLogDao;
|
|
|
@Autowired
|
|
|
private DeviceDetailDao deviceDetailDao;
|
|
|
/**
|
|
|
* 厦门市
|
|
|
*/
|
|
|
@ -789,7 +793,11 @@ public class SignWebService extends BaseService {
|
|
|
jsonObject.put("doctor",patientDeviceLog.getOperator());//操作医生代码
|
|
|
jsonObject.put("doctorName",patientDeviceLog.getOperatorName());//操作医生姓名
|
|
|
jsonObject.put("hospitalName",deviceDoctor.getHospitalName());//社区名称
|
|
|
}else{
|
|
|
DeviceDetail deviceDetail = deviceDetailDao.findBySn(patientDeviceLog.getDeviceSn());
|
|
|
jsonObject.put("hospitalName",deviceDetail.getOrgName());//社区名称
|
|
|
}
|
|
|
|
|
|
jsonObject.put("dataType","device");//家庭医生签约服务包
|
|
|
jsonObject.put("deviceId",patientDeviceLog.getDeviceId());//设备ID
|
|
|
jsonObject.put("deviceSn",patientDeviceLog.getDeviceSn());//设备SN码
|
