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

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/family/FamilyMemberService.java

@@ -251,7 +251,7 @@ public class FamilyMemberService extends BaseService {
                    }
                }
                if (StringUtils.isEmpty(doctorCode)) {
                if (!StringUtils.isEmpty(doctorCode)) {
                    List<PatientInvitationLog> patientInviteLog = patientInviteLogDao.getPatientInviteLog(doctorCode,
                            patient, map.get("code").toString());
                    if (patientInviteLog != null && patientInviteLog.size() > 0 && status != 0) {
@@ -269,7 +269,7 @@ public class FamilyMemberService extends BaseService {
                obj.put("address", StringUtils.isEmpty(String.valueOf(map.get("address"))) ? "" : map.get("address"));
                obj.put("familyRelation", map.get("family_relation"));
                if (StringUtils.isEmpty(doctorCode)) {
                if (!StringUtils.isEmpty(doctorCode)) {
                    obj.put("relaholder", map.get("family_relation"));
                    obj.put("addressCode", "");
                    obj.put("addressName", StringUtils.isEmpty(String.valueOf(map.get("address"))) ? "" : map.get("address"));

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

@@ -56,7 +56,7 @@ public class DoctorFamilyController extends WeixinBaseController {
                }
            }
            return write(200, "查询成功", "list", result.size() > 0 ? new JSONObject(result.values()) : new JSONArray());
            return write(200, "查询成功", "list", result.size() > 0 ? new JSONArray(result.values()) : new JSONArray());
        } catch (Exception e) {
            e.printStackTrace();
            return error(-1, "查询失败！");