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

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/sign/FamilyContractService.java

@@ -2182,4 +2182,17 @@ public class FamilyContractService extends BaseService {
    }
    public Integer findPatientCountByAdminTeam(String doctorCode,String teamCode) {
        String sql = "select count(sf.id) " +
                " FROM " +
                " wlyy_sign_family sf " +
                " WHERE " +
                " sf.type = 2 " +
                " AND sf.STATUS >= 0 " +
                " AND ( sf.doctor = ? or sf.doctor_health=? )" +
                " AND sf.admin_team_code =?";
        Object [] parms=new Object[]{doctorCode,doctorCode,teamCode};
        Integer count = jdbcTemplate.queryForObject(sql,parms,Integer.class);
        return count;
    }
}

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

@@ -3,6 +3,7 @@ package com.yihu.wlyy.web.doctor.team;
import java.util.List;
import java.util.Map;
import com.yihu.wlyy.service.app.sign.FamilyContractService;
import io.swagger.annotations.Api;
import org.apache.commons.lang3.StringUtils;
import org.json.JSONArray;
@@ -31,6 +32,10 @@ public class SignTeamController extends BaseController {
    @Autowired
    private DrHealthTeamService drHealthTeamService;
    @Autowired
    private FamilyContractService familyContractService;
    /**
     * 查询医生所有的团队數目
     *
@@ -73,12 +78,14 @@ public class SignTeamController extends BaseController {
    /**
     * 查询指定医生的基本信息接口
     *
     * @param doctor 医生标识
     * @param doctor 医生标识*
     * @param team   行政团队标识
     * @return
     */
    @RequestMapping(value = "info")
    @ResponseBody
    public String info(@RequestParam(required = true,value = "doctor")String doctor) {
    public String info(@RequestParam(required = true, value = "doctor") String doctor,
                       @RequestParam(required = false, value = "team") String team) {
        try {
            Doctor temp = doctorInfoService.findDoctorByCode(doctor);
            if (temp != null) {
@@ -109,6 +116,12 @@ public class SignTeamController extends BaseController {
                json.put("mobile", temp.getMobile());
                // 级别
                json.put("level", temp.getLevel());
                if (!org.springframework.util.StringUtils.isEmpty(team)) {
                    //或者医生在某个行政团队的签约居民总数
                    Integer count = familyContractService.findPatientCountByAdminTeam(temp.getCode(), team);
                    // 级别
                    json.put("signCount", count);
                }
                return write(200, "医生信息查询成功！", "data", json);
            } else {
                return error(-1, "医生信息查询失败！");
@@ -165,17 +178,18 @@ public class SignTeamController extends BaseController {
    /**
     * 求助页面需要的医生查找
     *
     * @return
     */
    @RequestMapping(value = "teamDoctorsAndAdminTeamDoctors", method = RequestMethod.GET)
    @ResponseBody
    public String getTeamDoctorsAndAdminTeamDoctors(Long teamId) {
        try {
            Map<String,List<Doctor>> doctors = drHealthTeamService.getTeamDoctorsAndAdminTeamDoctors("64de930c-5b15-11e6-8344-fa163e8aee56",teamId);
            JSONObject jo=new JSONObject();
            Map<String, List<Doctor>> doctors = drHealthTeamService.getTeamDoctorsAndAdminTeamDoctors("64de930c-5b15-11e6-8344-fa163e8aee56", teamId);
            JSONObject jo = new JSONObject();
            jo.put("zr", addDoctor(doctors.get("zr")));
            jo.put("team", addDoctor(doctors.get("team")));
            return write(200, "查询成功！", "data",jo );
            return write(200, "查询成功！", "data", jo);
        } catch (Exception e) {
            error(e);
            return invalidUserException(e, -1, "查询失败！");
@@ -183,7 +197,7 @@ public class SignTeamController extends BaseController {
    }
    private JSONArray addDoctor(List<Doctor> zr) {
        JSONArray array=new JSONArray();
        JSONArray array = new JSONArray();
        for (Doctor doctor : zr) {
            if (doctor == null) {
                continue;