From d9281d43e27ab6c510d390ddb26eaffc8ccc1add Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期三, 11 十一月 2026 14:04:52 +0800
Subject: [PATCH] 妇幼-补充住院随访档案生成日志、完成事件及自检文件
---
smartor/src/main/java/com/smartor/service/impl/PatMaternityArchiveServiceImpl.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/service/impl/PatMaternityArchiveServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/PatMaternityArchiveServiceImpl.java
index cea1042..e7744d3 100644
--- a/smartor/src/main/java/com/smartor/service/impl/PatMaternityArchiveServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/PatMaternityArchiveServiceImpl.java
@@ -99,13 +99,15 @@
patMaternityArchiveDetailVo.setOrgid(patMaternityArchiveDetail.getOrgid());
patMaternityArchiveDetailVo.setPatid(patMaternityArchiveDetail.getPatid());
patMaternityArchiveDetailVo.setOuthospno(patMaternityArchiveDetail.getOuthospno());
+ patMaternityArchiveDetailVo.setInhospno(patMaternityArchiveDetail.getInhospno());
patMaternityArchiveDetailVo.setArchiveType(patMaternityArchiveDetail.getArchiveType());
List<PatMaternityArchiveDetail> patMaternityArchiveDetailOlds
= patMaternityArchiveDetailService.selectPatMaternityArchiveDetailList(patMaternityArchiveDetailVo);
- if (StringUtils.isEmpty(patMaternityArchiveDetail.getOuthospno())) {
- throw new BaseException("濡囩妗ｆ鍏ュ弬闂ㄨ瘖缂栧彿outhospno涓虹┖锛岃妫�鏌ュ叆鍙傞棬璇婄紪鍙�");
+ if (StringUtils.isEmpty(patMaternityArchiveDetail.getOuthospno())
+ && StringUtils.isEmpty(patMaternityArchiveDetail.getInhospno())) {
+ throw new BaseException("濡囩妗ｆ鍏ュ弬闂ㄨ瘖缂栧彿outhospno鍜屼綇闄㈢紪鍙穒nhospno涓嶈兘鍚屾椂涓虹┖");
}
if (StringUtils.isEmpty(patMaternityArchiveDetail.getArchiveType())) {
throw new BaseException("濡囩妗ｆ鍏ュ弬妗ｆ绫诲瀷archiveType涓虹┖锛岃妫�鏌ュ叆鍙傛。妗堢被鍨�");
@@ -116,6 +118,7 @@
key.setOrgid(patMaternityArchiveDetail.getOrgid());
key.setPatid(patMaternityArchiveDetail.getPatid());
key.setOuthospno(patMaternityArchiveDetail.getOuthospno());
+ key.setInhospno(patMaternityArchiveDetail.getInhospno());
key.setArchiveType(patMaternityArchiveDetail.getArchiveType());
List<PatMaternityArchiveDetail> olds =
patMaternityArchiveDetailService.selectPatMaternityArchiveDetailList(key);
@@ -133,6 +136,7 @@
mainKey.setOrgid(patMaternityArchiveDetail.getOrgid());
mainKey.setPatid(patMaternityArchiveDetail.getPatid());
mainKey.setOuthospno(patMaternityArchiveDetail.getOuthospno());
+ mainKey.setInhospno(patMaternityArchiveDetail.getInhospno());
mainKey.setArchiveType(patMaternityArchiveDetail.getArchiveType());
List<PatMaternityArchive> mainOlds =
patMaternityArchiveMapper.selectPatMaternityArchiveList(mainKey);
@@ -156,6 +160,17 @@
}
}
+ // 鏂板妗ｆ鏃惰ˉ榛樿鏉ユ簮锛屾洿鏂版椂淇濈暀鍘熸潵婧�
+ if (existArchiveId == null && patMaternityArchiveDetail.getId() == null) {
+ if (StringUtils.isEmpty(patMaternityArchiveDetail.getSourceType())) {
+ patMaternityArchiveDetail.setSourceType("3");
+ }
+ if (StringUtils.isEmpty(patMaternityArchiveDetail.getSourceBizNo())) {
+ patMaternityArchiveDetail.setSourceBizNo(StringUtils.isNotEmpty(patMaternityArchiveDetail.getOuthospno())
+ ? patMaternityArchiveDetail.getOuthospno() : patMaternityArchiveDetail.getInhospno());
+ }
+ }
+
// 灏嗚鎯呬腑鐨勫叕鍏卞瓧娈靛鍒跺埌涓昏〃瀵硅薄
PatMaternityArchive patMaternityArchive = DtoConversionUtils.sourceToTarget(patMaternityArchiveDetail, PatMaternityArchive.class);
if (patMaternityArchive == null) {
--
Gitblit v1.9.3