jiangjiazhi / regional-platform

Download as
Browse Code »

Commit f6437d759c1ef47f3da4cb2f166cc37fcd0036db

Authored by yangfei
2 parents c35d81a500 2883193766
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 3 changed files

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java View file @ f6437d7
... ... @@ -42,45 +42,45 @@
42 42 public static SimpleDateFormat y_m_d = new SimpleDateFormat("yyyy-MM-dd");
43 43 public static SimpleDateFormat h_m_s = new SimpleDateFormat("HH:mm:ss");
44 44  
45   - public static void main(String[] args) throws Exception {
46   - ApplicationContext applicationContext = new ClassPathXmlApplicationContext("classpath:/spring/applicationContext_biz_patient1.xml");
47   -// queryRisk(applicationContext);
48   -// changeLong2Time(applicationContext);
49   - final AutoIncermentService auto = applicationContext.getBean(AutoIncermentService.class);
  45 +// public static void main(String[] args) throws Exception {
  46 +// ApplicationContext applicationContext = new ClassPathXmlApplicationContext("classpath:/spring/applicationContext_biz_patient1.xml");
  47 +//// queryRisk(applicationContext);
  48 +//// changeLong2Time(applicationContext);
  49 +// final AutoIncermentService auto = applicationContext.getBean(AutoIncermentService.class);
  50 +//
  51 +// new Thread() {
  52 +// @Override
  53 +// public void run() {
  54 +// while (true){
  55 +// System.out.println(auto.nextPatientTicketId("0335"));
  56 +// try {
  57 +// sleep(new Random().nextInt(3000) );
  58 +// } catch (InterruptedException e) {
  59 +// e.printStackTrace();
  60 +// }
  61 +// }
  62 +// }
  63 +// }.start();
  64 +//
  65 +//
  66 +//
  67 +// new Thread() {
  68 +// @Override
  69 +// public void run() {
  70 +// while (true){
  71 +// System.out.println(auto.nextPatientTicketId("0335"));
  72 +// try {
  73 +// sleep(new Random().nextInt(1000) );
  74 +// } catch (InterruptedException e) {
  75 +// e.printStackTrace();
  76 +// }
  77 +// }
  78 +// }
  79 +// }.start();
  80 +//// findandmodify(applicationContext);
  81 +// }
50 82  
51   - new Thread() {
52   - @Override
53   - public void run() {
54   - while (true){
55   - System.out.println(auto.nextPatientTicketId("0335"));
56   - try {
57   - sleep(new Random().nextInt(3000) );
58   - } catch (InterruptedException e) {
59   - e.printStackTrace();
60   - }
61   - }
62   - }
63   - }.start();
64 83  
65   -
66   -
67   - new Thread() {
68   - @Override
69   - public void run() {
70   - while (true){
71   - System.out.println(auto.nextPatientTicketId("0335"));
72   - try {
73   - sleep(new Random().nextInt(1000) );
74   - } catch (InterruptedException e) {
75   - e.printStackTrace();
76   - }
77   - }
78   - }
79   - }.start();
80   -// findandmodify(applicationContext);
81   - }
82   -
83   -
84 84 private static void importRegionData() {
85 85 BasicConfigQuery query = new BasicConfigQuery();
86 86 query.setParentId("f6c505dd-835a-43d7-b0bb-fdb9eb0b7b31");
... ... @@ -782,6 +782,30 @@
782 782 VisitService service = applicationContext.getBean(VisitService.class);
783 783 service.addVisit(visitModel)
784 784 ;
  785 + }
  786 +
  787 +
  788 + public static void weightMange()
  789 + {
  790 + try {
  791 + List<String> list = FileUtils.readLines(new File("F:\\体重与营养管理1.csv"));
  792 + for (String line : list) {
  793 + if (line != null) {
  794 + String[] array = line.split(",");
  795 + System.out.println(array.length);
  796 + for (int i = 0; i < array.length ;i++ )
  797 + {
  798 + System.out.println("--->"+array[i]);
  799 + }
  800 + }
  801 + }
  802 + } catch (IOException e) {
  803 + e.printStackTrace();
  804 + }
  805 + }
  806 +
  807 + public static void main(String[] args) {
  808 + weightMange();
785 809 }
786 810  
787 811 public static void addBaby(ApplicationContext applicationContext) {
platform-common/src/main/java/com/lyms/platform/common/utils/ExcelUtil.java View file @ f6437d7
1 1 package com.lyms.platform.common.utils;
2 2  
3 3 import java.io.File;
4   -import java.io.FileOutputStream;
5 4 import java.io.IOException;
6 5 import java.io.OutputStream;
7 6 import java.util.Iterator;
... ... @@ -9,7 +8,6 @@
9 8 import java.util.Map;
10 9  
11 10  
12   -import jxl.SheetSettings;
13 11 import jxl.Workbook;
14 12 import jxl.format.Colour;
15 13 import jxl.format.UnderlineStyle;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ f6437d7
... ... @@ -4454,8 +4454,8 @@
4454 4454 Map<String, Object> dueMap = data.getHandDueWeek();
4455 4455 if (dueMap != null && dueMap.size() > 0)
4456 4456 {
4457   - week = dueMap.get("week") == null ? 0 : Integer.parseInt(String.valueOf(dueMap.get("week")));
4458   - day = dueMap.get("day") == null ? 0 : Integer.parseInt(String.valueOf(dueMap.get("day")));
  4457 + week = (dueMap.get("week") == null || "".equals(dueMap.get("week")) ) ? 0 : Integer.parseInt(String.valueOf(dueMap.get("week")));
  4458 + day = (dueMap.get("day") == null || "".equals(dueMap.get("day"))) ? 0 : Integer.parseInt(String.valueOf(dueMap.get("day")));
4459 4459 }
4460 4460 else
4461 4461 {