修改bug

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

@@ -2054,7 +2054,7 @@ public class FamilyContractService extends BaseService {
        return returnMap;
    }
    public JSONObject getPatientByLable(String doctorCode, String labelType) throws Exception {
    public JSONObject getPatientByLable(String doctorCode, String labelType,String level) throws Exception {
        JSONObject returnMap = new JSONObject();
        Doctor doctor = doctorDao.findByCode(doctorCode);
        //判断当前用户是健康管理师还是全科
@@ -2082,7 +2082,7 @@ public class FamilyContractService extends BaseService {
            //查找居民
            datas = jdbcTemplate.queryForList(sql, labelType, doctorCode);
        } else if (doctor.getLevel() == 2) {
            //健康管理师
            //全科
            String sql = "SELECT " +
                    "  sf. CODE signcode, " +
                    "  p.name name, " +
@@ -2099,7 +2099,7 @@ public class FamilyContractService extends BaseService {
                    " WHERE " +
                    " sf.type = 2 " +
                    " AND sf. STATUS >= 0 " +
                    " and ( sf.doctor = ? or sf.doctor_health = ? ) ";
                    " and  sf.doctor = ?  ";
            //查找居民
            datas = jdbcTemplate.queryForList(sql, labelType, doctorCode, doctorCode);

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/sign/DoctorFamilyContractController.java

@@ -111,13 +111,13 @@ public class DoctorFamilyContractController extends WeixinBaseController {
        }
    }
    /**
     * 根据标签查看当前医生签约的居民
     * 根据标签查看当前医生签约的居民  3 健康管理师  2是全科
     */
    @RequestMapping(value = "/getPatientByLable")
    @ResponseBody
    public String getPatientByLable(String labelType) {
    public String getPatientByLable(String labelType,String level) {
        try {
            JSONObject list = familyContractService.getPatientByLable(getUID(), labelType);
            JSONObject list = familyContractService.getPatientByLable(getUID(), labelType,level);
            return write(200, "查询成功", "data", list);
        } catch (Exception e) {
            return error(-1, "查询失败");