From 885a482bf3df589b1643a89c96a3f7b0ea77fbd2 Mon Sep 17 00:00:00 2001
From: LiJianZhao <lijianzhao@jizhiweb.cn>
Date: Wed, 30 Apr 2025 14:28:06 +0800
Subject: [PATCH] deb

---
 .../com/syjiaer/clinic/server/entity/patient/PatientInfo.java | 4 ++--
 .../clinic/server/entity/patient/dto/RegistrationSaveDto.java | 2 +-
 .../syjiaer/clinic/server/service/charge/ChargeService.java   | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/syjiaer/clinic/server/entity/patient/PatientInfo.java b/src/main/java/com/syjiaer/clinic/server/entity/patient/PatientInfo.java
index a193301..772ade2 100644
--- a/src/main/java/com/syjiaer/clinic/server/entity/patient/PatientInfo.java
+++ b/src/main/java/com/syjiaer/clinic/server/entity/patient/PatientInfo.java
@@ -19,7 +19,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author NiuZiYuan
- * @since 2025-04-29
+ * @since 2025-04-30
  */
 @Getter
 @Setter
@@ -45,7 +45,7 @@ public class PatientInfo implements Serializable {
     private String certNo;
 
     @ApiModelProperty("性别")
-    private String sex;
+    private Integer sex;
 
     @ApiModelProperty("年龄")
     private Integer age;
diff --git a/src/main/java/com/syjiaer/clinic/server/entity/patient/dto/RegistrationSaveDto.java b/src/main/java/com/syjiaer/clinic/server/entity/patient/dto/RegistrationSaveDto.java
index 308af7a..85dc0ab 100644
--- a/src/main/java/com/syjiaer/clinic/server/entity/patient/dto/RegistrationSaveDto.java
+++ b/src/main/java/com/syjiaer/clinic/server/entity/patient/dto/RegistrationSaveDto.java
@@ -52,7 +52,7 @@ public class RegistrationSaveDto {
     private Integer type;
 
     @ApiModelProperty("性别")
-    private String gender;
+    private Integer gender;
 
     @ApiModelProperty("病人id")
     private Integer patientInfoId;
diff --git a/src/main/java/com/syjiaer/clinic/server/service/charge/ChargeService.java b/src/main/java/com/syjiaer/clinic/server/service/charge/ChargeService.java
index a1d65cc..f90a3e7 100644
--- a/src/main/java/com/syjiaer/clinic/server/service/charge/ChargeService.java
+++ b/src/main/java/com/syjiaer/clinic/server/service/charge/ChargeService.java
@@ -273,6 +273,7 @@ public class ChargeService extends BaseService {
         for (ChargeOrder chargeOrder : orderPage.getList()) {
             ChargeDetailVo detailVo = new ChargeDetailVo();
             BeanUtils.copyProperties(chargeOrder, detailVo);
+            detailVo.setDiagnosisMedicalRecord(diagnosisMedicalRecordMapper.selectByDiagnosisCode(chargeOrder.getDiagnosisCode()));
             detailVo.setPatientInfo(patientInfoMapper.selectById(chargeOrder.getPatientId()));
             detailVo.setServiceDetail(chargeItemListMapper.selectByCode(chargeOrder.getCode()));