得分计算流程优化

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

@@ -3,14 +3,17 @@ package com.yihu.wlyy.service.app.team;
import com.yihu.wlyy.entity.doctor.profile.Doctor;
import com.yihu.wlyy.entity.doctor.team.admin.AdminTeam;
import com.yihu.wlyy.entity.doctor.team.admin.AdminTeamMember;
import com.yihu.wlyy.entity.organization.Hospital;
import com.yihu.wlyy.entity.patient.Patient;
import com.yihu.wlyy.entity.patient.SignFamily;
import com.yihu.wlyy.repository.doctor.DoctorAdminTeamDao;
import com.yihu.wlyy.repository.doctor.DoctorAdminTeamMemberDao;
import com.yihu.wlyy.repository.doctor.DoctorDao;
import com.yihu.wlyy.repository.doctor.DoctorTeamMemberDao;
import com.yihu.wlyy.repository.organization.HospitalDao;
import com.yihu.wlyy.repository.patient.SignFamilyDao;
import com.yihu.wlyy.service.BaseService;
import com.yihu.wlyy.service.app.hospital.HospitalService;
import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.Pair;
import org.json.JSONArray;
@@ -48,6 +51,9 @@ public class AdminTeamService extends BaseService {
    @Autowired
    SignFamilyDao signFamilyDao;
    @Autowired
    HospitalDao hospitalDao;
    /**
     * 获取团队数量。
     *
@@ -372,4 +378,26 @@ public class AdminTeamService extends BaseService {
    public List<AdminTeamMember> findByAdminTeam(String patient,String doctorCode){
        return memberDao.findByAdminTeam(patient,doctorCode);
    }
    public JSONObject getTeamInfo(Integer teamId){
        AdminTeam adminTeam = this.getTeam(teamId);
        JSONObject result = new JSONObject();
        JSONObject teamInfo = new JSONObject(adminTeam);
        Doctor doctor = doctorDao.findByCode(adminTeam.getLeaderCode());
        teamInfo.put("leaderName",doctor.getName());
        Hospital hospital =hospitalDao.findByCode(adminTeam.getOrgCode());
        teamInfo.put("hospitalName",hospital.getName());
        result.put("team",teamInfo);
        List<Doctor> members = memberDao.findAllMembers(teamId);
        List<JSONObject> doctors = new ArrayList<>();
        for(Doctor d:members){
            JSONObject doctorInfo = new JSONObject();
            doctorInfo.put("name",d.getName());
            doctorInfo.put("code",d.getCode());
            doctors.add(doctorInfo);
        }
        result.put("members",doctors);
        return result;
    }
}

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

@@ -313,6 +313,19 @@ public class AdminTeamController extends BaseController {
        }
    }
    @RequestMapping(value = "/teams/info", method = RequestMethod.GET)
    @ApiOperation(value = "查询机构下的团队")
    public String getTeamInfo( @RequestParam(value = "teamId", defaultValue = "0", required = true) int teamId){
        try{
            JSONObject result =  teamService.getTeamInfo(teamId);
            return write(200,"查询成功","data",result);
        }catch (Exception e){
            e.printStackTrace();
            return error(-1,"查询失败");
        }
    }
    @RequestMapping(value = "/teams/{hospital}", method = RequestMethod.GET)
    @ApiOperation(value = "查询机构下的团队")
    public String getHospitalTeams(@PathVariable  String hospital){