From 7cb4a47c80ed65444e51b7446981b774b019a817 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: Mon, 18 Sep 2023 15:41:25 +0800
Subject: [PATCH] =?UTF-8?q?44=E9=83=A8=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/docus/server/collection/dto/TBasicDto.java   |  2 ++
 .../com/docus/server/collection/entity/TBasic.java   |  4 ++--
 .../collection/service/impl/TBasicServiceImpl.java   | 12 ++++++------
 src/main/resources/mapper/TBasicMapper.xml           |  8 ++++----
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/docus/server/collection/dto/TBasicDto.java b/src/main/java/com/docus/server/collection/dto/TBasicDto.java
index 26c324a..fa1c85f 100644
--- a/src/main/java/com/docus/server/collection/dto/TBasicDto.java
+++ b/src/main/java/com/docus/server/collection/dto/TBasicDto.java
@@ -39,4 +39,6 @@ public class TBasicDto {
     private String sdryIndex;
     //入院状态 1更新 2删除
     private String statu;
+    private Integer isOther;
+
 }
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 081298a..c141104 100644
--- a/src/main/java/com/docus/server/collection/entity/TBasic.java
+++ b/src/main/java/com/docus/server/collection/entity/TBasic.java
@@ -162,6 +162,6 @@ public class TBasic implements Serializable {
     @ApiModelProperty(value = "病区名称")
     private String wardName;
 
-    @ApiModelProperty(value = "是否婴儿记录 0否，1是")
-    private Integer isBaby;
+    @ApiModelProperty(value = "是否其他数据 0否，1是婴儿，2医疗保险类别是家庭病床")
+    private Integer isOther;
 }
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 d5fc716..67bdd9d 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
@@ -120,9 +120,9 @@ public class TBasicServiceImpl implements ITBasicService {
         //设置是否婴儿
         String inpatientNo = tBasicDto.getInpatientNo();
         if(inpatientNo.contains("B")||inpatientNo.contains("b")){
-            tBasic.setIsBaby(1);
+            tBasic.setIsOther(1);
         }else{
-            tBasic.setIsBaby(0);
+            tBasic.setIsOther(0);
         }
 
         TBasicExtend tBasicExtend=new TBasicExtend();
@@ -213,9 +213,9 @@ public class TBasicServiceImpl implements ITBasicService {
         //设置是否婴儿
         String inpatientNo = tBasicDto.getInpatientNo();
         if(inpatientNo.contains("B")||inpatientNo.contains("b")){
-            tBasic.setIsBaby(1);
+            tBasic.setIsOther(1);
         }else{
-            tBasic.setIsBaby(0);
+            tBasic.setIsOther(0);
         }
 
         String sdryIndex = tBasicDto.getSdryIndex();
@@ -310,9 +310,9 @@ public class TBasicServiceImpl implements ITBasicService {
         //设置是否婴儿
         String inpatientNo = tBasicDto.getInpatientNo();
         if(inpatientNo.contains("B")||inpatientNo.contains("b")){
-            tBasic.setIsBaby(1);
+            tBasic.setIsOther(1);
         }else{
-            tBasic.setIsBaby(0);
+            tBasic.setIsOther(0);
         }
 
         String sdryIndex = tBasicDto.getSdryIndex();
diff --git a/src/main/resources/mapper/TBasicMapper.xml b/src/main/resources/mapper/TBasicMapper.xml
index 3e4073e..4f7cefc 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,`ward_code`,`ward_name`,`is_baby`)
+        (`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`,`is_other`)
         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.wardCode},#{tBasic.wardName},#{tBasic.isBaby})
+        #{tBasic.attending},#{tBasic.attendingName},#{tBasic.jzh},now(),concat(#{tBasic.inpatientNo},'_',#{tBasic.admissTimes}),#{tBasic.wardCode},#{tBasic.wardName},#{tBasic.isOther})
     </insert>
     <insert id="insertExtend">
         INSERT INTO `docus_medicalrecord`.`t_basic_extend`
@@ -103,8 +103,8 @@
             <if test="tBasic.wardName !=null ">
                 `ward_name`=#{tBasic.wardName},
             </if>
-            <if test="tBasic.isBaby !=null ">
-                `is_baby`=#{tBasic.isBaby},
+            <if test="tBasic.isOther !=null ">
+                `is_other`=#{tBasic.isOther},
             </if>
             b_column5=CONCAT(inpatient_no,'_',admiss_times),
             `update_time`=now()