From 0c9ec42a824aa3242fe1e1b8ce372947f2bc9a03 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 29 七月 2024 17:43:06 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/service/impl/PatArchiveServiceImpl.java | 47 ++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 44 insertions(+), 3 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 0ce2b89..c860b0e 100644
--- a/smartor/src/main/java/com/smartor/service/impl/PatArchiveServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/PatArchiveServiceImpl.java
@@ -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);
@@ -172,6 +172,48 @@
public int deletePatArchiveByPatid(Long patid) {
return patArchiveMapper.deletePatArchiveByPatid(patid);
}
+
+ /**
+ * 鑾峰彇鎮ｈ�呬俊鎭�
+ *
+ * @param patArchiveReq
+ * @return
+ */
+ @Override
+ public List<PatTaskRelevance> getPatientInfo(PatArchiveReq patArchiveReq) {
+ List<PatTaskRelevance> PatTaskRelevances = new ArrayList<>();
+
+ List<PatArchive> patArchiveList = new ArrayList<>();
+ if (patArchiveReq.getAllhosp() != null && patArchiveReq.getAllhosp() == 1) {
+ // 鏌ョ湅浣忛櫌 1 鏌ョ湅闂ㄨ瘖 2 鏌ョ湅浣撴 3
+ List<PatArchive> patArchives1 = patArchiveMapper.selectPatArchiveInfoByInhosp(patArchiveReq);
+ if (CollectionUtils.isNotEmpty(patArchives1)) {
+ patArchiveList.addAll(patArchives1);
+ }
+ } else if (patArchiveReq.getAllhosp() != null && patArchiveReq.getAllhosp() == 2) {
+ // 鏌ョ湅浣忛櫌 1 鏌ョ湅闂ㄨ瘖 2 鏌ョ湅浣撴 3
+ List<PatArchive> patArchives2 = patArchiveMapper.selectPatArchiveInfoByOuthosp(patArchiveReq);
+ if (CollectionUtils.isNotEmpty(patArchives2)) {
+ patArchiveList.addAll(patArchives2);
+ }
+ } else if (patArchiveReq.getAllhosp() != null && patArchiveReq.getAllhosp() == 3) {
+ // 鏌ョ湅浣忛櫌 1 鏌ョ湅闂ㄨ瘖 2 鏌ョ湅浣撴 3
+ List<PatArchive> patArchives3 = patArchiveMapper.selectPatArchiveInfoByPhysical(patArchiveReq);
+ if (CollectionUtils.isNotEmpty(patArchives3)) {
+ patArchiveList.addAll(patArchives3);
+ }
+ }
+ for (PatArchive patArchive : patArchiveList) {
+ PatTaskRelevance patTaskRelevance = DtoConversionUtils.sourceToTarget(patArchive, PatTaskRelevance.class);
+ patTaskRelevance.setCreateTime(patArchive.getCreateTime());
+ patTaskRelevance.setCreateBy(patArchive.getCreateBy());
+ patTaskRelevance.setDeptName(patArchive.getDept());
+ PatTaskRelevances.add(patTaskRelevance);
+ }
+
+ return PatTaskRelevances;
+ }
+
@Override
@Transactional
@@ -475,7 +517,6 @@
patArchiveList.addAll(patArchives3);
}
}
-
//鏍规嵁鎮ｈ�匢D杩涜鍒嗙粍
Map<Long, List<PatArchive>> listMap = patArchiveList.stream().collect(Collectors.groupingBy(PatArchive::getId));
--
Gitblit v1.9.3