From 6393d6ba70099f1b47f4124e06426f016fb28052 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 01 七月 2025 14:59:58 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/service/impl/PatMedOuthospServiceImpl.java | 35 +++++++++++++++++++++--------------
1 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/service/impl/PatMedOuthospServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/PatMedOuthospServiceImpl.java
index 34b0d00..7b26833 100644
--- a/smartor/src/main/java/com/smartor/service/impl/PatMedOuthospServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/PatMedOuthospServiceImpl.java
@@ -116,16 +116,16 @@
@Override
public PatMedRes selectPatMedOuthospCount(PatMedReq patMedReq) {
- // 鑾峰彇褰撳墠鐧婚檰浜虹殑閮ㄩ棬鏉冮檺
- if (CollectionUtils.isEmpty(patMedReq.getDeptcodeList())) {
- Long userId = SecurityUtils.getUserId();
- List<SysDept> sysDepts = sysUserDeptMapper.selectDeptListByUserId(userId);
- List<String> deptCode = new ArrayList<>();
- for (SysDept sysDept : sysDepts) {
- deptCode.add(sysDept.getDeptId().toString());
- }
- patMedReq.setDeptcodeList(deptCode);
- }
+// // 鑾峰彇褰撳墠鐧婚檰浜虹殑閮ㄩ棬鏉冮檺
+// if (CollectionUtils.isEmpty(patMedReq.getDeptcodeList())) {
+// Long userId = SecurityUtils.getUserId();
+// List<SysDept> sysDepts = sysUserDeptMapper.selectDeptListByUserId(userId);
+// List<String> deptCode = new ArrayList<>();
+// for (SysDept sysDept : sysDepts) {
+// deptCode.add(sysDept.getDeptId().toString());
+// }
+// patMedReq.setDeptcodeList(deptCode);
+// }
return patMedOuthospMapper.selectPatMedOuthospCount(patMedReq);
}
@@ -207,7 +207,7 @@
serviceSubtask1.setSendstate(4L);
serviceSubtask1.setRemark("鐤剧梾鎮ｈ�呭啀鍏ラ櫌");
serviceSubtask1.setResult("error");
- serviceSubtask1.setFinishtime(new Date());
+// serviceSubtask1.setFinishtime(new Date());
serviceSubtask1.setUpdateBy(serviceTask.getUpdateBy());
serviceSubtaskMapper.updateServiceSubtask(serviceSubtask1);
//閲嶆柊鏂板瀛愪换鍔�
@@ -219,7 +219,7 @@
serviceSubtask.setRemark("鎵嬫満鍙蜂负绌�");
serviceSubtask.setSendstate(4L);
serviceSubtask.setResult("error");
- serviceSubtask.setFinishtime(new Date());
+// serviceSubtask.setFinishtime(new Date());
}
serviceSubtask.setCreateBy(serviceTask.getCreateBy());
serviceSubtask.setCreateTime(new Date());
@@ -230,7 +230,7 @@
serviceSubtask.setRemark("鎵嬫満鍙蜂负绌�");
serviceSubtask.setSendstate(4L);
serviceSubtask.setResult("error");
- serviceSubtask.setFinishtime(new Date());
+// serviceSubtask.setFinishtime(new Date());
}
serviceSubtask.setCreateBy(serviceTask.getCreateBy());
@@ -269,6 +269,9 @@
serviceSubtask.setPatid(patArchive.getId());
serviceSubtask.setSendname(patArchive.getName());
serviceSubtask.setSfzh(patArchive.getIdcardno());
+ serviceSubtask.setLeavediagname(patMedOuthosp.getDiagname());
+ serviceSubtask.setLeaveicd10code(patMedOuthosp.getIcd10code());
+ serviceSubtask.setSfzh(patArchive.getIdcardno());
serviceSubtask.setPhone(patArchive.getTelcode());
if (StringUtils.isBlank(patArchive.getTelcode())) serviceSubtask.setPhone(patArchive.getRelativetelcode());
serviceSubtask.setSex(patArchive.getSex());
@@ -281,16 +284,20 @@
serviceSubtask.setUpdateTime(new Date());
serviceSubtask.setUpdateBy(serviceTask.getUpdateBy());
serviceSubtask.setUpdateTime(new Date());
+ serviceSubtask.setVisitDeptCode(patMedOuthosp.getDeptcode());
+ serviceSubtask.setVisitDeptName(patMedOuthosp.getDeptname());
+ serviceSubtask.setUpdateTime(new Date());
//璁剧疆鍙戦�佹椂闂�
if (serviceTask.getSendDay() == null) serviceTask.setSendDay(1L);
Date newDate = addDays(patMedOuthosp.getAdmitdate(), serviceTask.getSendDay().intValue());
serviceSubtask.setLongSendTime(newDate);
+ serviceSubtask.setVisitTime(newDate);
//鎮ｈ�呭彂閫佹椂闂�
if (StringUtils.isNotEmpty(patArchive.getNotrequiredFlag()) && patArchive.getNotrequiredFlag().equals("1")) {
String remark = patArchive.getNotrequiredreason();
serviceSubtask.setRemark(remark);
serviceSubtask.setResult("error");
- serviceSubtask.setFinishtime(new Date());
+// serviceSubtask.setFinishtime(new Date());
//涓嶆墽琛�
serviceSubtask.setSendstate(4L);
}
--
Gitblit v1.9.3