修改完整性查询，时间范围查询错误

dataConfig/homeQualitySet.json

@@ -56,5 +56,5 @@
   "newSyncTime":"",
   //数据表名
   "syncTableName":"CIS_EMR_DOCUMENT",
-  "syncTableNamespaces":"DOCUS"
+  "syncTableNamespaces":"CDR"
 }

dataConfig/temp/collectTimeTemp

@@ -1 +1 @@
-{"lastTime":"2022-04-09 00:00:00"}
+{"lastTime":"2022-03-25 00:00:00"}

src/main/java/com/docus/bgts/service/MzSyncService.java

@@ -218,10 +218,9 @@ public class MzSyncService implements IMzSyncService {
                         if(jzh1.equals(jzh)){
                             List<MzSyncDetails> 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)){

src/main/resources/logback-spring.xml

@@ -44,7 +44,7 @@
     <!-- 指定项目中某个包，当有日志操作行为时的日志记录级别 -->
     <!-- com.liyan为根包，也就是只要是发生在这个根包下面的所有日志操作行为的权限都是DEBUG -->
     <!-- 级别依次为【从高到低】：FATAL > ERROR > WARN > INFO > DEBUG > TRACE  -->
-    <logger name="com.docus.bgts" level="INFO">
+    <!--<logger name="com.docus.bgts" level="debug">
         <appender-ref ref="demolog" />
-    </logger>
+    </logger>-->
 </configuration>

src/main/resources/mapper/dbmysql/AfCollectAddMapper.xml

@@ -56,7 +56,7 @@
         WHERE
         <choose>
             <when test="endDate != null and endDate != ''">
-                b.create_time BETWEEN #{startDate} AND #{endDate} + '23:59:59'
+                b.create_time BETWEEN #{startDate} AND concat(#{endDate},' 23:59:59')
             </when>
             <otherwise>
                 b.create_time >= #{startDate}

src/main/resources/mapper/dbmysql/TScanAssortMapper.xml

@@ -19,7 +19,6 @@
         <collection property="mzSyncDetails" ofType="com.docus.bgts.entity.MzSyncDetails">
             <result property="serialnum" column="serialnum"></result>
             <result property="fileTitle" column="file_title"></result>
-            <result property="fileUrl" column="fileUrl"></result>
         </collection>
     </resultMap>
 </mapper>