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 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 INTO `docus_medicalrecord`.`t_basic_extend` @@ -103,8 +103,8 @@ `ward_name`=#{tBasic.wardName}, - - `is_baby`=#{tBasic.isBaby}, + + `is_other`=#{tBasic.isOther}, b_column5=CONCAT(inpatient_no,'_',admiss_times), `update_time`=now()