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 67bdd9d..f2bf4e2 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,6 +1,7 @@ package com.docus.server.collection.service.impl; import cn.hutool.core.util.NumberUtil; +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; @@ -209,12 +210,12 @@ public class TBasicServiceImpl implements ITBasicService { tBasic.setIsDead(isDead); tBasic.setWardCode(tBasicDto.getWardCode()); tBasic.setWardName(tBasicDto.getWardName()); - + tBasic.setIsOther(tBasicDto.getIsOther()); //设置是否婴儿 String inpatientNo = tBasicDto.getInpatientNo(); - if(inpatientNo.contains("B")||inpatientNo.contains("b")){ + if(tBasic.getIsOther()==0&&(inpatientNo.contains("B")||inpatientNo.contains("b"))){ tBasic.setIsOther(1); - }else{ + }else if(tBasic.getIsOther()==0){ tBasic.setIsOther(0); } @@ -306,15 +307,14 @@ public class TBasicServiceImpl implements ITBasicService { tBasic.setIsDead(isDead); tBasic.setWardCode(tBasicDto.getWardCode()); tBasic.setWardName(tBasicDto.getWardName()); - + tBasic.setIsOther(tBasicDto.getIsOther()); //设置是否婴儿 String inpatientNo = tBasicDto.getInpatientNo(); - if(inpatientNo.contains("B")||inpatientNo.contains("b")){ + if(tBasic.getIsOther()==0&&(inpatientNo.contains("B")||inpatientNo.contains("b"))){ tBasic.setIsOther(1); - }else{ + }else if(tBasic.getIsOther()==0){ tBasic.setIsOther(0); } - 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 4a056b2..0bf82f3 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 @@ -1,6 +1,7 @@ package com.docus.server.collection.webservice.impl; import com.docus.core.util.Func; +import com.docus.core.util.ObjectUtil; import com.docus.server.collection.dto.TBasicDto; import com.docus.server.collection.service.ITBasicService; import com.docus.server.collection.util.Result; @@ -286,6 +287,7 @@ public class BasicServiceImpl implements BasicService { dto.setWardCode(wardCode); dto.setWardName(wardName); dto.setSdryIndex(sdryIndex); + dto.setIsOther(0); return dto; } @@ -462,6 +464,7 @@ public class BasicServiceImpl implements BasicService { dto.setWardCode(wardCode); dto.setWardName(wardName); dto.setSdryIndex(sdryIndex); + dto.setIsOther(0); return dto; } @@ -570,6 +573,12 @@ public class BasicServiceImpl implements BasicService { if(Func.isNotEmpty(sdryIndexNode)){ sdryIndex=sdryIndexNode.getNodeValue(); } + //医疗保险类别 + String admissType=null; + Node admissTypeNode = xml.getNode("/PRPA_HIP1070/controlActProcess/encounterEvent/admissionReferralSourceCode/displayName/@value"); + if(Func.isNotEmpty(admissTypeNode)){ + admissType=admissTypeNode.getNodeValue(); + } //设置dto TBasicDto dto=new TBasicDto(); @@ -590,6 +599,11 @@ public class BasicServiceImpl implements BasicService { dto.setWardCode(wardCode); dto.setWardName(wardName); dto.setSdryIndex(sdryIndex); + if("家庭病床".equals(admissType)){ + dto.setIsOther(2); + }else{ + dto.setIsOther(0); + } return dto; } @@ -716,7 +730,12 @@ public class BasicServiceImpl implements BasicService { if(Func.isNotEmpty(statuNode)){ statu=statuNode.getNodeValue(); } - + //医疗保险类别 + String admissType=null; + Node admissTypeNode = xml.getNode("/PRPA_HIP0027/controlActProcess/subject/encounterEvent/admissionReferralSourceCode/displayName/@value"); + if(Func.isNotEmpty(admissTypeNode)){ + admissType=admissTypeNode.getNodeValue(); + } //设置dto TBasicDto dto=new TBasicDto(); dto.setSerialId(serialId); @@ -739,6 +758,11 @@ public class BasicServiceImpl implements BasicService { dto.setWardName(wardName); dto.setSdryIndex(sdryIndex); dto.setStatu(statu); + if("家庭病床".equals(admissType)){ + dto.setIsOther(2); + }else{ + dto.setIsOther(0); + } return dto; }