From 3ac6b8f1acb38bf699604cbd939708c7bfa33adb Mon Sep 17 00:00:00 2001 From: liquanyu Date: Sat, 14 Aug 2021 16:14:51 +0800 Subject: [PATCH] update --- .../operate/web/controller/TestController.java | 16 ++++----- .../operate/web/facade/PatientSyncMysqlFacade.java | 42 +++++++++++++++------- 2 files changed, 38 insertions(+), 20 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java index eb3c45a..2270cd9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java @@ -4257,7 +4257,7 @@ public class TestController extends BaseController { @ResponseBody @RequestMapping(value = "/syncPatientsToMysql", method = RequestMethod.GET) public String syncPatientsToMysql(@RequestParam(required = false) Date startDate,@RequestParam(required = false) Date endDate,@RequestParam(required = false) String hospitalId) { - patientSyncMysqlFacade.syncPatientsToMysql(startDate, endDate); + patientSyncMysqlFacade.syncPatientsToMysql(startDate, endDate,hospitalId); return "syncPatientsToMysql"; } @@ -4266,7 +4266,7 @@ public class TestController extends BaseController { @ResponseBody @RequestMapping(value = "/syncAntexchuToMysql", method = RequestMethod.GET) public String syncAntexchuToMysql(@RequestParam(required = false) Date startDate,@RequestParam(required = false) Date endDate,@RequestParam(required = false) String hospitalId) { - patientSyncMysqlFacade.syncAntexchuToMysql(startDate, endDate); + patientSyncMysqlFacade.syncAntexchuToMysql(startDate, endDate,hospitalId); return "syncAntexchuToMysql"; } @@ -4275,7 +4275,7 @@ public class TestController extends BaseController { @ResponseBody @RequestMapping(value = "/syncAntexToMysql", method = RequestMethod.GET) public String syncAntexToMysql(@RequestParam(required = false) Date startDate,@RequestParam(required = false) Date endDate,@RequestParam(required = false) String hospitalId) { - patientSyncMysqlFacade.syncAntexToMysql(startDate, endDate); + patientSyncMysqlFacade.syncAntexToMysql(startDate, endDate,hospitalId); return "syncAntexToMysql"; } @@ -4285,7 +4285,7 @@ public class TestController extends BaseController { @ResponseBody @RequestMapping(value = "/syncMatdeliverToMysql", method = RequestMethod.GET) public String syncMatdeliverToMysql(@RequestParam(required = false) Date startDate,@RequestParam(required = false) Date endDate,@RequestParam(required = false) String hospitalId) { - patientSyncMysqlFacade.syncMatdeliverToMysql(startDate, endDate); + patientSyncMysqlFacade.syncMatdeliverToMysql(startDate, endDate,hospitalId); return "syncMatdeliverToMysql"; } @@ -4294,10 +4294,10 @@ public class TestController extends BaseController { @ResponseBody @RequestMapping(value = "/syncAllToMysql", method = RequestMethod.GET) public String syncAllToMysql(@RequestParam(required = false) Date startDate,@RequestParam(required = false) Date endDate,@RequestParam(required = false) String hospitalId) { - patientSyncMysqlFacade.syncPatientsToMysql(startDate, endDate); - patientSyncMysqlFacade.syncMatdeliverToMysql(startDate, endDate); - patientSyncMysqlFacade.syncAntexchuToMysql(startDate, endDate); - patientSyncMysqlFacade.syncAntexToMysql(startDate, endDate); + patientSyncMysqlFacade.syncPatientsToMysql(startDate, endDate,hospitalId); + patientSyncMysqlFacade.syncMatdeliverToMysql(startDate, endDate,hospitalId); + patientSyncMysqlFacade.syncAntexchuToMysql(startDate, endDate,hospitalId); + patientSyncMysqlFacade.syncAntexToMysql(startDate, endDate,hospitalId); return "syncAllToMysql"; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java index edf79bd..e22267c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java @@ -1276,22 +1276,28 @@ public class PatientSyncMysqlFacade { syncBaby(startDate, endDate,hid); syncBabyCheck(startDate, endDate,hid); } - syncPatientsToMysql(startDate,endDate); - syncAntexchuToMysql(startDate, endDate); - syncAntexToMysql(startDate, endDate); - syncMatdeliverToMysql(startDate,endDate); + syncPatientsToMysql(startDate, endDate, null); + syncAntexchuToMysql(startDate, endDate,null); + syncAntexToMysql(startDate, endDate,null); + syncMatdeliverToMysql(startDate, endDate,null); } - public void syncPatientsToMysql(Date start,Date end) + public void syncPatientsToMysql(Date start,Date end,String hospitalId) { PatientsQuery patientsQuery = new PatientsQuery(); patientsQuery.setYn(YnEnums.YES.getId()); patientsQuery.setModifiedStart(start); patientsQuery.setModifiedEnd(end); + + if (StringUtils.isNotEmpty(hospitalId)) + { + patientsQuery.setHospitalId(hospitalId); + } + patientsQuery.setNeed("true"); - patientsQuery.setLimit(100); + patientsQuery.setLimit(10000); int page = 1; while (true) { @@ -1324,15 +1330,19 @@ public class PatientSyncMysqlFacade { } - public void syncAntexchuToMysql(Date start,Date end) + public void syncAntexchuToMysql(Date start,Date end,String hospitalId) { AntExChuQuery antExChuQuery = new AntExChuQuery(); antExChuQuery.setYn(YnEnums.YES.getId()); antExChuQuery.setModifiedStart(start); antExChuQuery.setModifiedEnd(end); + if (StringUtils.isNotEmpty(hospitalId)) + { + antExChuQuery.setHospitalId(hospitalId); + } antExChuQuery.setNeed("true"); - antExChuQuery.setLimit(100); + antExChuQuery.setLimit(10000); int page = 1; while (true) { @@ -1459,15 +1469,19 @@ public class PatientSyncMysqlFacade { } - public void syncAntexToMysql(Date start,Date end) + public void syncAntexToMysql(Date start,Date end,String hospitalId) { AntExQuery antExQuery = new AntExQuery(); antExQuery.setYn(YnEnums.YES.getId()); antExQuery.setModifiedStart(start); antExQuery.setModifiedEnd(end); + if (StringUtils.isNotEmpty(hospitalId)) + { + antExQuery.setHospitalId(hospitalId); + } antExQuery.setNeed("true"); - antExQuery.setLimit(100); + antExQuery.setLimit(10000); int page = 1; while (true) { @@ -1545,14 +1559,18 @@ public class PatientSyncMysqlFacade { } - public void syncMatdeliverToMysql(Date start,Date end) + public void syncMatdeliverToMysql(Date start,Date end,String hospitalId) { MatDeliverQuery matDeliverQuery = new MatDeliverQuery(); matDeliverQuery.setYn(YnEnums.YES.getId()); + if (StringUtils.isNotEmpty(hospitalId)) + { + matDeliverQuery.setHospitalId(hospitalId); + } matDeliverQuery.setModifiedStart(start); matDeliverQuery.setModifiedEnd(end); matDeliverQuery.setNeed("true"); - matDeliverQuery.setLimit(100); + matDeliverQuery.setLimit(10000); int page = 1; while (true) { -- 1.8.3.1