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

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/account/DoctorInfoService.java

@@ -306,8 +306,6 @@ public class DoctorInfoService extends BaseService {
    /**
     * 根据医院信息获取医生列表
     *
     * @param query    查询条件 ：医生名称
     * @param page
     * @param hospital 医院标识
     *                 页数
     * @return
@@ -334,7 +332,6 @@ public class DoctorInfoService extends BaseService {
//        filters.put("level", new SearchFilter("level", Operator.EQ, 2));
//        return doctorDao.getDoctorListByHospital(query,hospital,2, pageRequest);
//    }
    @Transactional
    public List<Doctor> getDoctorCombobxByHospital(String type, String hospital) {
@@ -355,7 +352,7 @@ public class DoctorInfoService extends BaseService {
    }
    @Transactional
    public Page<Doctor> getDoctorListByHospital(String name, String hospital, Integer page, Integer pageSize,Integer level) {
    public Page<Doctor> getDoctorListByHospital(String name, String hospital, Integer page, Integer pageSize, Integer level) {
        if (pageSize == null | pageSize <= 0) {
            pageSize = 10;
        }
@@ -371,8 +368,9 @@ public class DoctorInfoService extends BaseService {
        if (StringUtils.isNotEmpty(name)) {
            filters.put("name", new SearchFilter("name", SearchFilter.Operator.LIKE, name));
        }
        filters.put("hospital", new SearchFilter("hospital", SearchFilter.Operator.EQ, hospital));
        if (StringUtils.isNotEmpty(hospital)) {
            filters.put("hospital", new SearchFilter("hospital", Operator.LIKE, "%" + hospital.substring(0, 8) + "%"));
        }
        filters.put("level", new SearchFilter("level", SearchFilter.Operator.EQ, level));
        Specification<Doctor> spec = DynamicSpecifications.bySearchFilter(filters.values(), Doctor.class);
@@ -880,15 +878,15 @@ public class DoctorInfoService extends BaseService {
        }
        //判断是否判定openId,有没有发则查找家人发送
        if(StringUtils.isNotBlank(p.getOpenid())){
        if (StringUtils.isNotBlank(p.getOpenid())) {
            PushMsgTask.getInstance().putWxMsg(accessTokenUtils.getAccessToken(), 10, p.getOpenid(), p.getName(), data);
        }else{
            JSONObject json  = weiXinOpenIdUtils.getFamilyOpenId(p.getCode());
        } else {
            JSONObject json = weiXinOpenIdUtils.getFamilyOpenId(p.getCode());
            Patient member = (Patient) json.get("member");
            if(StringUtils.isNotBlank(member.getOpenid())){
            if (StringUtils.isNotBlank(member.getOpenid())) {
                String first = (String) data.get("first");
                data.remove("first");
                data.put("first",weiXinOpenIdUtils.getTitleMes(p,json.getInt("relation"),member.getName())+first);
                data.put("first", weiXinOpenIdUtils.getTitleMes(p, json.getInt("relation"), member.getName()) + first);
                PushMsgTask.getInstance().putWxMsg(accessTokenUtils.getAccessToken(), 10, member.getOpenid(), member.getName(), data);
            }
@@ -906,8 +904,8 @@ public class DoctorInfoService extends BaseService {
        for (int i = 0; i < patiensString.length; i++) {
            try {
                updateTeamHealthDoctor(newDoctorCode, oldDoctorCode, patiensString[i]);
                SignFamily signFamily = signFamilyDao.findByPatient( patiensString[i]);
                ImUtill.deleteMucUser(newDoctorCode, oldDoctorCode, patiensString[i] + "_"+signFamily.getTeamCode()+"_2");
                SignFamily signFamily = signFamilyDao.findByPatient(patiensString[i]);
                ImUtill.deleteMucUser(newDoctorCode, oldDoctorCode, patiensString[i] + "_" + signFamily.getTeamCode() + "_2");
                successs++;
            } catch (Exception e) {
                error++;
@@ -940,7 +938,7 @@ public class DoctorInfoService extends BaseService {
                        hasNoTeam = true;
                    }
                    SignFamily signFamily = signFamilyDao.findByPatient(patient);
                    ImUtill.deleteMucUser(newDoctorCode, doctor, patient + "_"+signFamily.getTeamCode()+"_2");
                    ImUtill.deleteMucUser(newDoctorCode, doctor, patient + "_" + signFamily.getTeamCode() + "_2");
                } catch (Exception e) {
                    e.printStackTrace();
                }
@@ -995,16 +993,16 @@ public class DoctorInfoService extends BaseService {
            data.put("remark", newD.getName() + "医生与" + signFamily.getDoctorName() + "医生一道，为您提供优质健康服务");
        }
        if(StringUtils.isNotBlank(p.getOpenid())){
        if (StringUtils.isNotBlank(p.getOpenid())) {
            PushMsgTask.getInstance().putWxMsg(accessTokenUtils.getAccessToken(), 10, p.getOpenid(), p.getName(), data);
        }else{
        } else {
            JSONObject json = weiXinOpenIdUtils.getFamilyOpenId(p.getCode());
            Patient member = (Patient)json.get("member");
            Patient member = (Patient) json.get("member");
            if(StringUtils.isNotBlank(member.getOpenid())){
            if (StringUtils.isNotBlank(member.getOpenid())) {
                String first = (String) data.get("first");
                data.remove("first");
                data.put("first",weiXinOpenIdUtils.getTitleMes(p,json.getInt("relation"),member.getName())+first);
                data.put("first", weiXinOpenIdUtils.getTitleMes(p, json.getInt("relation"), member.getName()) + first);
                PushMsgTask.getInstance().putWxMsg(accessTokenUtils.getAccessToken(), 10, member.getOpenid(), member.getName(), data);
            }
        }
@@ -1126,7 +1124,7 @@ public class DoctorInfoService extends BaseService {
        for (int i = 0; i < patiensString.length; i++) {
            try {
                SignFamily signFamily = signFamilyDao.findByPatient(patiensString[i]);
                ImUtill.deleteMucUser(newDoctorCode, oldDoctorCode, patiensString[i] + "_"+signFamily.getTeamCode()+"_2");
                ImUtill.deleteMucUser(newDoctorCode, oldDoctorCode, patiensString[i] + "_" + signFamily.getTeamCode() + "_2");
                updateTeamDoctor(newDoctorCode, oldDoctorCode, patiensString[i]);
                successs++;
            } catch (Exception e) {
@@ -1197,16 +1195,16 @@ public class DoctorInfoService extends BaseService {
            data.put("remark", newD.getName() + "医生与" + signFamily.getDoctorHealthName() + "医生一道，为您提供优质健康服务");
        }
        if(StringUtils.isNotBlank(p.getOpenid())){
        if (StringUtils.isNotBlank(p.getOpenid())) {
            data.put("first", p.getName() + "，您好！因签约团队内分工调整，您的责任医生有变动，" + oldDoctorName +
                    "医生无法继续为您服务，具体变动如下：");
            PushMsgTask.getInstance().putWxMsg(accessTokenUtils.getAccessToken(), 10, p.getOpenid(), p.getName(), data);
        }else{
        } else {
            //如果自己没有绑定,则发给家人
            JSONObject json = weiXinOpenIdUtils.getFamilyOpenId(p.getCode());
            Patient member = (Patient)json.get("member");
            if(StringUtils.isNotBlank(member.getOpenid())){
                data.put("first", weiXinOpenIdUtils.getTitleMes(p,(int)json.get("relation"),member.getName())+p.getName() + "，您好！因签约团队内分工调整，您的责任医生有变动，" + oldDoctorName +
            Patient member = (Patient) json.get("member");
            if (StringUtils.isNotBlank(member.getOpenid())) {
                data.put("first", weiXinOpenIdUtils.getTitleMes(p, (int) json.get("relation"), member.getName()) + p.getName() + "，您好！因签约团队内分工调整，您的责任医生有变动，" + oldDoctorName +
                        "医生无法继续为您服务，具体变动如下：");
                PushMsgTask.getInstance().putWxMsg(accessTokenUtils.getAccessToken(), 10, member.getOpenid(), member.getName(), data);
            }

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/hosptail/HospitalWithoutFilterController.java

@@ -41,6 +41,7 @@ public class HospitalWithoutFilterController extends BaseController {
            @RequestParam(required = true) Integer pageSize) {
        try {
            //只查全科
            Page<Doctor> doctorList = doctorInfoService.getDoctorListByHospital(query, hospital, page, pageSize,2);
            JSONArray array = new JSONArray();
            if (doctorList != null) {