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 6b95cdd..d6f1d81 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 @@ -5,6 +5,7 @@ import cn.hutool.core.util.ObjectUtil; import com.docus.core.util.DateUtil; import com.docus.core.util.Func; import com.docus.infrastructure.core.exception.BaseException; +import com.docus.infrastructure.core.utils.SpringUtil; import com.docus.infrastructure.redis.service.IdService; import com.docus.server.collection.dto.BedDoctorDto; import com.docus.server.collection.dto.TBasicDto; @@ -200,7 +201,11 @@ public class TBasicServiceImpl implements ITBasicService { if ("死亡".equals(isDeadStr)) { isDead = 1; } - + String leaveMethodStr = tBasicDto.getLeaveMethod(); + Integer leaveMethod = null; + if (ObjectUtil.isNotEmpty(leaveMethodStr)&&NumberUtil.isInteger(leaveMethodStr)) { + leaveMethod=Integer.parseInt(leaveMethodStr); + } //组装数据 TBasic tBasic = new TBasic(); @@ -240,6 +245,7 @@ public class TBasicServiceImpl implements ITBasicService { tBasicExtend.setWardCode(tBasicDto.getWardCode()); tBasicExtend.setWardName(tBasicDto.getWardName()); tBasicExtend.setSdryIndex(sdryIndex == null ? null : sdryIndex.replace("z", "").replace("m", "")); + tBasicExtend.setLeaveMethod(leaveMethod); //持久化 tBasicMapper.update(tBasic); @@ -247,6 +253,7 @@ public class TBasicServiceImpl implements ITBasicService { confirmAndUpdIcuRecordState(tBasic.getInpatientNo(), tBasic.getAdmissTimes()); } + @Override public void cancelHospital(TBasicDto tBasicDto) throws Exception { //判断jzh是否存在 diff --git a/src/main/resources/mapper/TBasicMapper.xml b/src/main/resources/mapper/TBasicMapper.xml index 78d6c30..2ff81b9 100644 --- a/src/main/resources/mapper/TBasicMapper.xml +++ b/src/main/resources/mapper/TBasicMapper.xml @@ -183,12 +183,15 @@ INSERT INTO `docus_medicalrecord`.`t_basic_extend` - (`patient_id`,`ward_code`,`ward_name`,`sdry_index`) + (`patient_id`,`ward_code`,`ward_name`,`sdry_index`,leave_method) VALUES - (#{tBasicExtend.patientId},#{tBasicExtend.wardCode},#{tBasicExtend.wardName},#{tBasicExtend.sdryIndex}) + (#{tBasicExtend.patientId},#{tBasicExtend.wardCode},#{tBasicExtend.wardName},#{tBasicExtend.sdryIndex},#{tBasicExtend.leaveMethod}) on DUPLICATE KEY UPDATE `ward_code`=#{tBasicExtend.wardCode}, `ward_name`=#{tBasicExtend.wardName}, + + leave_method=#{tBasicExtend.leaveMethod}, + `sdry_index`=#{tBasicExtend.sdryIndex}