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 f2bf4e2..a3dcd00 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 @@ -218,7 +218,10 @@ public class TBasicServiceImpl implements ITBasicService { }else if(tBasic.getIsOther()==0){ tBasic.setIsOther(0); } - + //是否取消住院 + if("2".equals(tBasicDto.getStatu())){ + tBasic.setDisDate(null); + } String sdryIndex = tBasicDto.getSdryIndex(); TBasicExtend tBasicExtend = new TBasicExtend(); tBasicExtend.setPatientId(patientId); diff --git a/src/main/java/com/docus/server/collection/webservice/impl/BasicServiceImpl.java b/src/main/java/com/docus/server/collection/webservice/impl/BasicServiceImpl.java index 0bf82f3..7074696 100644 --- a/src/main/java/com/docus/server/collection/webservice/impl/BasicServiceImpl.java +++ b/src/main/java/com/docus/server/collection/webservice/impl/BasicServiceImpl.java @@ -438,6 +438,13 @@ public class BasicServiceImpl implements BasicService { sdryIndex=sdryIndexNode.getNodeValue(); } + //出院状态 + String statusCode=null; + Node statusCodeNode = xml.getNode("/PRPA_HIP0033/controlActProcess/subject/encounterEvent/statusCode/@code"); + if(Func.isNotEmpty(statusCodeNode)){ + statusCode=statusCodeNode.getNodeValue(); + } + //设置dto TBasicDto dto=new TBasicDto(); dto.setSerialId(serialId); @@ -465,6 +472,7 @@ public class BasicServiceImpl implements BasicService { dto.setWardName(wardName); dto.setSdryIndex(sdryIndex); dto.setIsOther(0); + dto.setStatu(statusCode); return dto; } diff --git a/src/main/resources/mapper/TBasicMapper.xml b/src/main/resources/mapper/TBasicMapper.xml index 4f7cefc..1d6608a 100644 --- a/src/main/resources/mapper/TBasicMapper.xml +++ b/src/main/resources/mapper/TBasicMapper.xml @@ -85,9 +85,6 @@ `admiss_dept_name`=#{tBasic.admissDeptName}, - - `dis_date`=#{tBasic.disDate}, - `dis_dept_name`=#{tBasic.disDeptName}, @@ -107,6 +104,7 @@ `is_other`=#{tBasic.isOther}, b_column5=CONCAT(inpatient_no,'_',admiss_times), + `dis_date`=#{tBasic.disDate}, `update_time`=now() WHERE `patient_id`=#{tBasic.patientId,jdbcType=VARCHAR};