diff --git a/ruoyi-admin/src/main/java/com/ruoyi/script/util/ShellUtil.java b/ruoyi-admin/src/main/java/com/ruoyi/script/util/ShellUtil.java index 01f6840..87c4a6f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/script/util/ShellUtil.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/script/util/ShellUtil.java @@ -2,6 +2,7 @@ package com.ruoyi.script.util; import com.alibaba.fastjson2.JSONObject; import com.ruoyi.script.entity.PatientScript; +import org.apache.commons.lang3.StringUtils; import java.io.*; @@ -22,8 +23,13 @@ public class ShellUtil { patientScript.setRepetitionTime(jsonObject.get("tr").toString()); } - if (line.contains("brain_regions")&&line.contains("correlation")){ - patientScript.setResInfo(line); + if (line.contains("brain_regions")||line.contains("correlation")){ + String resInfo1 = patientScript.getResInfo(); + if (null==resInfo1){ + resInfo1=""; + } + resInfo1=resInfo1+"&*&*&"+line; + patientScript.setResInfo(resInfo1); } if (line.contains("result===")){ System.out.println(line+"result1************************************************************"); diff --git a/ruoyi-admin/src/main/resources/static/mriTemp.docx b/ruoyi-admin/src/main/resources/static/mriTemp.docx index bbac985..0884d7a 100644 Binary files a/ruoyi-admin/src/main/resources/static/mriTemp.docx and b/ruoyi-admin/src/main/resources/static/mriTemp.docx differ