From 96c8d6988156e17a27f7850c875425d9aa830ee9 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Sat, 16 Mar 2019 18:41:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/common/enums/RemoteServerEnmus.java | 3 +- .../com/lyms/platform/common/utils/DateUtil.java | 2 +- .../operate/web/controller/TestController.java | 64 +++++++++++++--------- 3 files changed, 42 insertions(+), 27 deletions(-) diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/RemoteServerEnmus.java b/platform-common/src/main/java/com/lyms/platform/common/enums/RemoteServerEnmus.java index 68d308d..e6c5ce1 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/RemoteServerEnmus.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/RemoteServerEnmus.java @@ -17,7 +17,8 @@ public enum RemoteServerEnmus { // KF("https://area-kaifeng-api.healthbaby.com.cn:12356", "开封"), CY("https://area-changyi-api.healthbaby.com.cn:12356", "昌邑"), XT("https://area-xtrm-api.healthbaby.com.cn:12356", "邢台人民医院系统"), - RC("https://area-rongcheng-api.healthbaby.com.cn:12356", "荣成"); + RC("https://area-rongcheng-api.healthbaby.com.cn:12356", "荣成"), + ZCRM("https://area-zhuchengrenmin-api.healthbaby.com.cn:12356", "诸城人民医院"); private String address; diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java index ab9a7e7..948fcc8 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java @@ -1567,7 +1567,7 @@ public class DateUtil { // // System.out.println(start+"=="+end); - Date baby = parseDate("2019-01-24"); + Date baby = parseDate("2019-04-16"); System.out.println(baby.getTime()); } 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 a5d78a8..dc24998 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 @@ -3181,7 +3181,6 @@ public class TestController extends BaseController { patientQuery.setNeed("y"); patientQuery.setPerType(1); patientQuery.setLimit(1000); - while (true) { System.out.println("page index " + page); @@ -3194,33 +3193,48 @@ public class TestController extends BaseController { } else { - for (PatientService patientService : patientServices) - { - if (patientService.getSerStatus() != null && patientService.getSerStatus() == 1 && patientService.getServiceWeek() == null && patientService.getParentid() != null) - { - System.out.println("service record id " + patientService.getId()); - - Patients patients = patientsService.findOnePatientById(patientService.getParentid()); - if (patients != null && patients.getLastMenses() != null) - { - patientService.setSerStartTime(patients.getLastMenses()); - patientService.setSerEndTime(DateUtil.addWeek(patients.getLastMenses(),42)); - patientService.setSerStartWeek(0); - patientService.setSerEndWeek(42); - patientService.setServiceWeek(42); - if (StringUtils.isNotEmpty(patientService.getSerDoct())) + int batchSize = 200; + int end = 0; + for (int i = 0; i < patientServices.size(); i += batchSize) { + end = (end + batchSize); + if (end > patientServices.size()) { + end = patientServices.size(); + } + System.out.println("start:" + i + ",end:" + end); + final List serviceRecords = patientServices.subList(i, end); + commonThreadPool.execute(new Runnable() { + @Override + public void run() { + for (PatientService patientService : serviceRecords) { - patientService.setDoctorWeek(42); - patientService.setDocStartWeek(0); - patientService.setDocEndWeek(42); - - patientService.setDocEndTime(DateUtil.addWeek(patients.getLastMenses(),42)); - patientService.setDocStartTime(patients.getLastMenses()); + if (patientService.getSerStatus() != null && patientService.getSerStatus() == 1 && patientService.getServiceWeek() == null && patientService.getParentid() != null) + { + System.out.println("service record id " + patientService.getId()); + + Patients patients = patientsService.findOnePatientById(patientService.getParentid()); + if (patients != null && patients.getLastMenses() != null) + { + patientService.setSerStartTime(patients.getLastMenses()); + patientService.setSerEndTime(DateUtil.addWeek(patients.getLastMenses(),42)); + patientService.setSerStartWeek(0); + patientService.setSerEndWeek(42); + patientService.setServiceWeek(42); + if (StringUtils.isNotEmpty(patientService.getSerDoct())) + { + patientService.setDoctorWeek(42); + patientService.setDocStartWeek(0); + patientService.setDocEndWeek(42); + + patientService.setDocEndTime(DateUtil.addWeek(patients.getLastMenses(),42)); + patientService.setDocStartTime(patients.getLastMenses()); + } + System.out.println("update service id " + patientService.getId()); + patientServiceService.updatePatientService(patientService); + } + } } - System.out.println("update service id " + patientService.getId()); - patientServiceService.updatePatientService(patientService); } - } + }); } } page++; -- 1.8.3.1