fix: 梅州三院采集先作废全部文件

src/main/java/com/docus/server/mzsy/job/MzsyReportCollectJob.java

@@ -5,6 +5,7 @@ import com.docus.core.util.Func;
 import com.docus.infrastructure.core.utils.TableJsonRead;
 import com.docus.infrastructure.web.api.CommonResult;
 import com.docus.infrastructure.web.api.ResultCode;
+import com.docus.server.archive.mapper.TBasicMapper;
 import com.docus.server.mzsy.entity.MzsyMectReportView;
 import com.docus.server.mzsy.entity.MzsyReportDataView;
 import com.docus.server.mzsy.entity.MzsyShoumaReportDataView;
@@ -38,6 +39,8 @@ public class MzsyReportCollectJob {
     private MzsyReportDataViewMapper reportDataViewMapper;
     @Autowired
     private MzsyShoumaReportDataViewMapper shoumaReportDataViewMapper;
+    @Autowired
+    private TBasicMapper tBasicMapper;
 
     @XxlJob("MzsyReportCollectJob")
     public void reportCollect() {
@@ -79,6 +82,7 @@ public class MzsyReportCollectJob {
             reportDownDto.setIp("");
             reportDownDto.setPatient(patient);
             int sort = 0;
+            tBasicMapper.cancelTask(downTwoDto.getPatientId(),collectorId);
             for (MzsyReportDataView mzsyReportDataView : mzsyReportDataViewList) {
                 ReportDownScanFileDto reportDownScanFileDto = new ReportDownScanFileDto();
                 reportDownScanFileDto.setDownurl(mzsyReportDataView.getFfilePath());
@@ -150,6 +154,7 @@ public class MzsyReportCollectJob {
             reportDownDto.setIp("");
             reportDownDto.setPatient(patient);
             int sort = 0;
+            tBasicMapper.cancelTask(downTwoDto.getPatientId(),collectorId);
             for (MzsyShoumaReportDataView mzsyShouMaReportDataView : shoumaReportDataViewList) {
                 ReportDownScanFileDto reportDownScanFileDto = new ReportDownScanFileDto();
                 reportDownScanFileDto.setDownurl(mzsyShouMaReportDataView.getFilePath());

src/main/resources/mapper/TBasicMapper.xml

@@ -40,7 +40,7 @@
     <select id="getTbasicByReportTimeAndInpNoOrIdCard" resultType="com.docus.server.archive.entity.TBasic">
         select
             patient_id as patientId,
-            inpatient_no as   inpatientNo,
+            inpatient_no as   inpati
             name,
             admiss_date as admissDate,
             dis_date as  disDate,