From 1c8b2be08e6c7655bab6d8a99f15b883768f0d38 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 30 七月 2024 17:15:43 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/service/impl/PatArchiveServiceImpl.java | 66 +++++++++++++++++++++++++++------
1 files changed, 54 insertions(+), 12 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 53af4ce..c860b0e 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,27 +118,28 @@
public Boolean saveOrUpdatePatInfo(PatArchiveVO patArchiveVO) {
//閫氳繃isoperation鏉ュ垽鏂槸鍚︽柊澧�
PatArchive patArchive = DtoConversionUtils.sourceToTarget(patArchiveVO, PatArchive.class);
- if (patArchiveVO.getIsoperation() != null && patArchiveVO.getIsoperation() == 1) {
+ 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) {
+ } else if (patArchiveVO.getIsoperation() != null && patArchiveVO.getIsoperation() == 2 || patArchiveVO.getId() != null) {
//淇敼
+ patArchiveVO.setIsoperation(2);
patArchiveMapper.updatePatArchive(patArchive);
}
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());
@@ -171,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,9 +518,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()) {
@@ -514,7 +556,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);
@@ -528,7 +570,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