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

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/account/PatientController.java

@@ -553,12 +553,11 @@ public class PatientController extends WeixinBaseController {
    @ResponseBody
    public String signDoctors() {
        try {
            Map<String, JSONObject> teamDoctors = new HashMap<>();
            Map<String, JSONObject> familyDoctors = new HashMap<>();
            List<JSONObject> teamDoctors = new ArrayList<>();
            List<JSONObject> familyDoctors = new ArrayList<>();
            String id = getUID();
            //查询家庭签约
            SignFamily jt = familyContractService.findByPatientYes(id);
            Map<String, Object> docMap = new HashMap<>();
            if (jt != null) {
                List<Object> doctors = doctorTeamService.findJiatingTeamDoctorsObj(id);
                if (doctors != null) {
@@ -572,7 +571,7 @@ public class PatientController extends WeixinBaseController {
                        doctorJson.put("name", docArray[1]);
                        doctorJson.put("level", docArray[2]);
                        doctorJson.put("teamlevel", docArray[3]);
                        familyDoctors.put(docArray[0].toString(), doctorJson);
                        familyDoctors.add(doctorJson);
                    }
                }
            }
@@ -591,7 +590,7 @@ public class PatientController extends WeixinBaseController {
                        doctorJson.put("name", docArray[1]);
                        doctorJson.put("level", docArray[2]);
                        doctorJson.put("teamlevel", docArray[3]);
                        teamDoctors.put(docArray[0].toString(), doctorJson);
                        teamDoctors.add(doctorJson);
                    }
                }
            }
@@ -611,8 +610,8 @@ public class PatientController extends WeixinBaseController {
            json.put("status", 200);
            json.put("msg", "获取签约状态成功！");
            json.put("data", sign);
            json.put("teamDoctors", teamDoctors.size() > 0 ? new JSONArray(teamDoctors.values()) : new JSONArray());
            json.put("familyDoctors", familyDoctors.size() > 0 ? new JSONArray(familyDoctors.values()) : new JSONArray());
            json.put("teamDoctors", teamDoctors.size() > 0 ? new JSONArray(teamDoctors) : new JSONArray());
            json.put("familyDoctors", familyDoctors.size() > 0 ? new JSONArray(familyDoctors) : new JSONArray());
            return json.toString();
        } catch (Exception e) {
            error(e);