From 8afc9232d3cc4d53a15ac460f41b5494ac7013a6 Mon Sep 17 00:00:00 2001 From: yangfei Date: Thu, 7 Sep 2017 15:31:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=AC=E5=8A=9B=E8=AF=8A=E6=96=AD=E6=A8=A1?= =?UTF-8?q?=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mainOrm/master/BabyPatientExtendEarBaby.xml | 2 +- .../main/resources/mainOrm/master/BabyPatientExtendEarFollowUp.xml | 4 ++-- .../mainOrm/master/BabyPatientExtendEarHearingDiagnose.xml | 2 +- .../main/resources/mainOrm/master/BabyPatientExtendEarScreen.xml | 2 +- .../lyms/platform/operate/web/controller/FollowUpController.java | 2 +- .../platform/operate/web/controller/HearDiagnManageController.java | 7 ++++--- .../platform/operate/web/controller/HearingDiagnoseController.java | 2 +- .../operate/web/controller/HighriskChangeHospitalController.java | 3 ++- 8 files changed, 13 insertions(+), 11 deletions(-) diff --git a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarBaby.xml b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarBaby.xml index 91a831b..7647895 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarBaby.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarBaby.xml @@ -109,7 +109,7 @@ select id,name,sex,cardNo,birth,mname,mcert_type_id,mcert_no,mphone,vc_card_no,b - order by ${sort} desc + order by ${sort} limit #{offset, jdbcType=INTEGER} , #{limit, jdbcType=INTEGER} diff --git a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarFollowUp.xml b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarFollowUp.xml index f1365d8..c8eb6be 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarFollowUp.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarFollowUp.xml @@ -149,7 +149,7 @@ select id,baby_id,follow_time,follow_addr,mark_time,mark_result,mark_detail,foll - order by ${sort} desc + order by ${sort} limit #{offset, jdbcType=INTEGER} , #{limit, jdbcType=INTEGER} @@ -309,7 +309,7 @@ select id,baby_id,follow_time,follow_addr,mark_time,mark_result,mark_detail,foll and ifdel = 0 - order by follow_time desc + order by follow_time \ No newline at end of file diff --git a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarHearingDiagnose.xml b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarHearingDiagnose.xml index 6dea91e..19bfc53 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarHearingDiagnose.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarHearingDiagnose.xml @@ -451,7 +451,7 @@ select id,baby_id,hospital_id,diagnose_time,high_factor,abr_left_dbnhl,abr_left_ - order by ${sort} desc + order by ${sort} limit #{offset, jdbcType=INTEGER} , #{limit, jdbcType=INTEGER} diff --git a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarScreen.xml b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarScreen.xml index 7eb836d..780df07 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarScreen.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarScreen.xml @@ -169,7 +169,7 @@ select id,baby_id,screen_type,check_hospital_id,screen_date,high_risk_cause,oae_ - order by ${sort} desc + order by ${sort} limit #{offset, jdbcType=INTEGER} , #{limit, jdbcType=INTEGER} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FollowUpController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FollowUpController.java index 6763cf6..4f97ce5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FollowUpController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FollowUpController.java @@ -353,7 +353,7 @@ public class FollowUpController extends BaseController { query.setHospitalId(hospitalId); //分页信息 query.setNeed("1"); - query.setSort("follow_time"); + query.setSort("follow_time desc"); query.setLimit(fur.getLimit()); query.setOffset((fur.getPage()-1)*fur.getLimit()); if (CollectionUtils.isNotEmpty(pids)) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearDiagnManageController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearDiagnManageController.java index f36dcc7..10f80fd 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearDiagnManageController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearDiagnManageController.java @@ -236,7 +236,7 @@ public class HearDiagnManageController extends BaseController { } query.setConfirmResults(cfList.toArray(new String[cfList.size()])); } - query.setSort("diagnose_time"); + query.setSort("diagnose_time desc"); List hearingDiagnoseList = hearingDiagnoseService.getHdAndScreen(query); @@ -427,7 +427,7 @@ public class HearDiagnManageController extends BaseController { } query.setConfirmResults(cfList.toArray(new String[cfList.size()])); } - query.setSort("diagnose_time"); + query.setSort("diagnose_time desc"); query.setNeed("1"); query.setLimit(hdReq.getLimit()); query.setOffset((hdReq.getPage()-1)*hdReq.getLimit()); @@ -937,7 +937,7 @@ public class HearDiagnManageController extends BaseController { babyQuery.setHospitalId(hospitalId); babyQuery.setNoEnable("0"); - + babyQuery.setSort("build_date desc"); List babyIds = new ArrayList<>(); //如果查询号不为空，根据查询号查询儿童档案表，获取儿童档案Id @@ -1145,6 +1145,7 @@ public class HearDiagnManageController extends BaseController { babyQuery.setHospitalId(hospitalId); babyQuery.setNoEnable("0"); babyQuery.setNeed("y"); + babyQuery.setSort("build_date desc"); babyQuery.setOffset((model.getPage()-1)*model.getLimit()); babyQuery.setLimit(model.getLimit()); List babyIds = new ArrayList<>(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java index 91b789b..024e6ad 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java @@ -499,7 +499,7 @@ public class HearingDiagnoseController extends BaseController { } query.setHospitalId(hospitalId); - query.setSort("diagnose_time"); + query.setSort("diagnose_time desc"); //已经诊断的数据 List hearingDiagnoseList = hearingDiagnoseService.getHdAndScreen(query); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HighriskChangeHospitalController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HighriskChangeHospitalController.java index 738ece1..cd3ca7e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HighriskChangeHospitalController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HighriskChangeHospitalController.java @@ -330,8 +330,9 @@ public class HighriskChangeHospitalController extends BaseController { } else { return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("请传入查询类型"); } + query.setOffset((query.getPage()-1)*query.getLimit()); query.setNeed("1"); - query.setSort("CREATE_TIME"); + query.setSort("CREATE_TIME desc"); //如果查询号不为空，根据查询号查询儿童档案表，获取儿童档案Id if (query.getQueryNo() != null) {//关键字：姓名、联系方式、就诊卡 查询babyId -- 1.8.3.1