From 0123a0bd06f83a2a973023bb2f197e21118ef293 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 23 七月 2024 18:31:32 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/service/impl/PatArchiveServiceImpl.java | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 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 3a87814..17705b9 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;
}
@@ -118,13 +118,13 @@
public Boolean saveOrUpdatePatInfo(PatArchiveVO patArchiveVO) {
//閫氳繃isoperation鏉ュ垽鏂槸鍚︽柊澧�
PatArchive patArchive = DtoConversionUtils.sourceToTarget(patArchiveVO, PatArchive.class);
- if (patArchiveVO.getIsoperation() != null && patArchiveVO.getIsoperation() == 1 || patArchiveVO.getPatid() == null) {
+ if (patArchiveVO.getIsoperation() != null && patArchiveVO.getIsoperation() == 1 || patArchiveVO.getId() == null) {
//鏂板
List<PatArchive> patArchives = new ArrayList<>();
patArchive.setUpdateTime(DateUtils.getNowDate());
patArchives.add(patArchive);
patArchiveMapper.insertPatArchive(patArchives);
- } else if (patArchiveVO.getIsoperation() != null && patArchiveVO.getIsoperation() == 2 || patArchiveVO.getPatid() != null) {
+ } else if (patArchiveVO.getIsoperation() != null && patArchiveVO.getIsoperation() == 2 || patArchiveVO.getId() != null) {
//淇敼
patArchiveVO.setIsoperation(2);
patArchiveMapper.updatePatArchive(patArchive);
@@ -137,7 +137,7 @@
//鏂板
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 || patArchivetag.getIsoperation() == null && patArchiveVO.getIsoperation() == 3) {
patArchivetag.setDelFlag("1");
@@ -476,9 +476,8 @@
}
}
-
//鏍规嵁鎮ｈ�匢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 +514,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 +528,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