From 2883193766241592e5506316e7cbf2a636c9f785 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Wed, 9 May 2018 15:50:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=A8=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/biz/BasicConfigServiceTest.java | 98 ++++++++++++++-------- .../com/lyms/platform/common/utils/ExcelUtil.java | 2 - .../platform/operate/web/facade/ViewFacade.java | 4 +- 3 files changed, 63 insertions(+), 41 deletions(-) diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java index be494ac..59a8bfa 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java @@ -42,43 +42,43 @@ public class BasicConfigServiceTest { public static SimpleDateFormat y_m_d = new SimpleDateFormat("yyyy-MM-dd"); public static SimpleDateFormat h_m_s = new SimpleDateFormat("HH:mm:ss"); - public static void main(String[] args) throws Exception { - ApplicationContext applicationContext = new ClassPathXmlApplicationContext("classpath:/spring/applicationContext_biz_patient1.xml"); -// queryRisk(applicationContext); -// changeLong2Time(applicationContext); - final AutoIncermentService auto = applicationContext.getBean(AutoIncermentService.class); - - new Thread() { - @Override - public void run() { - while (true){ - System.out.println(auto.nextPatientTicketId("0335")); - try { - sleep(new Random().nextInt(3000) ); - } catch (InterruptedException e) { - e.printStackTrace(); - } - } - } - }.start(); - - - - new Thread() { - @Override - public void run() { - while (true){ - System.out.println(auto.nextPatientTicketId("0335")); - try { - sleep(new Random().nextInt(1000) ); - } catch (InterruptedException e) { - e.printStackTrace(); - } - } - } - }.start(); -// findandmodify(applicationContext); - } +// public static void main(String[] args) throws Exception { +// ApplicationContext applicationContext = new ClassPathXmlApplicationContext("classpath:/spring/applicationContext_biz_patient1.xml"); +//// queryRisk(applicationContext); +//// changeLong2Time(applicationContext); +// final AutoIncermentService auto = applicationContext.getBean(AutoIncermentService.class); +// +// new Thread() { +// @Override +// public void run() { +// while (true){ +// System.out.println(auto.nextPatientTicketId("0335")); +// try { +// sleep(new Random().nextInt(3000) ); +// } catch (InterruptedException e) { +// e.printStackTrace(); +// } +// } +// } +// }.start(); +// +// +// +// new Thread() { +// @Override +// public void run() { +// while (true){ +// System.out.println(auto.nextPatientTicketId("0335")); +// try { +// sleep(new Random().nextInt(1000) ); +// } catch (InterruptedException e) { +// e.printStackTrace(); +// } +// } +// } +// }.start(); +//// findandmodify(applicationContext); +// } private static void importRegionData() { @@ -784,6 +784,30 @@ public class BasicConfigServiceTest { ; } + + public static void weightMange() + { + try { + List list = FileUtils.readLines(new File("F:\\体重与营养管理1.csv")); + for (String line : list) { + if (line != null) { + String[] array = line.split(","); + System.out.println(array.length); + for (int i = 0; i < array.length ;i++ ) + { + System.out.println("--->"+array[i]); + } + } + } + } catch (IOException e) { + e.printStackTrace(); + } + } + + public static void main(String[] args) { + weightMange(); + } + public static void addBaby(ApplicationContext applicationContext) { // BabyModel babyModel = new BabyModel(); // babyModel.setBirth(new Date()); diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/ExcelUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/ExcelUtil.java index 59145b1..3cead64 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/ExcelUtil.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/ExcelUtil.java @@ -1,7 +1,6 @@ package com.lyms.platform.common.utils; import java.io.File; -import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStream; import java.util.Iterator; @@ -9,7 +8,6 @@ import java.util.List; import java.util.Map; -import jxl.SheetSettings; import jxl.Workbook; import jxl.format.Colour; import jxl.format.UnderlineStyle; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index fbc36ce..a85e6d7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -4453,8 +4453,8 @@ public class ViewFacade { Map dueMap = data.getHandDueWeek(); if (dueMap != null && dueMap.size() > 0) { - week = dueMap.get("week") == null ? 0 : Integer.parseInt(String.valueOf(dueMap.get("week"))); - day = dueMap.get("day") == null ? 0 : Integer.parseInt(String.valueOf(dueMap.get("day"))); + week = (dueMap.get("week") == null || "".equals(dueMap.get("week")) ) ? 0 : Integer.parseInt(String.valueOf(dueMap.get("week"))); + day = (dueMap.get("day") == null || "".equals(dueMap.get("day"))) ? 0 : Integer.parseInt(String.valueOf(dueMap.get("day"))); } else { -- 1.8.3.1