From b5a1835f3ed1763b3d0b66f8ccff0bbd4d67dd5b Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 28 四月 2025 11:28:59 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java | 4 +++-
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java | 27 +++++++++++++++++----------
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java | 2 +-
3 files changed, 21 insertions(+), 12 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 537d205..cb645e8 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
@@ -143,6 +143,9 @@
@Value("${appid}")
private String appid;
+ @Value("${server.port}")
+ private String port;
+
public void ryMultipleParams(String s, Boolean b, Long l, Double d, Integer i) {
System.out.println(StringUtils.format("鎵ц澶氬弬鏂规硶锛� 瀛楃涓茬被鍨媨}锛屽竷灏旂被鍨媨}锛岄暱鏁村瀷{}锛屾诞鐐瑰瀷{}锛屾暣褰}", s, b, l, d, i));
}
@@ -248,11 +251,13 @@
* 澶勭悊鎮ｈ�呬俊鎭紝杩涘叆瀛愪换鍔¤〃
*/
public void dealOutHospInfo() {
- //鍑洪櫌琛�
- iPatMedInhospService.dealOutHospInfo();
- //闂ㄨ瘖琛�
- if (visitHosp != 1) {
- iPatMedOuthospService.dealOutpatientInfo();
+ if (port.equals("8095")) {
+ //鍑洪櫌琛�
+ iPatMedInhospService.dealOutHospInfo();
+ //闂ㄨ瘖琛�
+ if (visitHosp != 1) {
+ iPatMedOuthospService.dealOutpatientInfo();
+ }
}
}
@@ -261,17 +266,19 @@
* 澶勭悊鎵嬫湳淇℃伅锛岃繘鍏ュ瓙浠诲姟琛�
*/
public void dealOperationInfo() {
- iPatMedOperationService.dealOperationInfo();
+ if (port.equals("8095")) iPatMedOperationService.dealOperationInfo();
+
}
/**
* 澶勭悊鎮ｈ�呬俊鎭紝杩涘叆瀛愪换鍔¤〃(寰俊灏忕▼搴�)
*/
public void dealOutHospInfoXHC() {
- PatMedInhosp patMedInhosp = new PatMedInhosp();
- //鑾峰彇鏈鐞嗙殑鏁版嵁
- List<ServicePatientTemp> servicePatientTemps = iServicePatientTempService.selectServicePatientTempList(new ServicePatientTemp());
-
+ if (port.equals("8095")) {
+ PatMedInhosp patMedInhosp = new PatMedInhosp();
+ //鑾峰彇鏈鐞嗙殑鏁版嵁
+ List<ServicePatientTemp> servicePatientTemps = iServicePatientTempService.selectServicePatientTempList(new ServicePatientTemp());
+ }
}
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 8fd0c47..1f2294e 100644
--- a/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
@@ -315,6 +315,9 @@
continue;
}
try {
+ if (StringUtils.isEmpty(pmiJB.getLeaveicd10code())) {
+ continue;
+ }
// 鏍规嵁鎮ｈ�呯殑鐤剧梾锛岃幏鍙栬鐤剧梾鐨勯暱鏈熶换鍔�
ServiceTaskdiag serviceTaskdiag = new ServiceTaskdiag();
serviceTaskdiag.setLongtask(1L);
@@ -342,7 +345,6 @@
}
}
}
-
//鑾峰彇鏈鐞嗗湪闄㈢殑鏁版嵁(濡傛灉鍒氬垰鍑洪櫌鐨勬偅鑰呮暟鎹殑鍑洪櫌鏃堕棿,鍦ㄤ笅闈㈡煡璇㈠嚭鐨勫叆闄㈡椂闂翠箣鍓�,閭ｄ箣鍓嶇殑鍑洪櫌鎮ｈ�呯殑鏁版嵁,涔熷緱鍋滄帀,鍥犱负鍙堝叆闄簡)
PatMedInhosp patMedInhosp = new PatMedInhosp();
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 6a2afc8..47d2c90 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -348,7 +348,7 @@
return "鏃犻渶鍐嶆闅忚锛屾偅鑰呰鏍囪涓嶉渶瑕佽鏈嶅姟";
}
//鏂板鍐嶆闅忚浠诲姟
- ServiceSubtask serviceSubtask2 = DtoConversionUtils.sourceToTarget(serviceSubtask1, ServiceSubtask.class);
+ ServiceSubtask serviceSubtask2 = DtoConversionUtils.sourceToTarget(serviceSubtask, ServiceSubtask.class);
serviceSubtask2.setId(null);
serviceSubtask2.setVisitCount(serviceSubtask1.getVisitCount() + 1);
serviceSubtask2.setSendstate(2L);
--
Gitblit v1.9.3