wangyizhe/his
1
3
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

345 门诊挂号：患者性别数据展示与档案不一致（档案为“女”，挂号显示“未知”）

Browse Source
This commit is contained in:
duzhongxu
2026-04-09 13:57:41 +08:00
parent 8a4be4e2ce
commit 6642fd9e1c
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfStudentListImportDto.java
View File

@@ -25,7 +25,7 @@ public class GfStudentListImportDto {
private String name; private String name;
/** 性别 */ /** 性别 */
@Excel(name = "性别", prompt = "必填", readConverterExp = "0=男性,1=女性,2=未知", combo = "男性,女性,未知") @Excel(name = "性别", prompt = "必填", readConverterExp = "1=男,2=女,0=未知", combo = "男,女,未知")
private String gender; private String gender;
/** 学号 */ /** 学号 */

8
openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AdministrativeGender.java
View File

@@ -5,17 +5,17 @@ import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;
/** /**
* 性别 0=男,1=女,2=未知(和若依框架保持一致) * 性别 0=未知,1=男,2=女(与数据库adm_patient.gender_enum字段保持一致)
*/ */
@Getter @Getter
@AllArgsConstructor @AllArgsConstructor
public enum AdministrativeGender implements HisEnumInterface { public enum AdministrativeGender implements HisEnumInterface {
MALE(0, "male", "男性"), MALE(1, "male", "男"),
FEMALE(1, "female", "女性"), FEMALE(2, "female", "女"),
UNKNOWN(2, "unknown", "未知"); UNKNOWN(0, "unknown", "未知");
@EnumValue @EnumValue
private final Integer value; private final Integer value;

4
openhis-ui-vue3/src/components/PatientList/index.vue
View File

@@ -49,7 +49,7 @@
size="small" size="small"
class="age-tag" class="age-tag"
effect="plain" effect="plain"
:class="{ 'age-tag-female': item.genderEnum_enumText === '女性' }" :class="{ 'age-tag-female': item.genderEnum_enumText === '女' }"
> >
{{ item.genderEnum_enumText || '-' }} {{ item.genderEnum_enumText || '-' }}
<span v-if="item.age"> · {{ item.age }}</span> <span v-if="item.age"> · {{ item.age }}</span>
@@ -109,7 +109,7 @@
size="small" size="small"
class="age-tag" class="age-tag"
effect="plain" effect="plain"
:class="{ 'age-tag-female': item.genderEnum_enumText === '女性' }" :class="{ 'age-tag-female': item.genderEnum_enumText === '女' }"
> >
{{ item.genderEnum_enumText || '-' }} {{ item.genderEnum_enumText || '-' }}
<span v-if="item.age"> · {{ item.age }}</span> <span v-if="item.age"> · {{ item.age }}</span>

4
openhis-ui-vue3/src/utils/validate.js
View File

@@ -121,7 +121,7 @@ export function getGenderAndAge(idCard) {
if (m < 0 || (m === 0 && new Date().getDate() < dateOfBirth.getDate())) { if (m < 0 || (m === 0 && new Date().getDate() < dateOfBirth.getDate())) {
age--; age--;
} }
// 提取性别 // 提取性别（身份证第17位：奇数=男, 偶数=女）对应数据库字典 1=男 2=女
const gender = idCard.charAt(16) % 2 === 0 ? 1 : 0; const gender = idCard.charAt(16) % 2 === 0 ? 2 : 1;
return { age, gender }; return { age, gender };
} }