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

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

@@ -190,9 +190,10 @@ public class FamilyMemberService extends BaseService {
            result.put("isRegister", 0);
        } else {
            result.put("isRegister", 1);
            result.put("mobile", p.getMobile());
            result.put("name", p.getName());
            result.put("code", p.getCode());
            result.put("mobile", StringUtils.isEmpty(p.getMobile()) ? "" :p.getMobile());
            result.put("name", StringUtils.isEmpty(p.getName()) ? "" :p.getName());
            result.put("code", StringUtils.isEmpty(p.getCode()) ? "" :p.getCode());
            result.put("photo", StringUtils.isEmpty(p.getPhoto()) ? "" : p.getPhoto());
        }
        return result;

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

@@ -89,6 +89,7 @@ public class DoctorHealthController extends BaseController {
				modelJson.put("value7", model.getValue7());
				modelJson.put("type", model.getType());
				modelJson.put("date", DateUtil.dateToStr(model.getRecordDate(), DateUtil.YYYY_MM_DD));
				modelJson.put("sortDate", DateUtil.dateToStrLong(model.getSortDate()));
				modelJson.put("czrq", DateUtil.dateToStr(model.getCzrq(), DateUtil.YYYY_MM_DD_HH_MM_SS));
				jsonArray.put(modelJson);
			}