From 37f2e4e68c0d55e094981fa478fc198b907f87dc Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期六, 20 七月 2024 16:30:13 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/service/impl/PatArchiveServiceImpl.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/service/impl/PatArchiveServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/PatArchiveServiceImpl.java
index d7708ee..0ce2b89 100644
--- a/smartor/src/main/java/com/smartor/service/impl/PatArchiveServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/PatArchiveServiceImpl.java
@@ -100,9 +100,9 @@
patArchives.add(patArchive);
patArchiveMapper.insertPatArchive(patArchives);
if (CollectionUtils.isNotEmpty(patArchives)) {
- patArchives.get(0).getPatid();
- log.info("鎮ｈ�卛d涓�: {}", patArchives.get(0).getPatid());
- return patArchives.get(0).getPatid().intValue();
+ patArchives.get(0).getId();
+ log.info("鎮ｈ�卛d涓�: {}", patArchives.get(0).getId());
+ return patArchives.get(0).getId().intValue();
}
return null;
}
@@ -133,13 +133,13 @@
if (CollectionUtils.isNotEmpty(patArchiveVO.getTagList())) {
//澶勭悊鏍囩锛堟柊澧炪�佸垹闄わ級
for (PatArchivetag patArchivetag : patArchiveVO.getTagList()) {
- if (patArchivetag.getIsoperation() != null && patArchivetag.getIsoperation() == 1) {
+ if (patArchivetag.getIsoperation() != null && patArchivetag.getIsoperation() == 1 || patArchivetag.getIsoperation() == null && patArchiveVO.getIsoperation() == 1) {
//鏂板
patArchivetag.setUpdateBy(null);
patArchivetag.setCreateTime(new Date());
- patArchivetag.setPatid(patArchive.getPatid());
+ patArchivetag.setPatid(patArchive.getId());
patArchivetagMapper.insertPatArchivetag(patArchivetag);
- } else if (patArchivetag.getIsoperation() != null && patArchivetag.getIsoperation() == 3) {
+ } else if (patArchivetag.getIsoperation() != null && patArchivetag.getIsoperation() == 3 || patArchivetag.getIsoperation() == null && patArchiveVO.getIsoperation() == 3) {
patArchivetag.setDelFlag("1");
//鍒犻櫎
log.info("鏍囩鐨刬d涓猴細{}", patArchivetag.getTagid());
@@ -478,7 +478,7 @@
//鏍规嵁鎮ｈ�匢D杩涜鍒嗙粍
- Map<Long, List<PatArchive>> listMap = patArchiveList.stream().collect(Collectors.groupingBy(PatArchive::getPatid));
+ Map<Long, List<PatArchive>> listMap = patArchiveList.stream().collect(Collectors.groupingBy(PatArchive::getId));
//瀵规暟鎹繘琛屽皝瑁�
for (List<PatArchive> list : listMap.values()) {
@@ -515,7 +515,7 @@
for (int j = 0; j < patArchivetags1.size(); j++) {
PatArchivetagAndPatientInfo patArchivetagAndPatientInfo = DtoConversionUtils.sourceToTarget(patArchivetags1.get(j), PatArchivetagAndPatientInfo.class);
PatArchive patArchive = new PatArchive();
- patArchive.setPatid(patArchivetagAndPatientInfo.getPatid());
+ patArchive.setId(patArchivetagAndPatientInfo.getPatid());
List<PatArchive> patArchiveList = patArchiveMapper.selectPatArchiveList(patArchive);
patArchivetagAndPatientInfo.setPatNum(patArchiveList.size());
// patArchivetagAndPatientInfo.setPatArchives(patArchiveList);
@@ -529,7 +529,7 @@
for (int j = 0; j < patArchivetags1.size(); j++) {
PatArchivetagAndPatientInfo patArchivetagAndPatientInfo = DtoConversionUtils.sourceToTarget(patArchivetags1.get(j), PatArchivetagAndPatientInfo.class);
PatArchive patArchive = new PatArchive();
- patArchive.setPatid(patArchivetagAndPatientInfo.getPatid());
+ patArchive.setId(patArchivetagAndPatientInfo.getPatid());
List<PatArchive> patArchiveList = patArchiveMapper.selectPatArchiveList(patArchive);
// patArchivetagAndPatientInfo.setPatArchives(patArchiveList);
patArchivetagAndPatientInfo.setPatNum(patArchiveList.size());
--
Gitblit v1.9.3