Merge branch 'dev' of liuwenbin/wlyy2.0 into dev

svr/svr-patient/src/main/java/com/yihu/jw/patient/endpoint/myFamily/MyFamilyEndpoint.java

@@ -48,9 +48,11 @@ public class MyFamilyEndpoint extends EnvelopRestEndpoint {
    @ApiOperation(value = "签约界面已绑定家人信息")
    public Envelop getBindingList(
            @ApiParam(name = "patient", value = "居民code", required = false)
            @RequestParam(value = "patient",required = false) String patient) throws Exception {
            @RequestParam(value = "patient",required = false) String patient,
            @ApiParam(name = "packageId", value = "服务包id", required = false)
            @RequestParam(value = "packageId",required = false) String packageId) throws Exception {
        try{
            List<Map<String,Object>> basePatients = myFamilyService.getBindingList(getUID(patient));
            List<Map<String,Object>> basePatients = myFamilyService.getBindingList(getUID(patient),packageId);
            return success(basePatients);
        }catch (Exception e){
            e.printStackTrace();