From 0f250c71fc40445bb7ee81830b5ab862f67a0084 Mon Sep 17 00:00:00 2001
From: zhuchunyun <zhuchunyun>
Date: Mon, 14 Apr 2025 22:21:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=BB=E9=99=A2=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/script/service/impl/PatientScriptServiceImpl.java | 6 ++++--
 .../main/resources/mapper/system/PatientScriptMapper.xml    | 6 +++++-
 ruoyi-admin/src/main/resources/static/dealData.ftl          | 2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/script/service/impl/PatientScriptServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/script/service/impl/PatientScriptServiceImpl.java
index 335e78e..b186c70 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/script/service/impl/PatientScriptServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/script/service/impl/PatientScriptServiceImpl.java
@@ -243,15 +243,17 @@ public class PatientScriptServiceImpl implements PatientScriptService {
                                              } else {
                                                  System.out.println("文件夹已存在，无需再次创建！");
                                              }
-                                             patientScript.setPatientAge("0");
                                              //处理数据处理格式
                                              ShellUtil.execCmd("dos2unix "+dealDataSh);
                                              shUtil(dealDataSh,patientScript);
+                                             if (StringUtils.isEmpty(patientScript.getPatientAge())){
+                                                 patientScript.setPatientAge("0");
+                                             }
                                              shMap.put("tr",patientScript.getRepetitionTime());
                                              shMap.put("age",patientScript.getPatientAge());
                                              //创建总脚本
                                              createFile(shMap, shPath,"cpacSh.ftl");
-
+                                             scriptMapper.updateStatus(patientScript);
                                              //处理脚本文件格式
                                              ShellUtil.execCmd("dos2unix "+shPath);
                                              ShellUtil.execCmd("dos2unix "+imgPath);
diff --git a/ruoyi-admin/src/main/resources/mapper/system/PatientScriptMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/PatientScriptMapper.xml
index b9c4bb9..5fbb438 100644
--- a/ruoyi-admin/src/main/resources/mapper/system/PatientScriptMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/system/PatientScriptMapper.xml
@@ -38,7 +38,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update patient_script
         set `status` = #{status}
         ,`res_image` = #{resImage}
-        ,`res_info` = #{resInfo}
+        ,`res_info` = #{resInfo},
+            patient_name = #{patientName},
+            patient_age = #{patientAge},
+            patient_sex = #{patientSex},
+            repetition_time = #{repetitionTime}
         where id = #{id}
     </update>
     <delete id="removeByIds" parameterType="java.util.List">
diff --git a/ruoyi-admin/src/main/resources/static/dealData.ftl b/ruoyi-admin/src/main/resources/static/dealData.ftl
index 422ebdb..c02fc78 100644
--- a/ruoyi-admin/src/main/resources/static/dealData.ftl
+++ b/ruoyi-admin/src/main/resources/static/dealData.ftl
@@ -8,4 +8,4 @@ rm -rf ./${playground}/BIDS_output/config.json
 cp ./README  ${playground}/BIDS_output/
 echo "通过源文件进行二次处理"
 docker run --rm -e DOCKER_VERSION_8395080871=27.3.1  -v /data/license.txt:/opt/freesurfer/license.txt:ro -v /data/${playground}/BIDS_output:/data:ro -v /data/${playground}/preprocessed:/out nipreps/fmriprep:23.2.3 /data /out participant --participant-label 001 --fs-no-reconall
-python script.py --dicom_folder ${playground}
+python scriptAge.py --dicom_folder ${playground}