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

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/label/SignPatientLabelInfoService.java

@@ -394,7 +394,7 @@ public class SignPatientLabelInfoService extends BaseService {
                        "    t1.* " +
                        " FROM " +
                        "    wlyy_sign_family t1, " +
                        "    wlyy_sign_patient_label_info t2 " +
                        "    wlyy_sign_patient_label_info t2, " +
                        "    wlyy_patient p "+
                        " WHERE " +
                        "    t2.label = ? " +

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

@@ -1169,6 +1169,18 @@ public class SignWebService extends BaseService {
            }
            if ("followup_class".equals(key)) {
                String followupClassName = systemDictService.getDictValue("FOLLOWUP_CLASS_DICT", map.get(key) + "");
                String followupClass = map.get(key).toString();
                if (StringUtils.isNoneBlank(followupClass) && followupClass.contains(",")) {
                    String[] followupClassArray = followupClass.split(",");
                    followupClassName = "";
                    for (int i = 0; i < followupClassArray.length; i++) {
                        followupClassName += systemDictService.getDictValue("FOLLOWUP_CLASS_DICT", followupClassArray[i]);
                        if (i != followupClassArray.length - 1) {
                            followupClassName += ",";
                        }
                    }
                }
                
                resultObject.put("followup_class_name", followupClassName);
            }
            if ("followup_manager_status".equals(key)) {

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/patient/DoctorPatientGroupController.java

@@ -141,6 +141,8 @@ public class DoctorPatientGroupController extends BaseController {
                        Date qyrq = (Date) object[10];
                        //患者身份证
                        Object idcard = object[12];
                        //微信openid
                        Object openid = object[13];
                        if (StringUtils.equals(group, grouplist.getCode())) {
                            if (patientsMap.containsKey(object[1].toString())) {
                                if ((patientsMap.get(object[1].toString()).get("signType").toString().equals("1") || patientsMap.get(object[1].toString()).get("signType").toString().equals("2")) &&
@@ -174,6 +176,7 @@ public class DoctorPatientGroupController extends BaseController {
                            // 设置签约类型
                            patientJson.put("signType", signType);
                            patientJson.put("idcard", idcard);
                            patientJson.put("openid",openid);
                            String diseases = redisTemplate.opsForValue().get("disease:" + code.toString());
                            if (!StringUtils.isEmpty(diseases)) {