同步出院入院时间格式修改

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);

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());
                 }
 
                 //批量插入

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);
         }
     }
 }