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

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/statistics/StatisticsAllService.java

@@ -2709,6 +2709,20 @@ public class StatisticsAllService extends BaseService {
        return rs;
    }
    public List<AdminTeam> translateAdminTeamLeaderName(List<AdminTeam> rs){
        Map<Integer,Map<String,Object>> leaders = getAllTeamLeaders();
        if(rs!=null&&rs.size()>0){
            for(AdminTeam team :rs){
                Integer id = team.getId().intValue();
                String name = getTeamLeaderNameByTeamCode(leaders,id);
                if(org.apache.commons.lang3.StringUtils.isNotBlank(name)){
                    team.setName(name);
                }
            }
        }
        return rs;
    }
    /**
     * 查询某个级别的某个指标到达量

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

@@ -9,6 +9,7 @@ import com.yihu.wlyy.entity.patient.PatientDisease;
import com.yihu.wlyy.repository.patient.PatientDiseaseDao;
import com.yihu.wlyy.service.app.account.DoctorInfoService;
import com.yihu.wlyy.service.app.label.SignPatientLabelInfoService;
import com.yihu.wlyy.service.app.statistics.StatisticsAllService;
import com.yihu.wlyy.service.app.team.AdminTeamService;
import com.yihu.wlyy.util.IdCardUtil;
import com.yihu.wlyy.web.BaseController;
@@ -40,6 +41,9 @@ public class AdminTeamController extends BaseController {
    private AdminTeamService memberService;
    @Autowired
    private SignPatientLabelInfoService signPatientLabelInfoService;
    @Autowired
    private StatisticsAllService statisticsAllService;
    @RequestMapping(value = "/count", method = RequestMethod.GET)
    @ApiOperation(value = "团队数量")
@@ -331,6 +335,8 @@ public class AdminTeamController extends BaseController {
    public String getHospitalTeams(@PathVariable  String hospital){
        try{
            List<AdminTeam> teams =  teamService.findHospitalTeams(hospital);
            statisticsAllService.translateAdminTeamLeaderName(teams);
            return write(200,"查询成功","data",teams);
        }catch (Exception e){
            e.printStackTrace();