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

@@ -537,12 +537,23 @@ public class SpecialistService extends BaseService {
        JSONObject rs = new JSONObject(response.getContent());
        if ("succes".equals(rs.getString("message"))) {
            //置空消息
            if (mesId != null) {
                Message m = messageDao.findOne(mesId);
                m.setOver("0");
                m.setRead(0);
                messageDao.save(m);
            }
            //如果医生拒绝，置空疾病服务类型
            if("0".equals(state)){
               List<PatientDiseaseServer> servers =  patientDiseaseServerDao.findBySpecialistRelationCodeAndDel(relationCode,"1");
               for (PatientDiseaseServer server:servers){
                   server.setDel("0");
               }
                patientDiseaseServerDao.save(servers);
            }
            JSONObject josn =  rs.getJSONObject("obj");
            SignFamily sign =  signFamilyDao.findByPatient(josn.getString("patient"));
            //判断是否有家庭医生，有家庭医生则通知家庭医生

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/wechat/process/WeiXinEventProcess.java

@@ -446,7 +446,7 @@ public class WeiXinEventProcess {
            // 图文信息
            List<Map<String, String>> articles = new ArrayList<>();
            // 二维码参数
            String[] keys = eventKey.replace("sp_disease_", "").split("_");
            String[] keys = eventKey.replace("qrscene_","").replace("sp_disease_", "").split("_");
            //设置图文消息
            setSpDisease(articles,keys[0],keys[1],systemConf);
            // 构建回复消息XMLs
@@ -819,7 +819,7 @@ public class WeiXinEventProcess {
            // 图文信息
            List<Map<String, String>> articles = new ArrayList<>();
            // 二维码参数
            String[] keys = eventKey.replace("sp_disease_", "").split("_");
            String[] keys = eventKey.replace("qrscene_","").replace("sp_disease_", "").split("_");
            //设置图文消息
            setSpDisease(articles,keys[0],keys[1],systemConf);
            // 构建回复消息XMLs
@@ -829,12 +829,12 @@ public class WeiXinEventProcess {
        return result;
    }
    public void setSpDisease(List<Map<String, String>> articles,String teamId,String doctor,Properties systemConf){
    public void setSpDisease(List<Map<String, String>> articles,String doctor,String teamId,Properties systemConf){
        String url = systemDictDao.findByDictName("SP_DISEASE").get(0).getCode();
        url = url.replace("{server}", wechat_base_url)
                 .replace("{appId}", appId)
                 .replace("{data}",doctor+"_"+teamId);
                 .replace("{data}",teamId+"_"+doctor);
        logger.info("setSpDisease:"+url);
        // 图文消息图片URL