新增查询接口

.gitignore

@@ -43,8 +43,6 @@ project/build/target/
project/plugins/target/
project/plugins/lib_managed/
project/plugins/src_managed/
logs/
log/
spark-tests.log
streaming-tests.log
dependency-reduced-pom.xml

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

@@ -3415,4 +3415,31 @@ public class FamilyContractService extends BaseService {
    public SignFamily findOutTimeSigningByPatient(String patient) {
        return signFamilyDao.findOutTimeSigningByPatient(patient);
    }
    public List<Map<String,Object>> patientGroupByServerType(String doctor) {
        // 先根据server_type分组查找wlyy_sign_family表中该医生的签约的患者，然后wlyy_sign_dict left join 得到全部的类型
        String sql=" select sd.code labelCode,sd.name labelName,IFNULL(t.count,0) amount from wlyy_sign_dict sd  " +
                " left join " +
                " ( " +
                " SELECT " +
                "  sf.server_type type, " +
                "  sf.server_type_name name, " +
                "  count(id) count " +
                " FROM " +
                "  wlyy_sign_family sf " +
                " WHERE " +
                "  sf. STATUS > 0 " +
                " AND ( " +
                "  sf.doctor =? " +
                "  or sf.doctor_health =? " +
                " ) " +
                " group by sf.server_type " +
                " ) t " +
                " on sd.`code`=t.type " +
                " where  sd.id in (4,5,6,7,8,9,10,11,12)";
        List<Map<String,Object>> queryData=jdbcTemplate.queryForList(sql,doctor,doctor);
        return queryData;
    }
}

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

@@ -1527,6 +1527,19 @@ public class DoctorFamilyContractController extends WeixinBaseController {
        }
    }
    @RequestMapping(value = "/patientGroupByServerType", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "根据ServerType分组查询医生签约的居民")
    public String patientGroupByServerType() {
        try {
            List<Map<String,Object>>  result = familyContractService.patientGroupByServerType(getUID());
            return write(200, "查询成功", "data", result);
        } catch (Exception e) {
            e.printStackTrace();
            return error(-1, "查询失败");
        }
    }
    @RequestMapping(value = "/wechat_focus_remind", method = {RequestMethod.GET, RequestMethod.POST})
    @ResponseBody
    @ApiOperation(value = "微信关注提醒")
@@ -1567,6 +1580,8 @@ public class DoctorFamilyContractController extends WeixinBaseController {
        }
    }
    /**
     * 是否已提醒关注
     *