diff --git a/src/main/java/com/ann/demo/entity/filing/dto/MessageDto.java b/src/main/java/com/ann/demo/entity/filing/dto/MessageDto.java index dd29f33..5226b0d 100644 --- a/src/main/java/com/ann/demo/entity/filing/dto/MessageDto.java +++ b/src/main/java/com/ann/demo/entity/filing/dto/MessageDto.java @@ -54,6 +54,9 @@ public class MessageDto { // 2019-11-28 新增三级标题 private String detailType; + // 2021-2-1 + private String operationCount; + public MessageDto() { } diff --git a/src/main/java/com/ann/demo/interfaces/impl/HomepageDictionaryImpl.java b/src/main/java/com/ann/demo/interfaces/impl/HomepageDictionaryImpl.java index fe11fe5..2afa2a2 100644 --- a/src/main/java/com/ann/demo/interfaces/impl/HomepageDictionaryImpl.java +++ b/src/main/java/com/ann/demo/interfaces/impl/HomepageDictionaryImpl.java @@ -120,7 +120,7 @@ public class HomepageDictionaryImpl implements HomepageDictionary { @Override public String handNumbnessReport(String xmlStr) { String outContent = null; - String remark = null; + String remark = "失败"; try { // 手麻系统 判断消息是否传过 存入消息 然后解析消息 然后存到附属表 // 1、定义变量 @@ -138,10 +138,22 @@ public class HomepageDictionaryImpl implements HomepageDictionary { archiveMasterId = messageService.getArchiveMasterId(messageDto.getInpNo(), messageDto.getVisitId()); if(archiveMasterId != null){ messageLog.setMasterId(archiveMasterId); - // 保存消息从属表 - patientMainStr = JSON.toJSONString(new PatientMainDto(messageDto.getInpNo(), messageDto.getVisitId()), SerializerFeature.WriteMapNullValue); - result = 1; - flag = true; + /*2021-2-1 等围手术期单接班者有了电子签名 就可以开始实行无纸化*/ + if(!Objects.equals(messageDto.getDetailType(),"围手术期单")){ + // 保存消息从属表 + patientMainStr = JSON.toJSONString(new PatientMainDto(messageDto.getInpNo(), messageDto.getVisitId()), SerializerFeature.WriteMapNullValue); + result = 1; + flag = true; + } + /*2021-2-1 等围手术期单接班者有了电子签名 就可以开始实行无纸化*/ + + // 2021-2-2 因为手麻不愿意处理,啊啊啊,只能由我处理 + String operationCount = "1"; + if(messageDto.getOperationCount() != null && !Objects.equals(messageDto.getOperationCount(),"")){ + operationCount = messageDto.getOperationCount(); + } + messageDto.setApplyId(messageDto.getApplyId()+"_"+operationCount); + type = messageDto.getType(); xmlCreateTime = messageDto.getXmlCreateTime(); }else{