From 6642fd9e1c2d4695109f0fa68ec09afae5c1dc84 Mon Sep 17 00:00:00 2001
From: duzhongxu <15039018447@163.com>
Date: Thu, 9 Apr 2026 13:57:41 +0800
Subject: [PATCH] =?UTF-8?q?345=20=E9=97=A8=E8=AF=8A=E6=8C=82=E5=8F=B7?=
=?UTF-8?q?=EF=BC=9A=E6=82=A3=E8=80=85=E6=80=A7=E5=88=AB=E6=95=B0=E6=8D=AE?=
=?UTF-8?q?=E5=B1=95=E7=A4=BA=E4=B8=8E=E6=A1=A3=E6=A1=88=E4=B8=8D=E4=B8=80?=
=?UTF-8?q?=E8=87=B4=EF=BC=88=E6=A1=A3=E6=A1=88=E4=B8=BA=E2=80=9C=E5=A5=B3?=
=?UTF-8?q?=E2=80=9D=EF=BC=8C=E6=8C=82=E5=8F=B7=E6=98=BE=E7=A4=BA=E2=80=9C?=
=?UTF-8?q?=E6=9C=AA=E7=9F=A5=E2=80=9D=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/openhis/web/nenu/dto/GfStudentListImportDto.java | 2 +-
.../com/openhis/common/enums/AdministrativeGender.java | 8 ++++----
openhis-ui-vue3/src/components/PatientList/index.vue | 4 ++--
openhis-ui-vue3/src/utils/validate.js | 4 ++--
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfStudentListImportDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfStudentListImportDto.java
index 61be16e2..74b42b94 100644
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfStudentListImportDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfStudentListImportDto.java
@@ -25,7 +25,7 @@ public class GfStudentListImportDto {
private String name;
/** 性别 */
- @Excel(name = "性别", prompt = "必填", readConverterExp = "0=男性,1=女性,2=未知", combo = "男性,女性,未知")
+ @Excel(name = "性别", prompt = "必填", readConverterExp = "1=男,2=女,0=未知", combo = "男,女,未知")
private String gender;
/** 学号 */
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AdministrativeGender.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AdministrativeGender.java
index 4a8c7d2c..2a632eea 100644
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AdministrativeGender.java
+++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AdministrativeGender.java
@@ -5,17 +5,17 @@ import lombok.AllArgsConstructor;
import lombok.Getter;
/**
- * 性别 0=男,1=女,2=未知(和若依框架保持一致)
+ * 性别 0=未知,1=男,2=女(与数据库adm_patient.gender_enum字段保持一致)
*/
@Getter
@AllArgsConstructor
public enum AdministrativeGender implements HisEnumInterface {
- MALE(0, "male", "男性"),
+ MALE(1, "male", "男"),
- FEMALE(1, "female", "女性"),
+ FEMALE(2, "female", "女"),
- UNKNOWN(2, "unknown", "未知");
+ UNKNOWN(0, "unknown", "未知");
@EnumValue
private final Integer value;
diff --git a/openhis-ui-vue3/src/components/PatientList/index.vue b/openhis-ui-vue3/src/components/PatientList/index.vue
index 7b83d75c..667c08d3 100644
--- a/openhis-ui-vue3/src/components/PatientList/index.vue
+++ b/openhis-ui-vue3/src/components/PatientList/index.vue
@@ -49,7 +49,7 @@
size="small"
class="age-tag"
effect="plain"
- :class="{ 'age-tag-female': item.genderEnum_enumText === '女性' }"
+ :class="{ 'age-tag-female': item.genderEnum_enumText === '女' }"
>
{{ item.genderEnum_enumText || '-' }}
· {{ item.age }}
@@ -109,7 +109,7 @@
size="small"
class="age-tag"
effect="plain"
- :class="{ 'age-tag-female': item.genderEnum_enumText === '女性' }"
+ :class="{ 'age-tag-female': item.genderEnum_enumText === '女' }"
>
{{ item.genderEnum_enumText || '-' }}
· {{ item.age }}
diff --git a/openhis-ui-vue3/src/utils/validate.js b/openhis-ui-vue3/src/utils/validate.js
index 61b430de..27e89691 100644
--- a/openhis-ui-vue3/src/utils/validate.js
+++ b/openhis-ui-vue3/src/utils/validate.js
@@ -121,7 +121,7 @@ export function getGenderAndAge(idCard) {
if (m < 0 || (m === 0 && new Date().getDate() < dateOfBirth.getDate())) {
age--;
}
- // 提取性别
- const gender = idCard.charAt(16) % 2 === 0 ? 1 : 0;
+ // 提取性别（身份证第17位：奇数=男, 偶数=女）对应数据库字典 1=男 2=女
+ const gender = idCard.charAt(16) % 2 === 0 ? 2 : 1;
return { age, gender };
}