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 5d904a2..5528eb7 100644 --- a/src/main/java/com/docus/server/collection/dto/TBasicDto.java +++ b/src/main/java/com/docus/server/collection/dto/TBasicDto.java @@ -31,4 +31,5 @@ public class TBasicDto { private String bedNum; private String isDead; private String admissDays; + private String motherInpatientNo; } diff --git a/src/main/java/com/docus/server/collection/httpservices/impl/HttpTBasicServiceImpl.java b/src/main/java/com/docus/server/collection/httpservices/impl/HttpTBasicServiceImpl.java index 7b5a59d..2d5a9de 100644 --- a/src/main/java/com/docus/server/collection/httpservices/impl/HttpTBasicServiceImpl.java +++ b/src/main/java/com/docus/server/collection/httpservices/impl/HttpTBasicServiceImpl.java @@ -93,10 +93,12 @@ public class HttpTBasicServiceImpl implements HttpTBasicService { //住院天数 String admissDays=map.get("inDays"); //是否死亡 - String isDead=map.get(""); + String isDead=map.get("outType"); //床位号 String bedNum=map.get("bedNo"); + String motherInpatientNo=map.get("motherInpatientNo"); + TBasicDto tBasicDto=new TBasicDto(); tBasicDto.setAdmissDays(admissDays); tBasicDto.setIsDead(isDead); @@ -117,6 +119,7 @@ public class HttpTBasicServiceImpl implements HttpTBasicService { tBasicDto.setName(name); tBasicDto.setInpatientNo(inpatientNo); tBasicDto.setDutyNurse(dutyNurse); + tBasicDto.setMotherInpatientNo(motherInpatientNo); tBasicDtos.add(tBasicDto); } diff --git a/src/main/java/com/docus/server/collection/infrastructure/dao/entity/TBasic.java b/src/main/java/com/docus/server/collection/infrastructure/dao/entity/TBasic.java index f93208a..aaf0a3d 100644 --- a/src/main/java/com/docus/server/collection/infrastructure/dao/entity/TBasic.java +++ b/src/main/java/com/docus/server/collection/infrastructure/dao/entity/TBasic.java @@ -94,4 +94,7 @@ public class TBasic implements Serializable { @ApiModelProperty(value = "是否其他数据 0否,1是婴儿,2医疗保险类别是家庭病床") private Integer isOther; + + @ApiModelProperty(value = "婴儿母亲住院流水号") + private String motherInpatientNo; } 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 f8ebad6..14cd662 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 @@ -158,7 +158,7 @@ public class TBasicServiceImpl implements ITBasicService { String isDeadStr = tBasicDto.getIsDead(); Integer isDead=0; - if("死亡".equals(isDeadStr)){ + if("5".equals(isDeadStr)){ isDead=1; } @@ -198,6 +198,7 @@ public class TBasicServiceImpl implements ITBasicService { tBasic.setDisDept(tBasicDto.getDisDept()); tBasic.setDisDeptName(tBasicDto.getDisDeptName()); tBasic.setCreateTime(DateUtil.now()); + tBasic.setMotherInpatientNo(tBasicDto.getMotherInpatientNo()); //判断是否B开头 if(ObjectUtil.isNotEmpty(tBasicDto.getInpatientNo())&&(tBasicDto.getInpatientNo().contains("B")||tBasicDto.getInpatientNo().contains("b"))){ tBasic.setIsOther(1); diff --git a/src/main/resources/mapper/TBasicMapper.xml b/src/main/resources/mapper/TBasicMapper.xml index 64bc32a..83d0fc8 100644 --- a/src/main/resources/mapper/TBasicMapper.xml +++ b/src/main/resources/mapper/TBasicMapper.xml @@ -26,7 +26,8 @@ `dis_dept_name`, `attending_name`, `jzh`, - `is_other`) + `is_other`, + `mother_inpatient_no`) VALUES (#{tBasic.admissDept}, @@ -50,7 +51,8 @@ #{tBasic.disDeptName}, #{tBasic.attendingName}, #{tBasic.jzh}, - #{tBasic.isOther}) + #{tBasic.isOther}, + #{tBasic.motherInpatientNo}) @@ -74,7 +76,8 @@ `dis_date` = #{tBasic.disDate}, `dis_dept_name` = #{tBasic.disDeptName}, `attending_name` = #{tBasic.attendingName}, - `is_other` = #{tBasic.isOther} + `is_other` = #{tBasic.isOther}, + `mother_inpatient_no`= #{tBasic.motherInpatientNo} WHERE `jzh` = #{tBasic.jzh}