From 43eb5e70afcb4b92b6a715bbd0d061ceb5b34d40 Mon Sep 17 00:00:00 2001
From: mozzie <himozzie@foxmail.com>
Date: Wed, 30 Aug 2023 17:11:44 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=B8=8A=E4=BC=A0=E5=85=A8=E9=83=A8?=
 =?UTF-8?q?=E5=BD=B1=E5=83=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Dicom/Upload/DicomTable/columns.tsx       | 13 ++++++++-----
 .../Admin/Dicom/Upload/DicomUploader/index.tsx      |  1 +
 .../Admin/Dicom/Upload/DicomUploader/util.ts        |  2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/apps/dmp/src/modules/Admin/Dicom/Upload/DicomTable/columns.tsx b/apps/dmp/src/modules/Admin/Dicom/Upload/DicomTable/columns.tsx
index 70b5f35..0d99d3e 100644
--- a/apps/dmp/src/modules/Admin/Dicom/Upload/DicomTable/columns.tsx
+++ b/apps/dmp/src/modules/Admin/Dicom/Upload/DicomTable/columns.tsx
@@ -12,11 +12,14 @@ export const columnsForStudy: TableColumnsType<Study> = [
   {
     title: "切片数量",
     key: "seriesNumber",
-    render: (_: any, record: Study) => (
-      <span>
-        {record.subs.map((s) => s.subs.length).reduce((p, n) => p + n)}
-      </span>
-    ),
+    render: (_: any, record: Study) => {
+      console.log(record);
+      return (
+        <span>
+          {record.subs.map((s) => s.subs.length).reduce((p, n) => p + n)}
+        </span>
+      );
+    },
   },
   { title: "年龄", dataIndex: "patientAge", key: "patientAge" },
   { title: "性别", dataIndex: "patientSex", key: "patientSex" },
diff --git a/apps/dmp/src/modules/Admin/Dicom/Upload/DicomUploader/index.tsx b/apps/dmp/src/modules/Admin/Dicom/Upload/DicomUploader/index.tsx
index 0c94128..c58b6ec 100644
--- a/apps/dmp/src/modules/Admin/Dicom/Upload/DicomUploader/index.tsx
+++ b/apps/dmp/src/modules/Admin/Dicom/Upload/DicomUploader/index.tsx
@@ -42,6 +42,7 @@ export const useDicomUploader = () => {
     //TODO: 耗时
     setIsLoading(true);
     const studys = await parseDcmFiles(dcmFiles);
+    console.log("studys", studys);
     setStudys(studys);
     setIsLoading(false);
   };
diff --git a/apps/dmp/src/modules/Admin/Dicom/Upload/DicomUploader/util.ts b/apps/dmp/src/modules/Admin/Dicom/Upload/DicomUploader/util.ts
index b3aa9b1..df234a8 100644
--- a/apps/dmp/src/modules/Admin/Dicom/Upload/DicomUploader/util.ts
+++ b/apps/dmp/src/modules/Admin/Dicom/Upload/DicomUploader/util.ts
@@ -69,7 +69,7 @@ export const parseDcmFiles = async (dcmFiles: File[]): Promise<Study[]> => {
       }
       // 序列级别
       let series = study.subs.find(
-        (s) => s.SeriesInstanceUID === SeriesInstanceUID
+        (s) => s.SeriesInstanceUID === SeriesInstanceUID && s.
       );
       if (!series) {
         series = {