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 f67a12a..7b7cbda 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 @@ -726,7 +726,7 @@ public class PatientScriptServiceImpl implements PatientScriptService { List patientScriptList = scriptMapper.selectList(patientScript2); //获取最后一个 if (CollectionUtil.isNotEmpty(patientScriptList)){ - PatientScript patientScript1 = patientScriptList.get(patientScriptList.size() - 1); + PatientScript patientScript1 = patientScriptList.get(0); if (patientScript1.getType().equals("dti")){ this.saveDti(patientScript1); }else { 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 575d32f..83026d3 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 @@ -39,7 +39,7 @@ public class ShellUtil { if (parts.length > 1) { String sex = parts[1].trim(); if(StringUtils.isNotEmpty(sex)&&StringUtils.isEmpty(patientScript.getPatientSex())&&!sex.equals("Unknown")){ - if ("M".equals(sex)){ + if ("男".equals(sex)){ patientScript.setPatientSex("男"); }else { patientScript.setPatientSex("女");