feat: 梅州三院添加心理量表采集，文件排序修改

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

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,