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

src/main/java/com/yihu/wlyy/repository/doctor/DoctorAdminTeamDao.java

@@ -73,4 +73,7 @@ public interface DoctorAdminTeamDao extends
    @Query(" from AdminTeam t")
    List<AdminTeam> findAllTeam();
    @Query("SELECT t from AdminTeam t WHERE t.leaderCode = :leaderCode")
    AdminTeam findByLeaderCode(@Param("leaderCode") String leaderCode);
}

src/main/java/com/yihu/wlyy/service/app/team/AdminTeamService.java

@@ -283,4 +283,8 @@ public class AdminTeamService extends BaseService {
    private void saveMember(AdminTeamMember member) {
        memberDao.save(member);
    }
    public AdminTeam findByLeaderCode(String leaderCode){
        return teamDao.findByLeaderCode(leaderCode);
    }
}

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

@@ -760,12 +760,12 @@ public class DoctorFamilyContractController extends WeixinBaseController {
                        continue;
                    }
                    JSONObject json = new JSONObject();
                    json.put("code", sf.getCode());//签约code
                    json.put("patientCode", sf.getPatient());//患者code
                    json.put("patientName", sf.getName());//患者name
                    json.put("signCode", sf.getCode());//签约code
                    json.put("code", sf.getPatient());//患者code
                    json.put("name", sf.getName());//患者name
                    String idcard=sf.getIdcard();
                    json.put("patientAge",IdCardUtil.getAgeForIdcard(idcard) );//患者年龄
                    json.put("patientSex",IdCardUtil.getSexForIdcard(idcard) );//患者性别
                    json.put("age",IdCardUtil.getAgeForIdcard(idcard) );//患者年龄
                    json.put("sex",IdCardUtil.getSexForIdcard(idcard) );//患者性别
                    array.put(json);
                }
            }

src/main/java/com/yihu/wlyy/web/doctor/team/AdminTeamController.java

@@ -174,6 +174,22 @@ public class AdminTeamController extends BaseController {
        }
    }
    @RequestMapping(value = "/team/{doctor_code}/team", method = RequestMethod.GET)
    @ApiOperation(value = "获取团队长团队")
    @ResponseBody
    public String getLeaderTeam(@PathVariable("doctor_code") String doctorCode) {
        try {
            AdminTeam team = teamService.findByLeaderCode(doctorCode);
            if(team == null){
                return error(-2, "没有找到数据！");
            }
            return write(200, "OK", "data", new JSONObject(team));
        } catch (Exception e) {
            error(e);
            return error(-1, e.getMessage());
        }
    }
    @RequestMapping(value = "/team/{doctor_code}/teams", method = RequestMethod.GET)
    @ApiOperation(value = "获取医生团队列表")
    public String getDoctorTeams(@PathVariable("doctor_code") String doctorCode) {