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

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

@@ -775,9 +775,14 @@ public class DoctorFamilyContractController extends WeixinBaseController {
                    json.put("signCode", sf.getCode());//签约code
                    json.put("code", sf.getPatient());//患者code
                    json.put("name", sf.getName());//患者name
                    String idcard=sf.getIdcard();
                    json.put("age",IdCardUtil.getAgeForIdcard(idcard) );//患者年龄
                    json.put("sex",IdCardUtil.getSexForIdcard(idcard) );//患者性别
                    String idcard = sf.getIdcard();
                    if (StringUtils.isNotBlank(idcard) && (idcard.length() == 15 || idcard.length() == 18)) {
                        json.put("age", IdCardUtil.getAgeForIdcard(idcard));//患者年龄
                        json.put("sex", IdCardUtil.getSexForIdcard(idcard));//患者性别
                    } else{
                        json.put("age", "");//患者年龄
                        json.put("sex","");//患者性别
                    }
                    array.put(json);
                }
            }