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

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/synergy/SynergyManageService.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONArray;
import com.yihu.wlyy.entity.doctor.profile.Doctor;
import com.yihu.wlyy.entity.education.HealthEduArticle;
import com.yihu.wlyy.entity.followup.Followup;
import com.yihu.wlyy.entity.message.Message;
import com.yihu.wlyy.entity.organization.Hospital;
import com.yihu.wlyy.entity.patient.Patient;
import com.yihu.wlyy.entity.patient.SignFamily;
@@ -136,12 +137,14 @@ public class SynergyManageService extends BaseService {
            }else if (followupClass.equals("1")){
                object.put("relationCodeName","糖尿病");
            }
            object.put("createUserRole",1);
        }else if (type == 1){
            object.put("relationCode",objectId);
            HealthEduArticle healthEduArticle = healthEduArticleDao.findByCode(objectId);
            if (healthEduArticle != null){
                object.put("relationCodeName",healthEduArticle.getTitle());
            }
            object.put("createUserRole",1);
        }else if (type == 5){
            object.put("relationCode",objectId);
            object.put("relationCodeName","疾病筛查");
@@ -153,6 +156,8 @@ public class SynergyManageService extends BaseService {
        response = httpClientUtil.httpPost(url,params);
        com.alibaba.fastjson.JSONObject object1 = JSON.parseObject(response);
        if (object1.getInteger("status")==200){
            Message message = new Message();
            return response;
        }else {
            throw new Exception("请求客服系统服务失败！");