From 987584b70a0dc71f158749125aeddec00bc76e1d Mon Sep 17 00:00:00 2001
From: zzc <Zhengzhic18@163.com>
Date: Mon, 17 Mar 2025 22:20:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=8E=E5=8F=B0=E8=AF=84?=
 =?UTF-8?q?=E4=BC=B0=E6=8A=A5=E5=91=8A=E5=8D=95=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/domain/vo/PmsTreatmentVo.java      | 31 ++++++++++++++++++-
 .../system/persist/dao/PmsTreatmentDao.java   |  1 +
 .../service/impl/ScreeningServiceImpl.java    |  1 +
 3 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/PmsTreatmentVo.java b/acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/PmsTreatmentVo.java
index 9ec92e90..8287394c 100644
--- a/acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/PmsTreatmentVo.java
+++ b/acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/PmsTreatmentVo.java
@@ -65,25 +65,51 @@ public class PmsTreatmentVo {
     @Data
     public static class TreatmentRecordVO {
         private Long id;
-        private Long treatmentId;
+
+        private Long patientId;
+
         private String name;
+
+        private String pinyinFull;
+
+        private String pinyinSimple;
+
         private Byte gender;
+
         private Integer age;
+
         private Date birthDate;
+
         private String ethnicity;
+
         private Integer educationYears;
+
         private String phone;
+
         private Byte idCardType;
+
         private String idCard;
+
         private Byte visitType;
+
         private String visitNumber;
+
         private Date visitTime;
+
         private Date dischargeTime;
+
         private String doctor;
+
         private String deptName;
+
         private String diagnosisCode;
+
         private String diagnosisName;
+
         private Byte status;
+
+        private Long treatmentId;
+
         private Long organizationId;
         @ApiModelProperty("生效的code和答案字典")
         private Map<String, TreatmentRecord> validRecordValDict;
@@ -94,6 +120,9 @@ public class PmsTreatmentVo {
 
         private Date createTime;
 
+        public TreatmentRecordVO() {
+        }
+
         public TreatmentRecordVO(PmsTreatment pmsTreatment) {
             this.treatmentId = pmsTreatment.getId();
             this.name = pmsTreatment.getName();
diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/persist/dao/PmsTreatmentDao.java b/acupuncture-system/src/main/java/com/acupuncture/system/persist/dao/PmsTreatmentDao.java
index 629353a3..c92171c0 100644
--- a/acupuncture-system/src/main/java/com/acupuncture/system/persist/dao/PmsTreatmentDao.java
+++ b/acupuncture-system/src/main/java/com/acupuncture/system/persist/dao/PmsTreatmentDao.java
@@ -33,5 +33,6 @@ public interface PmsTreatmentDao {
     @DataSource(DataSourceType.MASTER)
     List<PmsTreatmentVo.TreatmentVO> adminQuery(@Param("query") PmsTreatmentDto.TreatmentQueryDTO query);
 
+    @DataSource(DataSourceType.MASTER)
     PmsTreatmentVo.TreatmentRecordVO adminQueryTreatment(@Param("id") Long id);
 }
diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/ScreeningServiceImpl.java b/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/ScreeningServiceImpl.java
index c073475b..1f3361c1 100644
--- a/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/ScreeningServiceImpl.java
+++ b/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/ScreeningServiceImpl.java
@@ -466,6 +466,7 @@ public class ScreeningServiceImpl implements IScreeningService {
             detail.setScreenId(detailInfo.getId());
             detail.setTenantId(hospitailId);
             detail.setSubmitStatus(UserConstants.SubmitStatus.save.status);
+            detail.setCreateTime(new Date());
             detail.setDelFlag((byte) 0);
             scrScreeningRecordMapper.insertSelective(detail);
             detailInfo.setDetailId(detail.getId());