diff --git a/dataConfig/homeQualitySet.json b/dataConfig/homeQualitySet.json index 8ea3fe4..c376b09 100644 --- a/dataConfig/homeQualitySet.json +++ b/dataConfig/homeQualitySet.json @@ -56,5 +56,5 @@ "newSyncTime":"", //数据表名 "syncTableName":"CIS_EMR_DOCUMENT", - "syncTableNamespaces":"DOCUS" + "syncTableNamespaces":"CDR" } \ No newline at end of file diff --git a/dataConfig/temp/collectTimeTemp b/dataConfig/temp/collectTimeTemp index c636113..318fda9 100644 --- a/dataConfig/temp/collectTimeTemp +++ b/dataConfig/temp/collectTimeTemp @@ -1 +1 @@ -{"lastTime":"2022-04-09 00:00:00"} \ No newline at end of file +{"lastTime":"2022-03-25 00:00:00"} \ No newline at end of file diff --git a/src/main/java/com/docus/bgts/service/MzSyncService.java b/src/main/java/com/docus/bgts/service/MzSyncService.java index e194a8a..beb8bb5 100644 --- a/src/main/java/com/docus/bgts/service/MzSyncService.java +++ b/src/main/java/com/docus/bgts/service/MzSyncService.java @@ -218,10 +218,9 @@ public class MzSyncService implements IMzSyncService { if(jzh1.equals(jzh)){ List mzSyncDetails1 = obj.getMzSyncDetails(); for(MzSyncDetails vo : mzSyncDetails1){ - //获取文件序列号 String serialnum1 = vo.getSerialnum(); - if(vo.getFileTitle().equals(fileTitle) && serialnum1.equals(serialnum)){ + if(vo.getFileTitle().equals(fileTitle)){ flag = true; mzSyncDetail.setCollectid(vo.getCollectid()); break; @@ -293,6 +292,9 @@ public class MzSyncService implements IMzSyncService { reportDownDto.setPatient(reportDownPatientDto); filetitle = mzSyncDetail.getFileTitle(); downurl = mzSyncDetail.getFileUrl(); + if(StringUtils.isBlank(downurl)){ + return; + } //特殊处理url downurl = subStrUrl(downurl); if(StringUtils.isBlank(downurl)){ diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml index 8d89969..1dd7dee 100644 --- a/src/main/resources/logback-spring.xml +++ b/src/main/resources/logback-spring.xml @@ -44,7 +44,7 @@ - + \ No newline at end of file diff --git a/src/main/resources/mapper/dbmysql/AfCollectAddMapper.xml b/src/main/resources/mapper/dbmysql/AfCollectAddMapper.xml index 92c197a..3ec60c5 100644 --- a/src/main/resources/mapper/dbmysql/AfCollectAddMapper.xml +++ b/src/main/resources/mapper/dbmysql/AfCollectAddMapper.xml @@ -56,7 +56,7 @@ WHERE - b.create_time BETWEEN #{startDate} AND #{endDate} + '23:59:59' + b.create_time BETWEEN #{startDate} AND concat(#{endDate},' 23:59:59') b.create_time >= #{startDate} diff --git a/src/main/resources/mapper/dbmysql/TScanAssortMapper.xml b/src/main/resources/mapper/dbmysql/TScanAssortMapper.xml index f6a5b4a..ec97535 100644 --- a/src/main/resources/mapper/dbmysql/TScanAssortMapper.xml +++ b/src/main/resources/mapper/dbmysql/TScanAssortMapper.xml @@ -19,7 +19,6 @@ -