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

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

@@ -1797,13 +1797,13 @@ public class FamilyContractService extends BaseService {
                    jo.put("hasopenid",map.get("hasopenid"));
                    jo.put("age", IdCardUtil.getAgeForIdcard(map.get("idcard").toString()));
                    jo.put("sex", IdCardUtil.getSexForIdcard_new(map.get("idcard").toString()));
                    JSONArray jr = returnMap.getJSONArray(jo.get("labelname").toString());
                    JSONArray jr = returnMap.getJSONArray(map.get("labelname").toString());
                    //判断是否为空
                    if (jr == null) {
                        jr = new JSONArray();
                    }
                    jr.put(jo);
                    returnMap.put(jo.get("labelname").toString(), jr);
                    returnMap.put(map.get("labelname").toString(), jr);
                }
            }
        }
@@ -2124,12 +2124,12 @@ public class FamilyContractService extends BaseService {
                    jo.put("sex", IdCardUtil.getSexForIdcard_new(map.get("idcard").toString()));
                    //判断name是否为空 为空就是未标注
                    //把患者添加到对应的组
                    JSONArray jr = returnMap.getJSONArray(jo.get("labelname").toString());
                    JSONArray jr = returnMap.getJSONArray(map.get("labelname").toString());
                    if (jr == null) {
                        jr = new JSONArray();
                    }
                    jr.put(jo);
                    returnMap.put(jo.get("labelname").toString(), jr);
                    returnMap.put(map.get("labelname").toString(), jr);
                }
            }
        }

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

@@ -856,7 +856,7 @@ public class DoctorFamilyContractController extends WeixinBaseController {
            @RequestParam(required = false) String patientAddr,
            @RequestParam(required = false) String patientName) {
        try {
            JSONArray list = familyContractService.findNoHealthSignFamilyHealthByParams("D20161008002",patientAddr,patientName);
            JSONArray list = familyContractService.findNoHealthSignFamilyHealthByParams(getUID(),patientAddr,patientName);
            return write(200, "签约数据加载成功！", "data", list);
        } catch (Exception e) {
            e.printStackTrace();