From 71dcbb223b972d95b6b55d1f214cd6ca7b4076d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=87=E5=AE=99=E7=9A=AE=E7=9A=AE=E5=A8=83?= <2964346877@qq.com> Date: Wed, 28 Jun 2023 16:26:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=87=BA=E9=99=A2=E5=85=A5?= =?UTF-8?q?=E9=99=A2=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/HttpTBasicServiceImpl.java | 2 +- .../service/impl/TBasicServiceImpl.java | 20 ++++++++++++++----- .../docus/server/collection/util/jobUtil.java | 2 +- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/docus/server/collection/httpservices/impl/HttpTBasicServiceImpl.java b/src/main/java/com/docus/server/collection/httpservices/impl/HttpTBasicServiceImpl.java index c85bbd2..7b5a59d 100644 --- a/src/main/java/com/docus/server/collection/httpservices/impl/HttpTBasicServiceImpl.java +++ b/src/main/java/com/docus/server/collection/httpservices/impl/HttpTBasicServiceImpl.java @@ -31,7 +31,7 @@ public class HttpTBasicServiceImpl implements HttpTBasicService { String resultStr = HttpUtil.get(url, headers, params); //解析返货值字符串 - log.info("解析开始"); + log.info("解析:"+resultStr); tBasicDtos=parsing(resultStr); }catch (Exception e){ log.error(e.getMessage(),e); diff --git a/src/main/java/com/docus/server/collection/service/impl/TBasicServiceImpl.java b/src/main/java/com/docus/server/collection/service/impl/TBasicServiceImpl.java index 7956a0d..5bd0b7f 100644 --- a/src/main/java/com/docus/server/collection/service/impl/TBasicServiceImpl.java +++ b/src/main/java/com/docus/server/collection/service/impl/TBasicServiceImpl.java @@ -49,6 +49,7 @@ public class TBasicServiceImpl implements ITBasicService { File dir = new File("."); String path =""; path = dir.getCanonicalPath()+"\\dataConfig\\time.json"; + log.info("path:"+path); File timeConfigFile= new File(path); InputStream inputstream =null; if(timeConfigFile.isFile()){ @@ -116,10 +117,16 @@ public class TBasicServiceImpl implements ITBasicService { Long patientId = idService.getDateSeq(); //数据类型转化，格式处理 - Date admissDate = Func.parseDate(tBasicDto.getAdmissDate(), DateUtil.PATTERN_DATETIME); + Date admissDate = null; + if(Func.isNotEmpty(tBasicDto.getAdmissDate())){ + Func.parseDate(tBasicDto.getAdmissDate(), DateUtil.PATTERN_DATETIME); + } - Date disDate = Func.parseDate(tBasicDto.getDisDate(), DateUtil.PATTERN_DATETIME); + Date disDate = null; + if(Func.isNotEmpty(tBasicDto.getDisDate())){ + disDate = Func.parseDate(tBasicDto.getDisDate(), DateUtil.PATTERN_DATETIME); + } String admissTimesStr = tBasicDto.getAdmissTimes(); Integer admissTimes=null; if(NumberUtil.isInteger(admissTimesStr)){ @@ -127,10 +134,12 @@ public class TBasicServiceImpl implements ITBasicService { } String ageStr = tBasicDto.getAge(); - ageStr =ageStr.substring(0,ageStr.length()-1); Integer age=null; - if(NumberUtil.isInteger(ageStr)){ - age=Integer.parseInt(ageStr); + if(Func.isNotEmpty(ageStr)){ + ageStr =ageStr.substring(0,ageStr.length()-1); + if(NumberUtil.isInteger(ageStr)){ + age=Integer.parseInt(ageStr); + } } String admissDaysStr = tBasicDto.getAdmissDays(); @@ -188,6 +197,7 @@ public class TBasicServiceImpl implements ITBasicService { }else{ tBasicList.add(tBasic); } + log.info("tBasic:"+tBasic.toString()); } //批量插入 diff --git a/src/main/java/com/docus/server/collection/util/jobUtil.java b/src/main/java/com/docus/server/collection/util/jobUtil.java index dc886f2..1e6e1fc 100644 --- a/src/main/java/com/docus/server/collection/util/jobUtil.java +++ b/src/main/java/com/docus/server/collection/util/jobUtil.java @@ -29,7 +29,7 @@ public class jobUtil { tBasicService.setTBasic(); log.info("tBasicJob------结束"); } catch (Exception e) { - log.error(e.getMessage()+e); + log.error(e.getMessage(),e); } } }