|
|
@ -3238,6 +3238,39 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
|
|
|
SystemMessageDO messageDO = new SystemMessageDO();
|
|
|
messageDO.setTitle("医生取消复诊");
|
|
|
messageDO.setType("12");
|
|
|
messageDO.setSender(wlyyOutpatientDO.getDoctor());
|
|
|
messageDO.setSenderName(wlyyOutpatientDO.getDoctorName());
|
|
|
messageDO.setRelationCode(wlyyOutpatientDO.getId());
|
|
|
messageDO.setReceiver(wlyyOutpatientDO.getPatient());
|
|
|
messageDO.setReceiverName(wlyyOutpatientDO.getPatientName());
|
|
|
net.sf.json.JSONObject data = new net.sf.json.JSONObject();
|
|
|
|
|
|
|
|
|
try {
|
|
|
data.put("name",wlyyOutpatientDO.getPatientName());
|
|
|
data.put("age",IdCardUtil.getAgeForIdcard(wlyyOutpatientDO.getIdcard()));
|
|
|
data.put("gender",IdCardUtil.getSexForIdcard(wlyyOutpatientDO.getIdcard()));
|
|
|
data.put("question",wlyyOutpatientDO.getIcd10Name());
|
|
|
String msg="";
|
|
|
if ("1".equalsIgnoreCase(wlyyOutpatientDO.getType())){
|
|
|
data.put("type","9");
|
|
|
msg+=wlyyOutpatientDO.getPatientName()+",您好！ 您有一个图文复诊已被医生取消，取消原因："+cancelValue+"。取消说明："+cancelRemark+"。";
|
|
|
}
|
|
|
if ("2".equalsIgnoreCase(wlyyOutpatientDO.getType())){
|
|
|
data.put("type","16");
|
|
|
msg+=wlyyOutpatientDO.getPatientName()+",您好！ 您有一个视频复诊已被医生取消，取消原因："+cancelValue+"。取消说明："+cancelRemark+"。";
|
|
|
}
|
|
|
data.put("msg",msg);
|
|
|
messageDO.setData(data.toString());
|
|
|
systemMessageService.saveMessage(messageDO);
|
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
|
}
|
|
|
//推送消息到眼科通
|
|
|
BasePatientDO patient = basePatientDao.findById(wlyyOutpatientDO.getPatient());
|
|
|
if ("xm_ykyy_wx".equalsIgnoreCase(wxId)){
|
|
|
ykyyService.pushNotificationToYktPatient(patient.getYktId(),messageDO.getTitle(),data.get("msg").toString());
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
@ -3741,7 +3774,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
|
|
|
" a.total AS \"consultTotal\"," +
|
|
|
" h.org_name AS \"orgName\"," +
|
|
|
" h.org_code AS \"orgCode\"," +
|
|
|
" follow.id AS follow "+
|
|
|
" follow.id AS followid "+
|
|
|
" FROM " +
|
|
|
" base_doctor d " +
|
|
|
" JOIN base_doctor_hospital h ON h.doctor_code = d.id "+
|
mengkang