From f7307b96f58e4dda1e799d8302c84a4831e885d7 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期三, 01 七月 2026 13:53:43 +0800
Subject: [PATCH] 【景宁】任务组开发
---
smartor/src/main/java/com/smartor/service/IPatMedInhospService.java | 4
smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java | 5 +
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java | 22 +++---
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java | 87 ----------------------------
smartor/src/main/java/com/smartor/domain/ServiceTaskdept.java | 12 ----
smartor/src/main/java/com/smartor/domain/ServiceTaskdiag.java | 12 ----
smartor/src/main/java/com/smartor/domain/ServiceTaskSchedule.java | 25 ++++++++
7 files changed, 43 insertions(+), 124 deletions(-)
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
index 3621b81..67edc33 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
@@ -562,20 +562,20 @@
}
}
-// /**
-// * 澶勭悊鎮ｈ�呬俊鎭紝杩涘叆瀛愪换鍔¤〃
-// */
-// public void dealOutHospInfoByDimension() {
-// String config = configService.selectConfigByKey("visit.early.day");
-// if (port.equals("8095")) {
-// //鍑洪櫌琛�
-// iPatMedInhospService.dealOutHospInfoByDimension(config);
-// //闂ㄨ瘖琛�(鏂板崕鐨勬殏鏃朵笉鍋氶棬璇婇殢璁�)
+ /**
+ * 澶勭悊鎮ｈ�呬俊鎭紝杩涘叆瀛愪换鍔¤〃(浠诲姟缁�)
+ */
+ public void dealOutHospInfoBySchedule() {
+ String config = configService.selectConfigByKey("visit.early.day");
+ if (port.equals("8095")) {
+ //鍑洪櫌琛�
+ iPatMedInhospService.dealOutHospInfoBySchedule(config);
+ //闂ㄨ瘖琛�(鏂板崕鐨勬殏鏃朵笉鍋氶棬璇婇殢璁�)
// if (!active.equals("xh")) {
// //iPatMedOuthospService.dealOutpatientInfo();
// }
-// }
-// }
+ }
+ }
/**
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceTaskSchedule.java b/smartor/src/main/java/com/smartor/domain/ServiceTaskSchedule.java
index 76914bc..6437d95 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceTaskSchedule.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceTaskSchedule.java
@@ -99,6 +99,31 @@
private Date scheduleBenchmarkCustomTime;
/**
+ * 瀵瑰簲绉戝
+ */
+ @ApiModelProperty("瀵瑰簲绉戝")
+ private String deptcodes;
+
+ /**
+ * 鍑洪櫌鐥呭尯
+ */
+ @ApiModelProperty("鍑洪櫌鐥呭尯")
+ private String leavehospitaldistrictcode;
+
+ /**
+ * icd10缂栫爜
+ */
+ @ApiModelProperty("icd10缂栫爜")
+ private String icdcodes;
+
+ /**
+ * 鎵嬫湳绛夌骇浠ｇ爜
+ */
+ @ApiModelProperty("鎵嬫湳绛夌骇浠ｇ爜")
+ @Excel(name = "鎵嬫湳绛夌骇浠ｇ爜")
+ private String oplevelcodes;
+
+ /**
* 鍒犻櫎鏍囪锛�0瀛樺湪 1鍒犻櫎锛�
*/
@ApiModelProperty("鍒犻櫎鏍囪锛�0瀛樺湪 1鍒犻櫎锛�")
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceTaskdept.java b/smartor/src/main/java/com/smartor/domain/ServiceTaskdept.java
index 8ced674..c2cb6e0 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceTaskdept.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceTaskdept.java
@@ -84,17 +84,5 @@
@ApiModelProperty("鍒犻櫎鏍囧織锛�0锛氭湭鍒犻櫎 1锛氬凡鍒犻櫎锛�")
private String delFlag;
- /**
- * 鏌ヨ鐢紙闈炶〃瀛楁锛夛細鎺掗櫎鐨� appltype銆備富鎵弿浼� "5" 浠ユ帓闄や换鍔＄粍銆�
- */
- @ApiModelProperty("鏌ヨ鐢細鎺掗櫎鐨刟ppltype锛堝5锛屼富鎵弿鎺掗櫎浠诲姟缁勶級")
- private String excludeAppltype;
-
- /**
- * 鏌ヨ鐢紙闈炶〃瀛楁锛夛細闄愬畾鐨� appltype銆備换鍔＄粍鎵弿浼� "5" 鍙煡浠诲姟缁勩��
- */
- @ApiModelProperty("鏌ヨ鐢細闄愬畾鐨刟ppltype锛堝5锛屽彧鏌ヤ换鍔＄粍锛�")
- private String queryAppltype;
-
}
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceTaskdiag.java b/smartor/src/main/java/com/smartor/domain/ServiceTaskdiag.java
index 8fd212e..0b8ad0f 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceTaskdiag.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceTaskdiag.java
@@ -135,17 +135,5 @@
@Excel(name = "鐖禝D")
private Long pid;
- /**
- * 鏌ヨ鐢紙闈炶〃瀛楁锛夛細鎺掗櫎鐨� appltype銆備富鎵弿浼� "5" 浠ユ帓闄や换鍔＄粍銆�
- */
- @ApiModelProperty("鏌ヨ鐢細鎺掗櫎鐨刟ppltype锛堝5锛屼富鎵弿鎺掗櫎浠诲姟缁勶級")
- private String excludeAppltype;
-
- /**
- * 鏌ヨ鐢紙闈炶〃瀛楁锛夛細闄愬畾鐨� appltype銆備换鍔＄粍鎵弿浼� "5" 鍙煡浠诲姟缁勩��
- */
- @ApiModelProperty("鏌ヨ鐢細闄愬畾鐨刟ppltype锛堝5锛屽彧鏌ヤ换鍔＄粍锛�")
- private String queryAppltype;
-
}
diff --git a/smartor/src/main/java/com/smartor/service/IPatMedInhospService.java b/smartor/src/main/java/com/smartor/service/IPatMedInhospService.java
index 774c5bc..6da61db 100644
--- a/smartor/src/main/java/com/smartor/service/IPatMedInhospService.java
+++ b/smartor/src/main/java/com/smartor/service/IPatMedInhospService.java
@@ -93,12 +93,12 @@
public int dealOutHospInfo(String config);
/**
- * 澶勭悊浠巋is鍙栨潵鐨勫嚭闄㈡暟鎹�
+ * 澶勭悊浠巋is鍙栨潵鐨勫嚭闄㈡暟鎹� 浠诲姟缁勭敓鎴�
*
* @param
* @return 缁撴灉
*/
- public int dealOutHospInfoByDimension(String config);
+ public int dealOutHospInfoBySchedule(String config);
/**
* 鑾峰彇鍑洪櫌锛屼綇闄紝闂ㄨ瘖鏈嶅姟浜烘
diff --git a/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
index 8db8f65..afceb9e 100644
--- a/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
@@ -329,12 +329,13 @@
}
/**
- * 澶氱淮搴﹂殢璁�
+ * 浠诲姟缁勯殢璁�
*
* @param config
* @return
*/
- public int dealOutHospInfoByDimension(String config) {
+ public int dealOutHospInfoBySchedule(String config) {
+
// 涓�娆℃�ф煡鍑烘墍鏈夐渶瑕佸鐞嗙殑鍑洪櫌鎮ｈ�咃紙涓変釜缁村害浠绘剰涓�涓湭瀹屾垚锛�
List<PatMedInhosp> patList = patMedInhospMapper.selectNeedProcessList();
log.info("銆愮粺涓�鎵弿銆戝緟澶勭悊鎮ｈ�呮暟锛歿}", patList.size());
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 14acb1a..21f547c 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -747,10 +747,10 @@
scheduleVO.setOrgid(serviceTask.getOrgid());
scheduleVO.setCampusid(serviceTask.getCampusid());
scheduleVO.setCreateBy(serviceTask.getCreateBy());
+ scheduleVO.setDeptcodes(serviceTask.getDeptcode());
+ scheduleVO.setLeavehospitaldistrictcode(serviceTask.getLeavehospitaldistrictcode());
log.info("----serviceTaskSchedule鐨勫�间负锛歿}", scheduleVO);
serviceTaskScheduleService.saveScheduleWithDetail(scheduleVO);
- // 缁戝畾缁村害鍐欐潯浠惰〃锛堜緵 HIS 鑷姩绾冲叆鍖归厤锛宭ongtask 鎭�=1锛�
- bindDimensionCondition(serviceTask, serviceTaskVO);
} else {
ServiceTaskdept serviceTaskdept = new ServiceTaskdept();
serviceTaskdept.setTaskId(serviceTask.getTaskid());
@@ -1078,9 +1078,6 @@
scheduleVO.setCampusid(serviceTask.getCampusid());
scheduleVO.setCreateBy(serviceTask.getUpdateBy());
serviceTaskScheduleService.saveScheduleWithDetail(scheduleVO);
- // 鍏堟竻鏃х淮搴︽潯浠惰〃锛屽啀鎸夋渶鏂板叆鍙傞噸鍐欙紙闃茶繃鏈熺淮搴︽畫鐣欏鑷磋绾冲叆锛�
- clearDimensionCondition(serviceTask.getTaskid());
- bindDimensionCondition(serviceTask, serviceTaskVO);
}
}
if (ObjectUtils.isNotEmpty(serviceTaskVO.getIvrTaskTemplateVO())) {
@@ -1199,86 +1196,6 @@
Map<String, Integer> map = new HashMap<>();
map.put("taskId", serviceTask.getTaskid().intValue());
return map;
- }
-
- /**
- * 浠诲姟缁勶紙appltype=5锛夌粦瀹氱淮搴﹀啓鏉′欢琛紝渚� HIS 鑷姩绾冲叆鍖归厤銆�
- * longtask 鎭�=1锛堝惁鍒欑嫭绔嬫壂鎻�/涓绘壂鎻忔寜 longtask=1 鏌ヤ笉鍒帮級銆�
- * 澶嶇敤鐜版湁 service_taskdept锛堢瀹eptType=1/鐥呭尯deptType=2锛夈�乻ervice_taskdiag锛堢柧鐥咃級銆�
- * 鎵嬫湳缁村害鏈湡涓嶅啓锛堟殏涓嶆敮鎸佽嚜鍔ㄧ撼鍏ワ級銆�
- */
- private void bindDimensionCondition(ServiceTask serviceTask, ServiceTaskVO vo) {
- // 绉戝
- if (StringUtils.isNotEmpty(vo.getDeptcode())) {
- for (String deptCode : vo.getDeptcode().split(",")) {
- if (StringUtils.isEmpty(deptCode)) continue;
- ServiceTaskdept d = new ServiceTaskdept();
- d.setTaskId(serviceTask.getTaskid());
- d.setTaskName(serviceTask.getTaskName());
- d.setOrgid(serviceTask.getOrgid());
- d.setLongtask(1L);
- d.setDeptCode(deptCode);
- d.setDeptType("1");
- d.setServiceType(vo.getServiceType());
- serviceTaskdeptService.insertServiceTaskdept(d);
- }
- }
- // 鐥呭尯
- if (StringUtils.isNotEmpty(vo.getLeavehospitaldistrictcode())) {
- for (String wardCode : vo.getLeavehospitaldistrictcode().split(",")) {
- if (StringUtils.isEmpty(wardCode)) continue;
- ServiceTaskdept d = new ServiceTaskdept();
- d.setTaskId(serviceTask.getTaskid());
- d.setTaskName(serviceTask.getTaskName());
- d.setOrgid(serviceTask.getOrgid());
- d.setLongtask(1L);
- d.setDeptCode(wardCode);
- d.setDeptType("2");
- d.setServiceType(vo.getServiceType());
- serviceTaskdeptService.insertServiceTaskdept(d);
- }
- }
- // 鐤剧梾锛堢敤 split(",")锛屽嬁鐓ф妱 appltype=3 鐜扮綉鐨� split("$") bug锛�
- if (StringUtils.isNotEmpty(vo.getIcd10code())) {
- String[] codes = vo.getIcd10code().split(",");
- String[] names = StringUtils.isNotEmpty(vo.getIcd10name()) ? vo.getIcd10name().split(",") : new String[0];
- for (int i = 0; i < codes.length; i++) {
- if (StringUtils.isEmpty(codes[i])) continue;
- ServiceTaskdiag dg = new ServiceTaskdiag();
- dg.setTaskId(serviceTask.getTaskid());
- dg.setTaskName(serviceTask.getTaskName());
- dg.setOrgid(serviceTask.getOrgid());
- dg.setLongtask(1L);
- dg.setServiceType(vo.getServiceType());
- dg.setIcd10code(codes[i]);
- dg.setIcd10name(i < names.length ? names[i] : null);
- dg.setGuid(serviceTask.getGuid());
- dg.setCreateTime(new Date());
- serviceTaskdiagService.insertServiceTaskdiag(dg);
- }
- }
- }
-
- /**
- * 浠诲姟缁勪慨鏀规椂锛屽厛杞垹璇� task 鏃х殑缁村害鏉′欢琛ㄨ褰曪紙闃茶繃鏈熺淮搴︽畫鐣欏鑷磋绾冲叆锛夈��
- */
- private void clearDimensionCondition(Long taskId) {
- ServiceTaskdept dq = new ServiceTaskdept();
- dq.setTaskId(taskId);
- List<ServiceTaskdept> depts = serviceTaskdeptService.selectServiceTaskdeptList(dq);
- if (CollectionUtils.isNotEmpty(depts)) {
- for (ServiceTaskdept d : depts) {
- serviceTaskdeptService.deleteServiceTaskdeptById(d.getId());
- }
- }
- ServiceTaskdiag gq = new ServiceTaskdiag();
- gq.setTaskId(taskId);
- List<ServiceTaskdiag> diags = serviceTaskdiagService.selectServiceTaskdiagList(gq);
- if (CollectionUtils.isNotEmpty(diags)) {
- for (ServiceTaskdiag g : diags) {
- serviceTaskdiagService.deleteServiceTaskdiagById(g.getId());
- }
- }
}
@Override
--
Gitblit v1.9.3