diff --git a/src/main/java/com/docus/server/collection/dto/SzyTBasicDto.java b/src/main/java/com/docus/server/collection/dto/SzyTBasicDto.java index e7464b0..2b5189f 100644 --- a/src/main/java/com/docus/server/collection/dto/SzyTBasicDto.java +++ b/src/main/java/com/docus/server/collection/dto/SzyTBasicDto.java @@ -1,7 +1,5 @@ package com.docus.server.collection.dto; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -79,4 +77,6 @@ public class SzyTBasicDto implements Serializable { @ApiModelProperty(value = "是否死亡 0否,1是") private Integer isDead; + @ApiModelProperty(value = "省中医患者主索引") + private String empId; } 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 aaf0a3d..e364678 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 @@ -97,4 +97,7 @@ public class TBasic implements Serializable { @ApiModelProperty(value = "婴儿母亲住院流水号") private String motherInpatientNo; + + @ApiModelProperty(value = "省中医患者主索引") + private String empId; } 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 786c184..9926e47 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 @@ -1,24 +1,18 @@ package com.docus.server.collection.service.impl; -import cn.hutool.core.util.NumberUtil; import com.docus.core.util.DateUtil; import com.docus.core.util.Func; -import com.docus.core.util.ObjectUtil; import com.docus.infrastructure.redis.service.IdService; import com.docus.server.collection.dto.SzyTBasicDto; -import com.docus.server.collection.dto.TBasicDto; import com.docus.server.collection.infrastructure.dao.entity.TBasic; import com.docus.server.collection.infrastructure.dao.mapper.TBasicMapper; import com.docus.server.collection.service.ITBasicService; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.io.IOUtils; -import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.io.*; -import java.time.Duration; -import java.util.*; +import java.util.ArrayList; +import java.util.List; /** * @BelongsProject: docus-webservice-sdry @@ -78,6 +72,7 @@ public class TBasicServiceImpl implements ITBasicService { tBasic.setDisDept(dto.getDisDept()); tBasic.setDisDeptName(dto.getDisDeptName()); tBasic.setCreateTime(DateUtil.now()); + tBasic.setEmpId(dto.getEmpId()); if (num>0) { log.info("更新,jzh为"+tBasic.getJzh()); tBasicMapper.update(tBasic); diff --git a/src/main/resources/mapper/TBasicMapper.xml b/src/main/resources/mapper/TBasicMapper.xml index b57b4af..e4de44c 100644 --- a/src/main/resources/mapper/TBasicMapper.xml +++ b/src/main/resources/mapper/TBasicMapper.xml @@ -25,7 +25,9 @@ `dis_date`, `dis_dept_name`, `attending_name`, - `jzh`) + `jzh`, + `emp_id` + ) VALUES (#{tBasic.admissDept}, @@ -48,7 +50,8 @@ #{tBasic.disDate}, #{tBasic.disDeptName}, #{tBasic.attendingName}, - #{tBasic.jzh}) + #{tBasic.jzh}, + #{tBasic.empId}) @@ -71,7 +74,8 @@ `admiss_dept_name` = #{tBasic.admissDeptName}, `dis_date` = #{tBasic.disDate}, `dis_dept_name` = #{tBasic.disDeptName}, - `attending_name` = #{tBasic.attendingName} + `attending_name` = #{tBasic.attendingName}, + `emp_id` = #{tBasic.empId} WHERE `jzh` = #{tBasic.jzh}