diff --git a/ruoyi-admin/src/main/java/com/ruoyi/script/controller/PatientScriptController.java b/ruoyi-admin/src/main/java/com/ruoyi/script/controller/PatientScriptController.java index 44e96da..a152073 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/script/controller/PatientScriptController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/script/controller/PatientScriptController.java @@ -43,7 +43,6 @@ public class PatientScriptController extends BaseController { */ @GetMapping("/list") public TableDataInfo selectAll(PatientScript patientScript) { - patientScript.setIsAll("1"); startPage(); List list = patientScriptService.selectList(patientScript); return getDataTable(list); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/script/controller/PatientScriptController2.java b/ruoyi-admin/src/main/java/com/ruoyi/script/controller/PatientScriptController2.java index b91eecd..3797e7c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/script/controller/PatientScriptController2.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/script/controller/PatientScriptController2.java @@ -38,7 +38,7 @@ public class PatientScriptController2 extends BaseController { */ @GetMapping("/list") public TableDataInfo selectAll(PatientScript patientScript) { - patientScript.setIsAll("0"); + startPage(); List list = patientScriptService.selectList(patientScript); return getDataTable(list); @@ -52,7 +52,7 @@ public class PatientScriptController2 extends BaseController { */ @PostMapping("/add") public AjaxResult insert(@RequestBody PatientScript patientScript) throws IOException, InterruptedException, TemplateException { - patientScript.setIsAll("0"); + return toAjax(this.patientScriptService.save(patientScript)); } 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 fb99e60..e1c0ba7 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 @@ -688,7 +688,6 @@ public class PatientScriptServiceImpl implements PatientScriptService { @Override public Boolean saveBatch(List patientScripts) { for (PatientScript patientScript : patientScripts) { - patientScript.setIsAll("1"); patientScript.setStatus("待生成"); patientScript.setCreateId(SecurityUtils.getUserId()); patientScript.setCreateTime(new Date()); @@ -707,16 +706,16 @@ public class PatientScriptServiceImpl implements PatientScriptService { if (CollectionUtil.isNotEmpty(patientScripts)){ return; } - PatientScript patientScript3 =new PatientScript(); - patientScript3.setStatus("生成异常"); - patientScript3.setType("noDti"); - List patientScriptList3 = scriptMapper.selectList(patientScript3); - //获取最后一个 - if (CollectionUtil.isNotEmpty(patientScriptList3)){ - PatientScript patientScript1 = patientScriptList3.get(patientScriptList3.size() - 1); - this.save(patientScript1); - return; - } +// PatientScript patientScript3 =new PatientScript(); +// patientScript3.setStatus("生成异常"); +// patientScript3.setType("noDti"); +// List patientScriptList3 = scriptMapper.selectList(patientScript3); +// //获取最后一个 +// if (CollectionUtil.isNotEmpty(patientScriptList3)){ +// PatientScript patientScript1 = patientScriptList3.get(patientScriptList3.size() - 1); +// this.save(patientScript1); +// return; +// } PatientScript patientScript2 =new PatientScript(); patientScript2.setStatus("待生成"); patientScript2.setType("noDti"); @@ -1152,6 +1151,7 @@ public class PatientScriptServiceImpl implements PatientScriptService { if(StringUtils.isNotEmpty(mriInfo.getBrainInfo())){ if (classMap.containsKey(mriInfo.getBrainStr())){ classMap.put(mriInfo.getBrainStr(),classMap.get(mriInfo.getBrainInfo())+1); + msgList.add(mriInfo.getValue()); }else { classMap.put(mriInfo.getBrainStr(),1); @@ -1332,7 +1332,7 @@ public class PatientScriptServiceImpl implements PatientScriptService { //创建处理数据脚本 createDtiFile(shMap, dealDataSh,"dealData_dti.ftl"); //创建图片生成脚本 - createDtiFile(shMap, imgPath,"imgSh_dti.ftl"); + createDtiFile(shMap, imgPath,"img_dti.ftl"); //创建路径 File folder = new File(fmriOutPath); if (!folder.exists()) { // 检查文件夹是否已存在 diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index 2398fae..27b233c 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -7,12 +7,12 @@ spring: # 主库数据源 master: url: jdbc:mysql://127.0.0.1:3306/asd-project?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 - username: root - password: 123456 +# username: root +# password: 123456 ## url: jdbc:mysql://81.70.190.166:3306/asd-project?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 ## url: jdbc:mysql://81.70.190.166:3306/asd-project?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 -# username: mysqlRoot -# password: QQzcy@1014 + username: mysqlRoot + password: QQzcy@1014 # 从库数据源 # slave: # # 从数据源开关/默认关闭 diff --git a/ruoyi-sh/.env.production b/ruoyi-sh/.env.production index 7f22f67..9fdedb9 100644 --- a/ruoyi-sh/.env.production +++ b/ruoyi-sh/.env.production @@ -6,5 +6,5 @@ VUE_APP_TITLE = 孤独症辅助诊断评估系统 ENV = 'production' # ASD小程序管理系统/生产环境 -VUE_APP_BASE_API = 'https://www.jieyi-autism.com/asdProject' +VUE_APP_BASE_API = 'http://192.168.1.75:8082/asdProject' #VUE_APP_BASE_API = 'http://192.168.1.71:8082/asdProject' diff --git a/ruoyi-sh/src/views/system/shMenu/index.vue b/ruoyi-sh/src/views/system/shMenu/index.vue index f774af7..b6f564b 100644 --- a/ruoyi-sh/src/views/system/shMenu/index.vue +++ b/ruoyi-sh/src/views/system/shMenu/index.vue @@ -236,7 +236,7 @@ export default { // 表单参数 form: [ { - patientSex: '男', + patientSex: '', scanTime: '' } ], @@ -287,7 +287,7 @@ export default { reset() { this.form = [ { - patientSex: '男', + patientSex: '', scanTime: '' } ]; @@ -412,7 +412,7 @@ export default { }, addItem() { this.form.push({ - patientSex: '男', + patientSex: '', scanTime: '' }); }, diff --git a/ruoyi-sh/src/views/system/shMenu2/index.vue b/ruoyi-sh/src/views/system/shMenu2/index.vue index d1abbbc..d6115cd 100644 --- a/ruoyi-sh/src/views/system/shMenu2/index.vue +++ b/ruoyi-sh/src/views/system/shMenu2/index.vue @@ -236,7 +236,7 @@ export default { // 表单参数 form: [ { - patientSex: '男', + patientSex: '', scanTime: '' } ], @@ -287,7 +287,7 @@ export default { reset() { this.form = [ { - patientSex: '男', + patientSex: '', scanTime: '' } ]; @@ -412,7 +412,7 @@ export default { }, addItem() { this.form.push({ - patientSex: '男', + patientSex: '', scanTime: '' }); }, diff --git a/ruoyi-ui/.env.production b/ruoyi-ui/.env.production index 113fab2..35fca7c 100644 --- a/ruoyi-ui/.env.production +++ b/ruoyi-ui/.env.production @@ -7,4 +7,4 @@ ENV = 'production' # ASD小程序管理系统/生产环境 #VUE_APP_BASE_API = 'https://www.jieyi-autism.com/asdProject' -VUE_APP_BASE_API = 'http://192.168.1.71:8082/asdProject' +VUE_APP_BASE_API = 'http://192.168.1.75:8082/asdProject'