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 f2449a2..081298a 100644 --- a/src/main/java/com/docus/server/collection/entity/TBasic.java +++ b/src/main/java/com/docus/server/collection/entity/TBasic.java @@ -161,4 +161,7 @@ public class TBasic implements Serializable { @ApiModelProperty(value = "病区名称") private String wardName; + + @ApiModelProperty(value = "是否婴儿记录 0否,1是") + private Integer isBaby; } 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 a993b7f..d5fc716 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 @@ -117,6 +117,13 @@ public class TBasicServiceImpl implements ITBasicService { tBasic.setWardCode(tBasicDto.getWardCode()); tBasic.setWardName(tBasicDto.getWardName()); + //设置是否婴儿 + String inpatientNo = tBasicDto.getInpatientNo(); + if(inpatientNo.contains("B")||inpatientNo.contains("b")){ + tBasic.setIsBaby(1); + }else{ + tBasic.setIsBaby(0); + } TBasicExtend tBasicExtend=new TBasicExtend(); tBasicExtend.setPatientId(patientId.toString()); @@ -203,6 +210,13 @@ public class TBasicServiceImpl implements ITBasicService { tBasic.setWardCode(tBasicDto.getWardCode()); tBasic.setWardName(tBasicDto.getWardName()); + //设置是否婴儿 + String inpatientNo = tBasicDto.getInpatientNo(); + if(inpatientNo.contains("B")||inpatientNo.contains("b")){ + tBasic.setIsBaby(1); + }else{ + tBasic.setIsBaby(0); + } String sdryIndex = tBasicDto.getSdryIndex(); TBasicExtend tBasicExtend = new TBasicExtend(); @@ -293,6 +307,14 @@ public class TBasicServiceImpl implements ITBasicService { tBasic.setWardCode(tBasicDto.getWardCode()); tBasic.setWardName(tBasicDto.getWardName()); + //设置是否婴儿 + String inpatientNo = tBasicDto.getInpatientNo(); + if(inpatientNo.contains("B")||inpatientNo.contains("b")){ + tBasic.setIsBaby(1); + }else{ + tBasic.setIsBaby(0); + } + String sdryIndex = tBasicDto.getSdryIndex(); TBasicExtend tBasicExtend=new TBasicExtend(); tBasicExtend.setPatientId(patientId); diff --git a/src/main/resources/mapper/TBasicMapper.xml b/src/main/resources/mapper/TBasicMapper.xml index a1efa31..3e4073e 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,`ward_code`,`ward_name`) + (`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`) 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.attending},#{tBasic.attendingName},#{tBasic.jzh},now(),concat(#{tBasic.inpatientNo},'_',#{tBasic.admissTimes}),#{tBasic.wardCode},#{tBasic.wardName},#{tBasic.isBaby}) INSERT INTO `docus_medicalrecord`.`t_basic_extend` @@ -103,6 +103,9 @@ `ward_name`=#{tBasic.wardName}, + + `is_baby`=#{tBasic.isBaby}, + b_column5=CONCAT(inpatient_no,'_',admiss_times), `update_time`=now()