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 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 INTO `docus_medicalrecord`.`t_basic_extend`
@@ -97,6 +97,12 @@
`attending_name`=#{tBasic.attendingName},
+
+ `ward_code`=#{tBasic.wardCode},
+
+
+ `ward_name`=#{tBasic.wardName},
+
b_column5=CONCAT(inpatient_no,'_',admiss_times),
`update_time`=now()