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 d6f1d81..ab4de4f 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 @@ -100,7 +100,7 @@ public class TBasicServiceImpl implements ITBasicService { } String isDeadStr = tBasicDto.getIsDead(); Integer isDead = 0; - if ("死亡".equals(isDeadStr)) { + if ("告死亡".equals(isDeadStr)) { isDead = 1; } String leaveMethodStr = tBasicDto.getLeaveMethod(); 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 932205b..a417640 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 @@ -281,7 +281,7 @@ public class BasicServiceImpl implements BasicService { } //是否死亡[] String isDead=null; - Node isDeadNode = xml.getNode("/PRPA_HIP0032/controlActProcess/subject/encounterEvent/component[@displayName='出院诊断']/section/entry[@displayName='出院情况']/observation/value"); + Node isDeadNode = xml.getNode("/PRPA_HIP0032/controlActProcess/subject/encounterEvent/component[@displayName='出院诊断']/section/entry[@displayName='出院医嘱']/observation/value"); if(Func.isNotEmpty(isDeadNode)){ isDead=isDeadNode.getTextContent(); }