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 @@
${ext}
- order by FPAT_MODULE asc,FFILE_AF_TIME asc
+ order by FPAT_MODULE asc,FFILE_AF_TIME asc,FFILE_TIME asc