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

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/config/SwaggerConfig.java

@@ -194,7 +194,8 @@ public class SwaggerConfig {
                        regex("/esstatistics/.*"),
                        regex("/old/statistics/.*"),
                        regex("/questionnaire/.*"),
                        regex("/rehabilitation/.*")
                        regex("/rehabilitation/.*"),
                        regex("/specialist/.*")
                ))
                .build()
                .apiInfo(otherApiInfo());

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

@@ -113,6 +113,7 @@ public class SpecialistEvaluateSevice extends BaseService {
    /**
     * 发送消息 type:19 受理提醒，20 待办工作提醒 21 服务进展提醒-已完成 22 服务进展提醒-未完成
     */
    public JSONObject sendMessage(Message message,String hospitalCode,String patientCode,Integer num){
        JSONObject object = new JSONObject();
        try {
@@ -121,7 +122,7 @@ public class SpecialistEvaluateSevice extends BaseService {
                hospital = hospitalDao.findByCode(hospitalCode);
            }
            Patient patient = patientDao.findByCode(patientCode);
            Doctor sendDoctor = doctorDao.findByCode(message.getSender());
//            Doctor sendDoctor = doctorDao.findByCode(message.getSender());
            Doctor receiverDoctor = doctorDao.findByCode(message.getReceiver());
            if (message.getType() == 19 ){
                message.setType(19);
@@ -144,17 +145,18 @@ public class SpecialistEvaluateSevice extends BaseService {
                message.setTitle("康复计划-服务进展提醒");
                message.setContent("您的"+patient.getName()+"签约居民今日有"+num+"个康复计划项目待完成，请尽快处理");
            }
            message.setSenderName(sendDoctor.getName());
            message.setCode(getCode());
            message.setSenderPhoto(sendDoctor.getPhoto());
//            message.setSenderName(sendDoctor.getName());
//            message.setSenderPhoto(sendDoctor.getPhoto());
//            message.setSex(sendDoctor.getSex());
            message.setReadonly(1);//是否只读消息
            message.setSex(sendDoctor.getSex());
            message.setOver("1");//未处理
            message.setDel("1");
            message.setState(1);
            message.setCzrq(new Date());
            message.setReceiverName(receiverDoctor.getName());
            message.setData(patientCode);
            message.setCreateTime(new Date());
            messageDao.save(message);
        }catch (Exception e){
            e.printStackTrace();

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

@@ -575,15 +575,18 @@ public class RehabilitationManageService extends BaseService {
        String doctor = "";
        String patient ="";
        Integer num = null;
        JSONArray planDetailIds = null;
        for(int i=0;i<jsonArray.length();i++){
            jsonObject = jsonArray.getJSONObject(i);
            doctor = jsonObject.get("doctor")+"";//执行的医生（接收的医生）
            patient = jsonObject.get("patient")+"";//执行的居民
            num = (Integer)jsonObject.get("num");//需要今日需要执行的项目数
            planDetailIds = (JSONArray)jsonObject.get("planDetailIds");
            Message message1 = new Message();
            message1.setSender(null);
//            message1.setSender(patient);
            message1.setType(type);
            message1.setReceiver(doctor);
            message1.setRelationCode(planDetailIds.toString());
            specialistEvaluateSevice.sendMessage(message1,null,patient,num);
        }
    }