diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/controller/PatientInformationController.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/controller/PatientInformationController.java
index 8da7636b..c5f75df0 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/controller/PatientInformationController.java
+++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/controller/PatientInformationController.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
+import com.core.common.utils.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -11,10 +12,6 @@ import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
 import com.core.common.enums.AssignSeqEnum;
-import com.core.common.utils.AssignSeqUtil;
-import com.core.common.utils.ChineseConvertUtils;
-import com.core.common.utils.MessageUtils;
-import com.core.common.utils.StringUtils;
 import com.core.common.utils.bean.BeanUtils;
 import com.openhis.administration.domain.Patient;
 import com.openhis.administration.service.IPatientService;
@@ -183,8 +180,8 @@ public class PatientInformationController {
         // 设置五笔首拼
         patient.setWbStr(ChineseConvertUtils.toWBFirstLetter(patient.getName()));
         // 设置地址
-        String fullAddress = stringUtils.joinStrings(patient.getAddress(), patient.getAddressProvince(),
-            patient.getAddressCity(), patient.getAddressDistrict(), patient.getAddressStreet());
+        String fullAddress = stringUtils.joinStrings(patient.getAddressProvince(),
+            patient.getAddressCity(), patient.getAddressDistrict(), patient.getAddressStreet(),patient.getAddress());
         patient.setAddress(fullAddress);
 
         // 调用服务层保存病人信息
@@ -215,8 +212,8 @@ public class PatientInformationController {
         // 设置五笔首拼
         patient.setWbStr(ChineseConvertUtils.toWBFirstLetter(patient.getName()));
         // 设置地址
-        String fullAddress = stringUtils.joinStrings(patient.getAddress(), patient.getAddressProvince(),
-            patient.getAddressCity(), patient.getAddressDistrict(), patient.getAddressStreet());
+        String fullAddress = stringUtils.joinStrings(patient.getAddressProvince(),
+            patient.getAddressCity(), patient.getAddressDistrict(), patient.getAddressStreet(),patient.getAddress());
         patient.setAddress(fullAddress);
 
         // 调用服务层更新病人信息
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/dto/PatientInformationDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/dto/PatientInformationDto.java
index 300a346a..396ddc02 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/dto/PatientInformationDto.java
+++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/dto/PatientInformationDto.java
@@ -35,19 +35,19 @@ public class PatientInformationDto {
     private String busNo;
 
     /** 性别编码 */
-    private AdministrativeGender genderEnum;
+    private Integer genderEnum;
 
     /** 生日 */
     private Date birthDate;
 
     /** 死亡时间 */
-    private Date deceasedDate;
+    private String deceasedDate;
 
     /** 婚姻状态 */
-    private MaritalStatus maritalStatusEnum;
+    private Integer maritalStatusEnum;
 
     /** 职业编码 */
-    private OccupationType prfsEnum;
+    private Integer prfsEnum;
 
     /** 电话 */
     private String phone;
@@ -83,10 +83,10 @@ public class PatientInformationDto {
     private String wbStr;
 
     /** 血型ABO */
-    private String bloodAbo;
+    private Integer bloodAbo;
 
     /** 血型RH */
-    private String bloodRh;
+    private Integer bloodRh;
 
     /** 工作单位 */
     private String workCompany;
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Patient.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Patient.java
index a2885815..13cd1d01 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Patient.java
+++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Patient.java
@@ -1,16 +1,13 @@
 package com.openhis.administration.domain;
 
-import java.math.BigDecimal;
 import java.util.Date;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.core.common.core.domain.HisBaseEntity;
-import com.openhis.common.enums.AdministrativeGender;
-import com.openhis.common.enums.MaritalStatus;
-import com.openhis.common.enums.OccupationType;
+import com.openhis.common.enums.*;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -95,10 +92,10 @@ public class Patient extends HisBaseEntity {
     private String wbStr;
 
     /** 血型ABO */
-    private String bloodAbo;
+    private BloodTypeABO bloodAbo;
 
     /** 血型RH */
-    private String bloodRh;
+    private BloodTypeRH bloodRh;
 
     /** 工作单位 */
     private String workCompany;
@@ -124,5 +121,4 @@ public class Patient extends HisBaseEntity {
     /** 机构Id */
     private Long organizationId;
 
-
 }