From 95672bbf88c9ddc2f4d7b3a4c6082495f8306476 Mon Sep 17 00:00:00 2001
From: wyb <1977763549@qq.com>
Date: Fri, 26 Sep 2025 12:08:52 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=A2=85=E5=B7=9E=E4=B8=89=E9=99=A2?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BF=83=E7=90=86=E9=87=8F=E8=A1=A8=E9=87=87?=
 =?UTF-8?q?=E9=9B=86=EF=BC=8C=E6=96=87=E4=BB=B6=E6=8E=92=E5=BA=8F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/docus/server/mzsy/job/MzsyReportCollectJob.java | 5 +++--
 src/main/resources/mapper/MzsyReportDataViewMapper.xml       | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/docus/server/mzsy/job/MzsyReportCollectJob.java b/src/main/java/com/docus/server/mzsy/job/MzsyReportCollectJob.java
index c6d4231..d187c36 100644
--- a/src/main/java/com/docus/server/mzsy/job/MzsyReportCollectJob.java
+++ b/src/main/java/com/docus/server/mzsy/job/MzsyReportCollectJob.java
@@ -82,7 +82,7 @@ public class MzsyReportCollectJob {
             reportDownDto.setIp("");
             reportDownDto.setPatient(patient);
             int sort = 0;
-            tBasicMapper.cancelTask(downTwoDto.getPatientId(),collectorId);
+            tBasicMapper.invalidFileBySource(downTwoDto.getPatientId(),collectorId);
             for (MzsyReportDataView mzsyReportDataView : mzsyReportDataViewList) {
                 ReportDownScanFileDto reportDownScanFileDto = new ReportDownScanFileDto();
                 reportDownScanFileDto.setDownurl(mzsyReportDataView.getFfilePath());
@@ -154,7 +154,7 @@ public class MzsyReportCollectJob {
             reportDownDto.setIp("");
             reportDownDto.setPatient(patient);
             int sort = 0;
-            tBasicMapper.cancelTask(downTwoDto.getPatientId(),collectorId);
+            tBasicMapper.invalidFileBySource(downTwoDto.getPatientId(),collectorId);
             for (MzsyShoumaReportDataView mzsyShouMaReportDataView : shoumaReportDataViewList) {
                 ReportDownScanFileDto reportDownScanFileDto = new ReportDownScanFileDto();
                 reportDownScanFileDto.setDownurl(mzsyShouMaReportDataView.getFilePath());
@@ -217,6 +217,7 @@ public class MzsyReportCollectJob {
                 reportDownDto.setIp("");
                 reportDownDto.setPatient(patient);
                 int sort = 0;
+                tBasicMapper.invalidFileBySource(downTwoDto.getPatientId(),collectorId);
                 for (MzsyMectReportView mzsyMectReportView : mzsyMectReportViews) {
                     ReportDownScanFileDto reportDownScanFileDto = new ReportDownScanFileDto();
                     reportDownScanFileDto.setDownurl(mzsyMectReportView.getPdfReportPath());
diff --git a/src/main/resources/mapper/MzsyReportDataViewMapper.xml b/src/main/resources/mapper/MzsyReportDataViewMapper.xml
index 57c17e4..5371d5e 100644
--- a/src/main/resources/mapper/MzsyReportDataViewMapper.xml
+++ b/src/main/resources/mapper/MzsyReportDataViewMapper.xml
@@ -22,7 +22,7 @@
         <if test="ext != null and ext != ''">
             ${ext}
         </if>
-        order by FPAT_MODULE asc,FFILE_AF_TIME asc
+        order by FPAT_MODULE asc,FFILE_AF_TIME asc,FFILE_TIME asc
     </select>
     <select id="findByPatIdAndOtherCondition" resultType="com.docus.server.mzsy.entity.MzsyMectReportView">
         SELECT  apply_id as applyId,