From 759cedfb2262cf125a28cb2d0ab8c0cb44334c16 Mon Sep 17 00:00:00 2001
From: tan <11033394+tanzr@user.noreply.gitee.com>
Date: Wed, 10 Jan 2024 11:46:21 +0800
Subject: [PATCH] push

---
 .../docus/bgts/handler/TBasicWebService.java  |   2 +-
 .../service/AfCollectTaskServiceImpl.java     | 100 +++++++++---------
 2 files changed, 53 insertions(+), 49 deletions(-)

diff --git a/src/main/java/com/docus/bgts/handler/TBasicWebService.java b/src/main/java/com/docus/bgts/handler/TBasicWebService.java
index 3423f97..f2e3389 100644
--- a/src/main/java/com/docus/bgts/handler/TBasicWebService.java
+++ b/src/main/java/com/docus/bgts/handler/TBasicWebService.java
@@ -333,7 +333,7 @@ public class TBasicWebService implements ITBasicWebService {
                 }
 
                 //插入医生提交时间
-            //    afCollectTaskService.updateDoctorSubmitTime(reportDownDto, doctorSubmitTime);
+               // afCollectTaskService.updateDoctorSubmitTime(reportDownDto, doctorSubmitTime);
                 //插入医生提交状态
               //  afCollectTaskService.insertDoctorState(reportDownDto, doctorSubmitTime);
                 //插入文件af_collect_task表数据
diff --git a/src/main/java/com/docus/bgts/service/AfCollectTaskServiceImpl.java b/src/main/java/com/docus/bgts/service/AfCollectTaskServiceImpl.java
index eb1098f..0735486 100644
--- a/src/main/java/com/docus/bgts/service/AfCollectTaskServiceImpl.java
+++ b/src/main/java/com/docus/bgts/service/AfCollectTaskServiceImpl.java
@@ -135,60 +135,64 @@ public class AfCollectTaskServiceImpl extends ServiceImpl<AfCollectTaskMapper, A
     @Transactional
     @Override
     public void insert(ReportDownDto reportDownDto) {
-        if (reportDownDto.getScanfiles().get(0).getFiletype() == 1) {
-            log.info("新增任务表初始数据：" + reportDownDto);
-        }
-        AfCollectTask afCollectTask;
-        String patientId = getpatientIdByEmpId(reportDownDto.getPatient().getJzh());
-        if (StringUtils.isBlank(patientId)) {
-            throw new RuntimeException("操作的病案信息不存在");
-        }
-        Date date = new Date();
-        Integer save = null;
-        List<ReportDownScanFileDto> scanfiles = reportDownDto.getScanfiles();
-        for (ReportDownScanFileDto scanfile : scanfiles) {
-            long l = System.currentTimeMillis();
 
-            // 判断任务是否已存在
-            afCollectTask = afCollectTaskMapper.selectOne(new QueryWrapper<AfCollectTask>().eq("C1", scanfile.getSerialnum()).eq("sysflag", reportDownDto.getCollectorid()));
-            if (afCollectTask == null || afCollectTask.getId() == null) {
-                //不存在 新增
-                afCollectTask = new AfCollectTask();
-                afCollectTask.setPatientId(patientId);
-                afCollectTask.setSysflag(reportDownDto.getCollectorid());
-                afCollectTask.setState("0");
-                afCollectTask.setSyncTime(date);
-                afCollectTask.setC1(scanfile.getSerialnum());
-                afCollectTask.setC2(scanfile.getFiletitle());
-                afCollectTask.setC3(reportDownDto.getPatient().getJzh());
-                save = afCollectTaskMapper.insert(afCollectTask);
+            if (reportDownDto.getScanfiles().get(0).getFiletype() == 1) {
+                log.info("新增任务表初始数据：" + reportDownDto);
+            }
+            AfCollectTask afCollectTask;
+            String patientId = getpatientIdByEmpId(reportDownDto.getPatient().getJzh());
+            if (StringUtils.isBlank(patientId)) {
+                throw new RuntimeException("操作的病案信息不存在");
+            }
+            Date date = new Date();
+            Integer save = null;
+            List<ReportDownScanFileDto> scanfiles = reportDownDto.getScanfiles();
+            for (ReportDownScanFileDto scanfile : scanfiles) {
+                long l = System.currentTimeMillis();
+
+                // 判断任务是否已存在
+                synchronized (this) {
+                    afCollectTask = afCollectTaskMapper.selectOne(new QueryWrapper<AfCollectTask>().eq("C1", scanfile.getSerialnum()).eq("sysflag", reportDownDto.getCollectorid()));
+                    if (afCollectTask == null || afCollectTask.getId() == null) {
+                        //不存在 新增
+                        afCollectTask = new AfCollectTask();
+                        afCollectTask.setPatientId(patientId);
+                        afCollectTask.setSysflag(reportDownDto.getCollectorid());
+                        afCollectTask.setState("0");
+                        afCollectTask.setSyncTime(date);
+                        afCollectTask.setC1(scanfile.getSerialnum());
+                        afCollectTask.setC2(scanfile.getFiletitle());
+                        afCollectTask.setC3(reportDownDto.getPatient().getJzh());
+                        save = afCollectTaskMapper.insert(afCollectTask);
 
-            } else {
+                    } else {
 
-                //存在就修改
-                afCollectTask.setPatientId(patientId);
-                afCollectTask.setSysflag(reportDownDto.getCollectorid());
-                afCollectTask.setState("0");
-                afCollectTask.setSyncTime(date);
-                afCollectTask.setC1(scanfile.getSerialnum());
-                afCollectTask.setC2(scanfile.getFiletitle());
-                afCollectTask.setC3(reportDownDto.getPatient().getJzh());
-                save = afCollectTaskMapper.updateById(afCollectTask);
+                        //存在就修改
+                        afCollectTask.setPatientId(patientId);
+                        afCollectTask.setSysflag(reportDownDto.getCollectorid());
+                        afCollectTask.setState("0");
+                        afCollectTask.setSyncTime(date);
+                        afCollectTask.setC1(scanfile.getSerialnum());
+                        afCollectTask.setC2(scanfile.getFiletitle());
+                        afCollectTask.setC3(reportDownDto.getPatient().getJzh());
+                        save = afCollectTaskMapper.updateById(afCollectTask);
 
-            }
+                    }
+                }
 
-            if (save <= 0) {
-                log.info("任务表操作出错");
-                throw new RuntimeException("插入病案任务表数据出错");
-            }
-            if (afCollectTask.getId() != null) {
-                scanfile.setTaskid(afCollectTask.getId());
-            } else {
-                log.info("插入任务id为空！");
-                throw new RuntimeException("插入任务id为空");
+                if (save <= 0) {
+                    log.info("任务表操作出错");
+                    throw new RuntimeException("插入病案任务表数据出错");
+                }
+                if (afCollectTask.getId() != null) {
+                    scanfile.setTaskid(afCollectTask.getId());
+                } else {
+                    log.info("插入任务id为空！");
+                    throw new RuntimeException("插入任务id为空");
+                }
             }
-        }
-        reportDownDto.setScanfiles(scanfiles);
+            reportDownDto.setScanfiles(scanfiles);
+
     }
 
     @Override