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 c112534..11ffcc2 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
@@ -1014,9 +1014,9 @@ public class PatientScriptServiceImpl implements PatientScriptService {
// 图片文件
placeholders.put("image4", Pictures.ofLocal(patientScript.getResImage().replace("Net","Net4")).size(260, 260).create());
- placeholders.put("kydw", Optional.ofNullable(patientScript.getKydw()).orElse(" "));
- placeholders.put("fzr", Optional.ofNullable(patientScript.getFzr()).orElse(" "));
- placeholders.put("phone", Optional.ofNullable(patientScript.getPhone()).orElse(" "));
+ placeholders.put("kydw", Optional.ofNullable(patientScript.getKydw()).orElse(" ")+" ");
+ placeholders.put("fzr", Optional.ofNullable(patientScript.getFzr()).orElse(" ")+" ");
+ placeholders.put("phone", Optional.ofNullable(patientScript.getPhone()).orElse(" ")+" ");
String brainInfo = "";
for (int i = 0; i < brainList.length; i++) {
if (i==brainList.length-1){
diff --git a/ruoyi-admin/src/main/resources/mapper/system/PatientScriptMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/PatientScriptMapper.xml
index 6e2329a..b9c4bb9 100644
--- a/ruoyi-admin/src/main/resources/mapper/system/PatientScriptMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/system/PatientScriptMapper.xml
@@ -29,6 +29,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
+
+
diff --git a/ruoyi-admin/src/main/resources/static/dealData.ftl b/ruoyi-admin/src/main/resources/static/dealData.ftl
index f12d404..b8ce186 100644
--- a/ruoyi-admin/src/main/resources/static/dealData.ftl
+++ b/ruoyi-admin/src/main/resources/static/dealData.ftl
@@ -3,7 +3,7 @@ cd /data
cd /data
echo "执行源文件处理脚本"
-python dealTest.py --base_dir ${playground} --output_dir ${playground}/BIDS_output --json_dir ${playground}/BIDS_output/sub-001/func/sub-001_task-rest_bold.json
+python dealTest.py --base_dir ${playground} --output_dir ${playground}/BIDS_output --json_dir ${playground}/BIDS_output/sub-001/func/
rm -rf ./${playground}/BIDS_output/config.json
cp ./README ${playground}/BIDS_output/
echo "通过源文件进行二次处理"
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
index e0efee8..c623072 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
@@ -26,7 +26,7 @@ public class FileUploadUtils
/**
* 默认大小 50M
*/
- public static final long DEFAULT_MAX_SIZE = 5000 * 1024 * 1024;
+ public static final long DEFAULT_MAX_SIZE = 50000 * 1024 * 1024;
/**
* 默认的文件名最大长度 100
@@ -206,10 +206,6 @@ public class FileUploadUtils
throws FileSizeLimitExceededException, InvalidExtensionException
{
long size = file.getSize();
- if (size > DEFAULT_MAX_SIZE)
- {
- throw new FileSizeLimitExceededException(DEFAULT_MAX_SIZE / 1024 / 1024);
- }
String fileName = file.getOriginalFilename();
String extension = getExtension(file);
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/constants/Constants.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/constants/Constants.java
index f6e05ed..157f865 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/constants/Constants.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/constants/Constants.java
@@ -6,5 +6,5 @@ public interface Constants {
// 常量密钥
String SECRET_KEY = "jinanshandongdianliangxinxijishu";
//密钥存储文件地址
- String KEY_FILE_PATH = "D:/overdue.txt";
+ String KEY_FILE_PATH = "/opt/overdue.txt";
}