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

common/common-entity/src/main/java/com/yihu/wlyy/entity/login/LoginLog.java

@@ -18,6 +18,7 @@ public class LoginLog  extends IdEntity {
    private String userType;//1 患者 2医生
    private Long tokenId;//登录的tokenid
    private String type;//登录成功1 成功 2失败
    private Integer platform;//1患者端，2医生端app，3微信公众号wechat,4 IM医生端pc, PC端取药系统,5医生助手公众号
    private Date createTime;//创建时间
    private String errorMessage;//错误信息
    private String phone;//电话号码
@@ -94,4 +95,12 @@ public class LoginLog  extends IdEntity {
    public void setAppVersion(String appVersion) {
        this.appVersion = appVersion;
    }
    public Integer getPlatform() {
        return platform;
    }
    public void setPlatform(Integer platform) {
        this.platform = platform;
    }
}

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

@@ -237,6 +237,30 @@ public class AdminTeamService extends BaseService {
        return memberDao.findDoctorTeams(doctorCode);
    }
    /**
     * 获取行政团队，包括团队签约人数
     * @param doctorCode
     * @return
     */
    public com.alibaba.fastjson.JSONArray getAdminTeamSignCount(String doctorCode){
        List<AdminTeam> adminTeams = memberDao.findDoctorTeams(doctorCode);
        com.alibaba.fastjson.JSONArray re = new com.alibaba.fastjson.JSONArray();
        for(AdminTeam one:adminTeams){
            //获取团队签约数
            Integer signCount = signFamilyDao.findByAdminTeamIdAndStatus(one.getId(),0);
            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
            json.put("id",one.getId());
            json.put("name",one.getName());
            json.put("createTime",one.getCreateTime());
            json.put("leaderCode",one.getLeaderCode());
            json.put("available",one.isAvailable());
            json.put("orgCode",one.getOrgCode());
            json.put("signCount",signCount);
            re.add(json);
        }
        return re;
    }
    /**
     * 获取行政团队
     * @param doctorCode

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/common/account/LoginController.java

@@ -121,6 +121,7 @@ public class LoginController extends BaseController {
        loginLog.setPhone(mobile);
        loginLog.setType("2");
        loginLog.setUserType("2");
        loginLog.setPlatform(platform);
        loginLog.setAppVersion(super.getAppVersion());
        try {
            if (StringUtils.isEmpty(getIMEI())) {

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

@@ -273,6 +273,17 @@ public class AdminTeamController extends BaseController {
        }
    }
    @RequestMapping(value = "/team/{doctor_code}/adminteams", method = RequestMethod.GET)
    @ApiOperation(value = "获取医生团队列表(包括团队签约人数)")
    public String getAdminTeamSignCount(@PathVariable("doctor_code") String doctorCode) {
        try {
            return write(200, "OK", "data", teamService.getAdminTeamSignCount(doctorCode));
        } catch (Exception e) {
            error(e);
            return error(-1, e.getMessage());
        }
    }
    @RequestMapping(value = "/team/{doctor_code}/teamsLimit", method = RequestMethod.GET)
    @ApiOperation(value = "获取医生团队列表(获取基位签约上线)")
    public String getDoctorTeamLimit(@PathVariable("doctor_code") String doctorCode){