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

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/physicalExamination/PhysicalExaminationRemindService.java

@@ -152,7 +152,7 @@ public class PhysicalExaminationRemindService extends BaseService {
     * @return
     * @throws Exception
     */
    public JSONArray getOldPatientByTeamCode(long teamCode, int page, int pagesize) throws Exception {
    public JSONArray getOldPatientByTeamCode(long teamCode,String doctor, int page, int pagesize) throws Exception {
        Map<String, JSONObject> result = new TreeMap<>();
        List<Map<String, Object>> signList = new ArrayList<>();
@@ -169,6 +169,7 @@ public class PhysicalExaminationRemindService extends BaseService {
                " WHERE " +
                "     t1.status > 0 " +
                "    AND t1.admin_team_code = ? " +
                "    AND (t1.doctor = ? or t1.doctor_health = ?) " +
                "    AND (YEAR(curdate()) -IF(length(idcard) = 18,substring(idcard, 7, 4),IF(length(idcard) = 15,concat('19', substring(idcard, 7, 2)),NULL)))>65 " +
                "    AND t1.idcard not in " +
                "       (SELECT DISTINCT s.idcard " +
@@ -178,7 +179,7 @@ public class PhysicalExaminationRemindService extends BaseService {
                "                 and o.medical_time>?)" +
                " order by t1.openid desc,convert(t1.name using gbk) ";
        args = new Object[]{teamCode, teamCode, DateUtil.getLastYear()};
        args = new Object[]{teamCode,doctor,doctor, teamCode, DateUtil.getLastYear()};
        sql = sql + " limit " + start + "," + pagesize;
        signList = jdbcTemplate.queryForList(sql, args);

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

@@ -38,7 +38,8 @@ public class PyhsicExamRemindController extends BaseController{
        try {
            page = page==null?0:page;
            pagesize = pagesize==null?10:pagesize;
            JSONArray list = physicalExaminationRemindService.getOldPatientByTeamCode(adminTeamCode,page,pagesize);
            JSONArray list = physicalExaminationRemindService.getOldPatientByTeamCode(adminTeamCode,"3782f16386f211e6b394fa163e424525",page,pagesize);
//            JSONArray list = physicalExaminationRemindService.getOldPatientByTeamCode(adminTeamCode,getUID(),page,pagesize);
            return write(200, "查询成功", "data", list);
        } catch (Exception e) {
            e.printStackTrace();
@@ -65,7 +66,6 @@ public class PyhsicExamRemindController extends BaseController{
                                      @RequestParam(value = "patient", required = true) String patient){
        try {
            Integer re = physicalExaminationRemindService.singleRemindPhyExam(patient,getUID());
//            Integer re = physicalExaminationRemindService.singleRemindPhyExam(patient,"3782f16386f211e6b394fa163e424525");
            if(re==-1){
                return error(-1, "7天内已提醒过该居民，请不要重复提醒");
            }