From e193d526d7b5e162db8a2112e2f7b2889ba8c3e6 Mon Sep 17 00:00:00 2001
From: lichuanyang <1176537920@qq.com>
Date: Thu, 15 Aug 2024 17:09:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dal/mysql/dicomworklist/DicomworklistMapper.java | 12 ++++++++++++
 .../patientexamlist/PatientexamlistServiceImpl.java  |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dicomworklist/DicomworklistMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dicomworklist/DicomworklistMapper.java
index 554f8dcee..cad0315b7 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dicomworklist/DicomworklistMapper.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dicomworklist/DicomworklistMapper.java
@@ -65,6 +65,7 @@ public interface DicomworklistMapper extends BaseMapperX<DicomworklistDO> {
 
     // 根据Series的SeriesInst查询Dicomiamge表对应的数据
     List<DicomImagesDO> GetDicomImageData(@Param("SeriesInst") String SeriesInst, @Param("orgId") String orgId);
+
     // 根据Series的SeriesInst集合查询Dicomiamge表对应的数据
     List<DicomImagesDO> GetDicomImageListData(@Param("seriesInstList") List<String> seriesInstList, @Param("orgId") String orgId);
 
@@ -77,6 +78,17 @@ public interface DicomworklistMapper extends BaseMapperX<DicomworklistDO> {
     @Select(" SELECT t1.* FROM dicomseries t1 WHERE t1.StudyInsta=#{studyInsta} ")
     List<DicomSeriesDO> GetDicomSeriesByStudyInsta(@Param("studyInsta") String studyInsta);
 
+    @Select(" SELECT CONCAT(\n" +
+            "(SELECT CAST(COUNT(*) AS CHAR) FROM dicomstudies t1\n" +
+            " LEFT JOIN dicomseries t2 ON t1.StudyInsta=t2.StudyInsta\n" +
+            " WHERE t1.PatientID=#{patientID} AND t1.StudyInsta=#{studyInsta})\n" +
+            ",'/',\n" +
+            "(SELECT CAST(COUNT(*) AS CHAR) FROM dicomstudies t1\n" +
+            " LEFT JOIN dicomseries t2 ON t1.StudyInsta=t2.StudyInsta\n" +
+            " LEFT JOIN dicomimages t3 ON t2.SeriesInst=t3.SeriesInst\n" +
+            " WHERE t1.PatientID=#{patientID} AND t1.StudyInsta=#{studyInsta})) ")
+    String GetSeDcByPatientIDAndStudyInsta(@Param("patientID") String patientID, @Param("studyInsta") String studyInsta);
+
     @Update(" UPDATE dicompatients t1 SET t1.dataSync='1' WHERE t1.PatientID=#{patientID} ")
     int UpdateDataSyncOfDicompatientsByPatientID(@Param("patientID") String patientID);
 }
\ No newline at end of file
diff --git a/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/service/patientexamlist/PatientexamlistServiceImpl.java b/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/service/patientexamlist/PatientexamlistServiceImpl.java
index fe9e4488a..560625bfc 100644
--- a/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/service/patientexamlist/PatientexamlistServiceImpl.java
+++ b/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/service/patientexamlist/PatientexamlistServiceImpl.java
@@ -143,11 +143,11 @@ public class PatientexamlistServiceImpl implements PatientexamlistService {
                         patientexamlist.setReportstatus("待分析");
                         patientexamlist.setApplicationDate(dateTime);
                         patientexamlist.setBillDoctorDepartment("影像科");
+                        patientexamlist.setSeDc(dicomworklistMapper.GetSeDcByPatientIDAndStudyInsta(dicomStudie.getPatientID(),dicomStudie.getStudyInsta()));
                         patientexamlist.setCreateDate(dateTime);
                         patientexamlist.setOrgId(dicomStudie.getOrgId());
                         if (dicomSeries != null && dicomSeries.size() > 0) {
                             patientexamlist.setOrgName(dicomSeries.get(0).getInstitutio());
-                            //patientexamlist.setSeDc(null);
                         }
                         //框架需要
                         //patientexamlist.setExamId(null);