From 6e34bc4a364b68ab0e62159eecc61bb6b0bf8201 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 09 五月 2025 17:49:58 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java | 62 ++++++++++++++++++++++++++++---
1 files changed, 56 insertions(+), 6 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
index 3bd449a..032729b 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -8,7 +8,6 @@
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.*;
import com.smartor.common.FtpService;
-import com.smartor.common.SendService;
import com.smartor.config.PhoneUtils;
import com.smartor.domain.*;
import com.smartor.mapper.*;
@@ -24,7 +23,6 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.io.UnsupportedEncodingException;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.time.Duration;
@@ -92,6 +90,12 @@
@Autowired
private FtpService ftpService;
+ @Autowired
+ private PatMedInhospMapper patMedInhospMapper;
+
+ @Autowired
+ private PatArchiveMapper patArchiveMapper;
+
@Value("${pri_key}")
private String pri_key;
@@ -103,9 +107,6 @@
@Autowired
private RedisTemplate redisTemplate;
-
- @Autowired
- private SendService sendService;
@Value("${hangup}")
private String hangup;
@@ -256,7 +257,6 @@
@Override
public List<ServiceSubtask> patItem(ServiceSubtaskVO serviceSubtaskVO) {
List<ServiceSubtask> selectServiceSubtaskList = this.selectServiceSubtaskList(serviceSubtaskVO);
-
return selectServiceSubtaskList;
}
@@ -312,6 +312,54 @@
public int insertServiceSubtask(ServiceSubtask serviceSubtask) {
serviceSubtask.setCreateTime(DateUtils.getNowDate());
return serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
+ }
+
+ /**
+ * 鍐嶆鏂板鍗曚竴浠诲姟锛堥殢璁匡級
+ *
+ * @param serviceSubtask 鍐嶆鏂板鍗曚竴浠诲姟锛堥殢璁匡級
+ * @return 缁撴灉
+ */
+ @Override
+ public String addSubTaskAgain(ServiceSubtask serviceSubtask) {
+ ServiceSubtask serviceSubtask1 = selectServiceSubtaskById(serviceSubtask.getId());
+ PatMedInhosp patMedInhosp = new PatMedInhosp();
+ patMedInhosp.setPatid(serviceSubtask1.getPatid());
+ patMedInhosp.setInhospstate("0");
+ List<PatMedInhosp> patMedInhospList = patMedInhospMapper.selectPatMedInhospList(patMedInhosp);
+ PatArchive patArchive = patArchiveMapper.selectPatArchiveByPatid(serviceSubtask1.getPatid());
+
+ if (patMedInhospList.size() > 0) {
+ serviceSubtask1.setIsVisitAgain(2);
+ serviceSubtaskMapper.updateServiceSubtask(serviceSubtask1);
+ return "鏃犻渶鍐嶆闅忚锛屾偅鑰呭啀鍏ラ櫌浜�";
+ } else if (serviceSubtask1.getSendstate() == 4L) {
+ serviceSubtask1.setIsVisitAgain(2);
+ serviceSubtaskMapper.updateServiceSubtask(serviceSubtask1);
+ return "鏃犻渶鍐嶆闅忚锛屼换鍔¤鏍囪涓嶅湪鎵ц";
+ } else if (patArchive.getNotrequiredFlag().equals("1")) {
+ serviceSubtask1.setIsVisitAgain(2);
+ serviceSubtaskMapper.updateServiceSubtask(serviceSubtask1);
+ return "鏃犻渶鍐嶆闅忚锛屾偅鑰呰鏍囪涓嶉渶瑕佽鏈嶅姟";
+ } else if (ObjectUtils.isNotEmpty(serviceSubtask1.getIsVisitAgain()) && serviceSubtask1.getIsVisitAgain() == 2) {
+ return "鏃犻渶鍐嶆闅忚锛岃浠诲姟宸茬粡鍐嶆闅忚杩囦簡";
+ }
+ //鏂板鍐嶆闅忚浠诲姟
+ ServiceSubtask serviceSubtask2 = DtoConversionUtils.sourceToTarget(serviceSubtask, ServiceSubtask.class);
+ serviceSubtask2.setId(null);
+ serviceSubtask2.setUpid(serviceSubtask1.getId().intValue());
+ serviceSubtask2.setVisitCount(serviceSubtask1.getVisitCount() + 1);
+ serviceSubtask2.setSendstate(2L);
+ serviceSubtask2.setCreateTime(new Date());
+ serviceSubtask2.setUpdateTime(new Date());
+ int i = serviceSubtaskMapper.insertServiceSubtask(serviceSubtask2);
+ if (i == 1) {
+ //鏂板鎴愬姛鍚庯紝闇�瑕佸皢涔嬪墠鐨勪换鍔¤缃负涓嶈鍐嶉殢璁匡紙闃叉閲嶅鐐癸紝鐒跺悗閲嶅鐢熸垚锛�
+ serviceSubtask1.setIsVisitAgain(2);
+ serviceSubtaskMapper.updateServiceSubtask(serviceSubtask1);
+ return "鍐嶆闅忚浠诲姟鍒涘缓鎴愬姛";
+ }
+ return "鍐嶆闅忚浠诲姟鍒涘缓澶辫触锛屽啀璇锋閲嶈瘯";
}
/**
@@ -498,6 +546,8 @@
serviceSubtask.setDrname(patTaskRelevance.getDrname());
serviceSubtask.setDrcode(patTaskRelevance.getDrcode());
serviceSubtask.setInhosptime(patTaskRelevance.getInhosptime());
+ serviceSubtask.setLeaveicd10code(patTaskRelevance.getLeaveicd10code());
+ serviceSubtask.setLeavediagname(patTaskRelevance.getLeavediagname());
serviceSubtask.setEndtime(patTaskRelevance.getEndtime());
serviceSubtask.setNurseId(patTaskRelevance.getNurseId());
serviceSubtask.setNurseName(patTaskRelevance.getNurseName());
--
Gitblit v1.9.3