From a553a6412dd7aff51171c90f649707b547c5cdd2 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Tue, 28 Jul 2020 16:59:03 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BF=E8=A7=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hospitalapi/qhdfy/SyncQhdBaseInfoService.java | 58 ++++++---------------- .../operate/web/facade/MatDeliverFacade.java | 8 ++- 2 files changed, 20 insertions(+), 46 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/SyncQhdBaseInfoService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/SyncQhdBaseInfoService.java index f881a57..17c3209 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/SyncQhdBaseInfoService.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/SyncQhdBaseInfoService.java @@ -49,56 +49,26 @@ public class SyncQhdBaseInfoService { System.out.println("查询数据完成"); break; } - int batchSize = BATCH_SIZE; - int end = 0; + for(Map data : list) + { + String ckNo = getString(data.get("ck_no")); + String ckPrefix = getString(data.get("ck_prefix")); - //线程数 - int threadCount = list.size() % BATCH_SIZE == 0 ? list.size() / BATCH_SIZE : list.size() / BATCH_SIZE + 1; + String sql = "SELECT M.CK_NO,M.CK_PREGDAY,M.CK_BABBYBIRTHDAY,M.CK_PREFIX FROM MOMMY_BIRTHNOCHECK M WHERE M.CK_NO='"+ckNo+"' AND M.CK_PREFIX='"+ckPrefix+"'"; - final CountDownLatch countDownLatch = new CountDownLatch(threadCount); + List> list1 = JDBCUtil.getOracleListDataBySql(sql); + if (CollectionUtils.isNotEmpty(list1)) + { + Map obj = list1.get(0); + Date birth = HsDataUtil.getDate(obj.get("CK_BABBYBIRTHDAY")); + String day = HsDataUtil.getString(obj.get("CK_PREGDAY")); + System.out.println(DateUtil.getyyyy_MM_dd_hms(birth)); + int count = JDBCUtil.mysqlUpdate(" update cert_birthnocheck set ck_pregday=" + day + ",ck_babbybirthday='" + DateUtil.getyyyy_MM_dd_hms(birth) + "' where ck_no='" + ckNo + "' and ck_prefix='" + ckPrefix + "'"); + System.out.println("update count "+count); - for (int i = 0; i < list.size(); i += batchSize) { - end = (end + batchSize); - if (end > list.size()) { - end = list.size(); } - System.out.println("start:" + i + ",end:" + end); - final List> tempList = list.subList(i, end); - commonThreadPool.execute(new Runnable() { - @Override - public void run() { - if (CollectionUtils.isNotEmpty(tempList)) - { - for(Map data : tempList) - { - String ckNo = getString(data.get("ck_no")); - String ckPrefix = getString(data.get("ck_prefix")); - - String sql = "SELECT M.CK_NO,M.CK_PREGDAY,M.CK_BABBYBIRTHDAY,M.CK_PREFIX FROM MOMMY_BIRTHNOCHECK M WHERE M.CK_NO='"+ckNo+"' AND M.CK_PREFIX='"+ckPrefix+"'"; - - List> list1 = JDBCUtil.getOracleListDataBySql(sql); - if (CollectionUtils.isNotEmpty(list1)) - { - Map obj = list1.get(0); - Date birth = HsDataUtil.getDate(obj.get("CK_BABBYBIRTHDAY")); - String day = HsDataUtil.getString(obj.get("CK_PREGDAY")); - System.out.println(DateUtil.getyyyy_MM_dd_hms(birth)); - int count = JDBCUtil.mysqlUpdate(" update cert_birthnocheck set ck_pregday=" + day + ",ck_babbybirthday='" + DateUtil.getyyyy_MM_dd_hms(birth) + "' where ck_no='" + ckNo + "' and ck_prefix='" + ckPrefix + "'"); - System.out.println("update count "+count); - - } - } - } - countDownLatch.countDown(); - } - }); } page++; - try { - countDownLatch.await(); - Thread.sleep(5000); - } catch (InterruptedException e) { - } }while (true); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index 72d5376..f1fcd73 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -1959,12 +1959,16 @@ public class MatDeliverFacade { if (matdeliverFollowRequest.getVisitStatus() != null && matdeliverFollowRequest.getVisitStatus() == 2) { + matDeliverQuery.setVisitStatus(matdeliverFollowRequest.getVisitStatus()); matDeliverQuery.setFsHospitalId(hospitalId); } - else if(matdeliverFollowRequest.getVisitStatus() != null && matdeliverFollowRequest.getVisitStatus() == 1) - { + else if(matdeliverFollowRequest.getVisitStatus() != null && matdeliverFollowRequest.getVisitStatus() == 1) { matDeliverQuery.setVisitStatus(matdeliverFollowRequest.getVisitStatus()); } + else if (matdeliverFollowRequest.getVisitStatus() != null && matdeliverFollowRequest.getVisitStatus() == 3) + { + matDeliverQuery.setVisitStatus(2); + } } else { -- 1.8.3.1