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

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/consult/ConsultTeamService.java

@@ -708,39 +708,39 @@ public class ConsultTeamService extends ConsultService {
            ct.setTeam(sf.getTeamCode());
            // 设置健康管理师，家庭医生咨询默认给健康管理师处理
            //查找病人所在的团队
            //1.3.3.2 更改从签约记录判断团队成员
//            if(StringUtils.isNotBlank(sf.getDoctorHealth())) {
//                users.put(sf.getDoctorHealth(), 0);
//                ct.setDoctor(sf.getDoctorHealth());
//                if (StringUtils.isNotBlank(sf.getDoctor())) {
//                    if (users.isNull(sf.getDoctor())) {
//                        users.put(sf.getDoctor(), 1);
////                    }
            //1.3.3.2 更改从签约记录判断团队成员,分配建管师
            if(StringUtils.isNotBlank(sf.getDoctorHealth())) {
                users.put(sf.getDoctorHealth(), 0);
                ct.setDoctor(sf.getDoctorHealth());
                if (StringUtils.isNotBlank(sf.getDoctor())) {
                    if (users.isNull(sf.getDoctor())) {
                        users.put(sf.getDoctor(), 1);
//                    }
//                } else {
//                    ct.setDoctor(sf.getDoctor());
//                    users.put(sf.getDoctor(), 0);
//                }
//            }
            DoctorTeam doctorTeam = doctorTeamDao.findByParientCode(patient);
            //得到团队的健康管理师
            DoctorTeamMember doctorTeamMemberHealthy = doctorTeamDoctor.findDoctorJiating2ByTeam(doctorTeam.getCode(), 3);
            DoctorTeamMember doctorTeamMember = doctorTeamDoctor.findDoctorJiating2ByTeam(doctorTeam.getCode(), 2);
            if (doctorTeamMemberHealthy == null) {
                ct.setDoctor(doctorTeamMember.getMemberCode());
                users.put(doctorTeamMember.getMemberCode(), 0);
            } else {
                users.put(doctorTeamMemberHealthy.getMemberCode(), 0);
                if (doctorTeamMember != null) {
                    //全健同一个人导致会话成员状态问题处理
                    if (users.isNull(doctorTeamMember.getMemberCode())) {
                        users.put(doctorTeamMember.getMemberCode(), 1);
                    }
                } else {
                    ct.setDoctor(sf.getDoctor());
                    users.put(sf.getDoctor(), 0);
                }
                ct.setDoctor(doctorTeamMemberHealthy.getMemberCode());
            }
//            DoctorTeam doctorTeam = doctorTeamDao.findByParientCode(patient);
//            //得到团队的健康管理师
//            DoctorTeamMember doctorTeamMemberHealthy = doctorTeamDoctor.findDoctorJiating2ByTeam(doctorTeam.getCode(), 3);
//            DoctorTeamMember doctorTeamMember = doctorTeamDoctor.findDoctorJiating2ByTeam(doctorTeam.getCode(), 2);
//            if (doctorTeamMemberHealthy == null) {
//                ct.setDoctor(doctorTeamMember.getMemberCode());
//                users.put(doctorTeamMember.getMemberCode(), 0);
//            } else {
//                users.put(doctorTeamMemberHealthy.getMemberCode(), 0);
//                if (doctorTeamMember != null) {
//                    //全健同一个人导致会话成员状态问题处理
//                    if (users.isNull(doctorTeamMember.getMemberCode())) {
//                        users.put(doctorTeamMember.getMemberCode(), 1);
//                    }
//                }
//                ct.setDoctor(doctorTeamMemberHealthy.getMemberCode());
//            }
            // 设置家庭医生
            ct.setAdminTeamId(sf.getAdminTeamId());
        }

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

@@ -11,6 +11,7 @@ import com.yihu.wlyy.repository.doctor.DoctorDao;
import com.yihu.wlyy.repository.organization.HospitalDao;
import com.yihu.wlyy.repository.statistics.PopulationBaseDao;
import com.yihu.wlyy.service.BaseService;
import com.yihu.wlyy.service.app.team.AdminTeamService;
import com.yihu.wlyy.util.DateUtil;
import com.yihu.wlyy.util.MapListUtils;
import org.json.JSONArray;
@@ -2196,4 +2197,12 @@ public class StatisticsService extends BaseService {
        JSONArray js = new JSONArray(rs);
        return js;
    }
    public int checkDoctorIsTeamleader(String doctor){
        AdminTeam team = adminTeamDao.findByLeaderCode(doctor);
        if(team!=null){
            return 1;
        }
        return 0;
    }
}

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

@@ -581,20 +581,38 @@ public class PatientController extends WeixinBaseController {
            //查询家庭签约
            SignFamily jt = familyContractService.findByPatientYes(id);
            if (jt != null) {
                List<Object> doctors = doctorTeamService.findJiatingTeamDoctorsObj(id);
                if (doctors != null) {
                    for (Object doctor : doctors) {
                        if (doctor == null) {
                            continue;
                        }
                        Object[] docArray = (Object[]) doctor;
                        JSONObject doctorJson = new JSONObject();
                        doctorJson.put("code", docArray[0]);
                        doctorJson.put("name", docArray[1]);
                        doctorJson.put("level", docArray[2]);
                        doctorJson.put("teamlevel", docArray[3]);
//                List<Object> doctors = doctorTeamService.findJiatingTeamDoctorsObj(id);
//                if (doctors != null) {
//                    for (Object doctor : doctors) {
//                        if (doctor == null) {
//                            continue;
//                        }
//                        Object[] docArray = (Object[]) doctor;
//                        JSONObject doctorJson = new JSONObject();
//                        doctorJson.put("code", docArray[0]);
//                        doctorJson.put("name", docArray[1]);
//                        doctorJson.put("level", docArray[2]);
//                        doctorJson.put("teamlevel", docArray[3]);
//                        familyDoctors.add(doctorJson);
//                    }
//                }
                //设置全科医生
                if(StringUtils.isNotBlank(jt.getDoctor())){
                    JSONObject doctorJson = new JSONObject();
                        doctorJson.put("code",jt.getDoctor());
                        doctorJson.put("name", jt.getDoctorName());
                        doctorJson.put("level", 2);
                        doctorJson.put("teamlevel", 2);
                        familyDoctors.add(doctorJson);
                    }
                }
                //设置建管师
                if(StringUtils.isNotBlank(jt.getDoctorHealth())){
                    JSONObject doctorJson = new JSONObject();
                    doctorJson.put("code",jt.getDoctorHealth());
                    doctorJson.put("name", jt.getDoctorHealthName());
                    doctorJson.put("level", 3);
                    doctorJson.put("teamlevel", 3);
                    familyDoctors.add(doctorJson);
                }
            }
            // 查询三师医生

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/statistic/StatisticsController.java

@@ -825,5 +825,20 @@ public class StatisticsController extends BaseController {
        }
    }
    /**
     * 判断团队是否是团队长
     * @return
     */
    @RequestMapping("/checkDoctorIsTeamLeder")
    @ResponseBody
    public String checkDoctorIsTeamLeder(){
        try {
            return write(200, "查询成功", "data", statisticsService.checkDoctorIsTeamleader(getUID()));
        } catch (Exception e) {
            error(e);
            return error(-1, "查询失败");
        }
    }
}