From 37e85611ccc6957c731fbedd53a679c6674b0c68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=87=E5=AE=99=E7=9A=AE=E7=9A=AE=E5=A8=83?=
 <2964346877@qq.com>
Date: Thu, 31 Aug 2023 14:29:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E7=97=85=E5=8C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/docus/server/collection/entity/TBasic.java     |  6 ++++++
 .../collection/service/impl/TBasicServiceImpl.java     |  8 ++++++++
 src/main/resources/mapper/TBasicMapper.xml             | 10 ++++++++--
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/docus/server/collection/entity/TBasic.java b/src/main/java/com/docus/server/collection/entity/TBasic.java
index b7aec63..f2449a2 100644
--- a/src/main/java/com/docus/server/collection/entity/TBasic.java
+++ b/src/main/java/com/docus/server/collection/entity/TBasic.java
@@ -155,4 +155,10 @@ public class TBasic implements Serializable {
 
     @ApiModelProperty(value = "床位号")
     private String bedNum;
+
+    @ApiModelProperty(value = "病区编号")
+    private String wardCode;
+
+    @ApiModelProperty(value = "病区名称")
+    private String wardName;
 }
diff --git a/src/main/java/com/docus/server/collection/service/impl/TBasicServiceImpl.java b/src/main/java/com/docus/server/collection/service/impl/TBasicServiceImpl.java
index 434f306..a993b7f 100644
--- a/src/main/java/com/docus/server/collection/service/impl/TBasicServiceImpl.java
+++ b/src/main/java/com/docus/server/collection/service/impl/TBasicServiceImpl.java
@@ -114,6 +114,9 @@ public class TBasicServiceImpl implements ITBasicService {
         tBasic.setBedNum(tBasicDto.getBedNum());
         tBasic.setAdmissDays(admissDays);
         tBasic.setIsDead(isDead);
+        tBasic.setWardCode(tBasicDto.getWardCode());
+        tBasic.setWardName(tBasicDto.getWardName());
+
 
         TBasicExtend tBasicExtend=new TBasicExtend();
         tBasicExtend.setPatientId(patientId.toString());
@@ -197,6 +200,9 @@ public class TBasicServiceImpl implements ITBasicService {
         tBasic.setBedNum(tBasicDto.getBedNum());
         tBasic.setAdmissDays(admissDays);
         tBasic.setIsDead(isDead);
+        tBasic.setWardCode(tBasicDto.getWardCode());
+        tBasic.setWardName(tBasicDto.getWardName());
+
 
         String sdryIndex = tBasicDto.getSdryIndex();
         TBasicExtend tBasicExtend = new TBasicExtend();
@@ -284,6 +290,8 @@ public class TBasicServiceImpl implements ITBasicService {
         tBasic.setBedNum(tBasicDto.getBedNum());
         tBasic.setAdmissDays(admissDays);
         tBasic.setIsDead(isDead);
+        tBasic.setWardCode(tBasicDto.getWardCode());
+        tBasic.setWardName(tBasicDto.getWardName());
 
         String sdryIndex = tBasicDto.getSdryIndex();
         TBasicExtend tBasicExtend=new TBasicExtend();
diff --git a/src/main/resources/mapper/TBasicMapper.xml b/src/main/resources/mapper/TBasicMapper.xml
index bcec2cd..a1efa31 100644
--- a/src/main/resources/mapper/TBasicMapper.xml
+++ b/src/main/resources/mapper/TBasicMapper.xml
@@ -19,12 +19,12 @@
 
     <insert id="insert">
         INSERT INTO `docus_medicalrecord`.`t_basic`
-        (`admiss_days`,`is_dead`,`sex_name`,`bed_num`,`age`,`sex`,`id_card`,`dis_dept`,`patient_id`, `admiss_times`, `inpatient_no`,`name`,  `admiss_date`,`admiss_dept`,  `admiss_dept_name`, `dis_date`, `dis_dept_name`,`attending`,`attending_name`,`jzh`,`create_time`,b_column5)
+        (`admiss_days`,`is_dead`,`sex_name`,`bed_num`,`age`,`sex`,`id_card`,`dis_dept`,`patient_id`, `admiss_times`, `inpatient_no`,`name`,  `admiss_date`,`admiss_dept`,  `admiss_dept_name`, `dis_date`, `dis_dept_name`,`attending`,`attending_name`,`jzh`,`create_time`,b_column5,`ward_code`,`ward_name`)
         VALUES
         (#{tBasic.admissDays},#{tBasic.isDead},#{tBasic.sexName},#{tBasic.bedNum},#{tBasic.age},#{tBasic.sex},#{tBasic.idCard},
         #{tBasic.disDept},#{tBasic.patientId},#{tBasic.admissTimes},#{tBasic.inpatientNo},
         #{tBasic.name},#{tBasic.admissDate},#{tBasic.admissDept},#{tBasic.admissDeptName},#{tBasic.disDate},#{tBasic.disDeptName},
-        #{tBasic.attending},#{tBasic.attendingName},#{tBasic.jzh},now(),concat(#{tBasic.inpatientNo},'_',#{tBasic.admissTimes}))
+        #{tBasic.attending},#{tBasic.attendingName},#{tBasic.jzh},now(),concat(#{tBasic.inpatientNo},'_',#{tBasic.admissTimes}),#{tBasic.wardCode},#{tBasic.wardName})
     </insert>
     <insert id="insertExtend">
         INSERT INTO `docus_medicalrecord`.`t_basic_extend`
@@ -97,6 +97,12 @@
             <if test="tBasic.attendingName !=null ">
                 `attending_name`=#{tBasic.attendingName},
             </if>
+            <if test="tBasic.wardCode !=null ">
+                `ward_code`=#{tBasic.wardCode},
+            </if>
+            <if test="tBasic.wardName !=null ">
+                `ward_name`=#{tBasic.wardName},
+            </if>
             b_column5=CONCAT(inpatient_no,'_',admiss_times),
             `update_time`=now()
         </set>