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

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

@@ -1856,7 +1856,7 @@ public class FamilyContractService extends BaseService {
        return returnMap;
    }
    public JSONObject findNoHealthSignFamilyHealth(String doctorCode, String labelType, String patientName) throws Exception {
    public JSONObject findNoHealthSignFamilyHealth(String doctorCode, String labelType, String patientName,Long teamCode) throws Exception {
        JSONObject returnMap = new JSONObject();
        //健康管理师
        String sql = "SELECT " +
@@ -1877,10 +1877,11 @@ public class FamilyContractService extends BaseService {
                " sf.type = 2 " +
                " AND sf. STATUS >= 0 " +
                " and sf.doctor = ? " +
                " and sf.admin_team_code = ? " +
                " AND ( sf.doctor_health is null or sf.doctor_health ='' ) ";
        List<Map<String, Object>> datas = null;
        //查找居民
        datas = jdbcTemplate.queryForList(sql, labelType, doctorCode);
        datas = jdbcTemplate.queryForList(sql, labelType, doctorCode,teamCode);
        //根据类别查找标签
        List<SignPatientLabel> s = labelDao.findByLabelTypeAndStatus(labelType, 1);

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

@@ -837,9 +837,10 @@ public class DoctorFamilyContractController extends WeixinBaseController {
    @ResponseBody
    public String findNoHealthSignFamilyHealth(
            String labelType,
            @RequestParam(required = false) String patientName) {
            @RequestParam(required = false) String patientName,
            Long teamCode) {
        try {
            JSONObject list = familyContractService.findNoHealthSignFamilyHealth(getUID(), labelType, patientName);
            JSONObject list = familyContractService.findNoHealthSignFamilyHealth(getUID(), labelType, patientName,teamCode);
            return write(200, "签约数据加载成功！", "data", list);
        } catch (Exception e) {
            e.printStackTrace();