Merge branch 'dev' of trick9191/patient-co-management into dev

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/specialist/SpecialistService.java

@@ -545,40 +545,40 @@ public class SpecialistService extends BaseService {
            }
            JSONObject josn =  rs.getJSONObject("obj");
            SignFamily sign =  signFamilyDao.findByPatient(josn.getString("patient"));
            Patient p = patientDao.findByCode(josn.getString("patient"));
            Doctor d = doctorDao.findByCode(josn.getString("doctor"));
            // 添加签约申请消息
            Message message = new Message();
            message.setCzrq(new Date());
            message.setCreateTime(new Date());
            message.setContent("您有一个居民开通共管服务!");
            message.setRead(1);//设置未读
            message.setReceiver(sign.getDoctor());//设置接受医生的code
            message.setSender(p.getCode());//设置发送的用户
            message.setSenderName(p.getName());
            message.setCode(getCode());
            message.setTitle("专科医生共管通知");
            message.setType(18);//家庭签约取消信息
            message.setReadonly(0);//是否只读消息
            message.setSex(p.getSex());
            message.setOver("1");//未处理
            message.setRelationCode(relationCode);
            message.setDel("1");
            message.setState(1);
            JSONObject dataJson = new JSONObject();
            dataJson.put("doctor",d.getCode());
            dataJson.put("doctorName",d.getName());
            dataJson.put("hospital",d.getHospital());
            dataJson.put("hospitalName",d.getHospitalName());
            dataJson.put("dept",d.getDept());
            dataJson.put("deptName",d.getDeptName());
            message.setReason(dataJson.toString());
            messageDao.save(message);
            //判断是否有家庭医生，有家庭医生则通知家庭医生
            if(sign!=null){
                Patient p = patientDao.findByCode(josn.getString("patient"));
                Doctor d = doctorDao.findByCode(josn.getString("doctor"));
                // 添加签约申请消息
                Message message = new Message();
                message.setCzrq(new Date());
                message.setCreateTime(new Date());
                message.setContent("您有一个居民开通共管服务!");
                message.setRead(1);//设置未读
                message.setReceiver(sign.getDoctor());//设置接受医生的code
                message.setSender(p.getCode());//设置发送的用户
                message.setSenderName(p.getName());
                message.setCode(getCode());
                message.setTitle("专科医生共管通知");
                message.setType(18);//家庭签约取消信息
                message.setReadonly(0);//是否只读消息
                message.setSex(p.getSex());
                message.setOver("1");//未处理
                message.setRelationCode(relationCode);
                message.setDel("1");
                message.setState(1);
                JSONObject dataJson = new JSONObject();
                dataJson.put("doctor",d.getCode());
                dataJson.put("doctorName",d.getName());
                dataJson.put("hospital",d.getHospital());
                dataJson.put("hospitalName",d.getHospitalName());
                dataJson.put("dept",d.getDept());
                dataJson.put("deptName",d.getDeptName());
                message.setReason(dataJson.toString());
                messageDao.save(message);
            }
            return "1";
        }
        return "0";

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/patient/DoctorPatientGroupController.java

@@ -684,6 +684,13 @@ public class DoctorPatientGroupController extends BaseController {
                    jtJson.put("jyDate", DateUtil.dateToStr(jtSign.getApplyUnsignDate(), DateUtil.YYYY_MM_DD));
                    jtJson.put("status", jtSign.getStatus());
                    Doctor d =  doctorInfoService.findDoctorByCode(jtSign.getDoctor());
                    jtJson.put("doctor",jtSign.getDoctor());
                    jtJson.put("doctorName",jtSign.getDoctorName());
                    jtJson.put("hospital",d.getHospital());
                    jtJson.put("hospitalName",d.getHospitalName());
                    jtJson.put("mobile",d.getMobile());
                    json.put("jtSign", jtJson);
                } else {
                    json.put("jtSign", "");