From bda10cbd20a8434f15585cb08277beed83e73629 Mon Sep 17 00:00:00 2001
From: LiJianZhao <lijianzhao@jizhiweb.cn>
Date: Thu, 24 Apr 2025 12:14:09 +0800
Subject: [PATCH] dev

---
 .../server/service/diagnosis/MedicalRecordService.java    | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/main/java/com/syjiaer/clinic/server/service/diagnosis/MedicalRecordService.java b/src/main/java/com/syjiaer/clinic/server/service/diagnosis/MedicalRecordService.java
index f1ef1ca..01a4a8f 100644
--- a/src/main/java/com/syjiaer/clinic/server/service/diagnosis/MedicalRecordService.java
+++ b/src/main/java/com/syjiaer/clinic/server/service/diagnosis/MedicalRecordService.java
@@ -23,6 +23,7 @@ import com.syjiaer.clinic.server.entity.diagnosis.dto.MedicalRecordSaveDto;
 import com.syjiaer.clinic.server.entity.diagnosis.vo.MedicalRecordVo;
 import com.syjiaer.clinic.server.entity.organization.OrganizationMember;
 import com.syjiaer.clinic.server.entity.organization.OrganizationSection;
+import com.syjiaer.clinic.server.entity.patient.PatientInfo;
 import com.syjiaer.clinic.server.entity.patient.PatientRegistration;
 import com.syjiaer.clinic.server.mapper.diagnosis.DiagnosisMapper;
 import com.syjiaer.clinic.server.mapper.goods.GoodsMapper;
@@ -32,6 +33,7 @@ import com.syjiaer.clinic.server.mapper.diagnosis.DiagnosisMedicalItemListMapper
 import com.syjiaer.clinic.server.mapper.diagnosis.DiagnosisMedicalRecordMapper;
 import com.syjiaer.clinic.server.mapper.organization.OrganizationMemberMapper;
 import com.syjiaer.clinic.server.mapper.organization.OrganizationSectionMapper;
+import com.syjiaer.clinic.server.mapper.patient.PatientInfoMapper;
 import com.syjiaer.clinic.server.mapper.patient.PatientRegistrationMapper;
 import com.syjiaer.clinic.server.service.BaseService;
 import com.syjiaer.clinic.server.service.charge.ChargeService;
@@ -71,6 +73,8 @@ public class MedicalRecordService extends BaseService {
     private SocialRequest socialRequest;
     @Autowired
     private DiagnosisMapper diagnosisMapper;
+    @Autowired
+     private PatientInfoMapper patientInfoMapper;
     /*
     * 保存
     * @param saveDto 病历信息
@@ -196,6 +200,10 @@ public class MedicalRecordService extends BaseService {
         query.eq("registration_id", regisId);
         Diagnosis diagnosis = diagnosisMapper.selectOne(query);
         BeanUtils.copyProperties(diagnosis, vo);
+        PatientInfo patientInfo = patientInfoMapper.selectById(diagnosis.getPatientId());
+        vo.setPatientInfo(patientInfo);
+        PatientRegistration patientRegistration = patientRegistrationMapper.selectById(diagnosis.getRegistrationId());
+        vo.setPatientRegistration(patientRegistration);
 
         DiagnosisMedicalRecord diagnosisMedicalRecord = diagnosisMedicalRecordMapper.selectByDiagnosisCode(diagnosis.getCode());
         vo.setDiagnosisMedicalRecord(diagnosisMedicalRecord);