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

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

@@ -664,7 +664,9 @@ public class DoctorInfoService extends BaseService {
            filters.put("name", new SearchFilter("name", SearchFilter.Operator.LIKE, key));
        }
        filters.put("isFamous", new SearchFilter("isFamous", SearchFilter.Operator.EQ, type));
        if (type == 1) {
            filters.put("isFamous", new SearchFilter("isFamous", SearchFilter.Operator.EQ, type));
        }
        if (level != null && level > 0 && level < 4) {
            filters.put("level", new SearchFilter("level", SearchFilter.Operator.EQ, level));
@@ -677,6 +679,11 @@ public class DoctorInfoService extends BaseService {
        if (doctors.size() > 0) {
            for (Doctor doc : doctors) {
                if (type != 1) {
                    if (doc.getIsFamous() != null && doc.getIsFamous() == 1) {
                        continue;
                    }
                }
                JSONObject iswork = type == 1 ? workTimeService.isFamousDoctorWorking(doc.getCode()) : workTimeService.isDoctorWorking(doc.getCode());
                if (iswork.getString("status").equals("1")) {
                    workingDoctor.add(doc);
@@ -686,11 +693,11 @@ public class DoctorInfoService extends BaseService {
            int start = (page - 1) * pageSize;
            int end = start + pageSize;
            if(end > workingDoctor.size()){
            if (end > workingDoctor.size()) {
                end = workingDoctor.size();
            }
            if(start < workingDoctor.size()) {
            if (start < workingDoctor.size()) {
                returnList = workingDoctor.subList(start, end);
            }
        }

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/sign/FamilyContractService.java

@@ -1051,9 +1051,9 @@ public class FamilyContractService extends BaseService {
            json.put("first", "签约失败通知");
            json.put("toUser", sf.getPatient());
            json.put("doctor", StringUtils.isEmpty(sf.getDoctor()) ? sf.getDoctorHealth() : sf.getDoctor());
            json.put("doctorName", StringUtils.isEmpty(sf.getDoctor()) ? sf.getDoctorHealthName() : sf.getDoctorHealth());
            json.put("doctorName", StringUtils.isEmpty(sf.getDoctor()) ? sf.getDoctorHealthName() : sf.getDoctorName());
            json.put("date", DateUtil.dateToStrShort(new Date()));
            json.put("content", "您与 " + (StringUtils.isEmpty(sf.getDoctor()) ? sf.getDoctorHealthName() : sf.getDoctorHealth()) + " 医生建立家庭医生签约关系失败，请查看！");
            json.put("content", "您与 " + (StringUtils.isEmpty(sf.getDoctor()) ? sf.getDoctorHealthName() : sf.getDoctorName()) + " 医生建立家庭医生签约关系失败，请查看！");
            json.put("remark", "您好，签约家庭医生失败通知");
            // 添加到发送队列
            PushMsgTask.getInstance().putWxMsg(access_token, 2, sf.getOpenid(), sf.getName(), json);