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

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;
 
     /** 学号 */

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;