From 193807b4c32ba9517e7ba060983cb3f32851d09d Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 30 十月 2025 18:48:07 +0800
Subject: [PATCH] 删除配置信息
---
ruoyi-admin/src/main/resources/application-hzszlyy.yml | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/tools/BaseSmsaccountController.java | 22
ruoyi-admin/src/main/resources/application-hn.yml | 3
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedInhospController.java | 3
ruoyi-admin/src/main/resources/application-sltd.yml | 3
ruoyi-admin/src/main/resources/application.yml | 2
ruoyi-admin/src/main/resources/application-xh.yml | 2
/dev/null | 920 ------------------------------------------------------
smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java | 8
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java | 21
ruoyi-admin/src/main/resources/application-druid.yml | 2
ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java | 27
ruoyi-admin/src/main/resources/application-ywry.yml | 2
ruoyi-admin/src/main/resources/application-ls.yml | 3
14 files changed, 35 insertions(+), 985 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java b/ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java
index b61ba12..0a856e8 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java
@@ -96,9 +96,6 @@
@Value("${xhsmsPath}")
private String xhsmsPath;
- @Value("${visitHosp}")
- private Integer visitHosp;
-
@Value("${server.port}")
private String port;
@@ -299,9 +296,9 @@
iServiceOutPathService.updateServiceOutPath(serviceOutPath);
sendMagParam.setPhone(serviceSubtask.getPhone());
sendMagParam.setUrl(ip + ":" + req_path + "/sf?p=" + format);
- if (visitHosp == 2) {
+ if (active.equals("ls") || active.equals("sltd")) {
sendMagParam.setContent("鎮ㄥソ锛岄個璇锋偍濉啓鍑洪櫌闅忚璋冩煡琛紝璇风偣鍑�" + sendMagParam.getUrl() + "鏌ョ湅銆傛劅璋㈡偍閰嶅悎锛�");
- } else if (visitHosp == 1) {
+ } else if (active.equals("xh")) {
sendMagParam.setContent("銆愭柊鍗庡尰闄€�戞偍濂斤紝閭�璇锋偍濉啓鍑洪櫌闅忚璋冩煡琛紝璇风偣鍑�" + sendMagParam.getUrl() + "濉啓銆傛劅璋㈡偍閰嶅悎锛�");
}
@@ -325,12 +322,12 @@
//濡傛灉type鏄闊抽殢璁跨殑璇濓紙璇存槑琛ュ伩鍙戦�佹柟寮忎腑鏈夌數璇濋殢璁跨殑鏂瑰紡锛岃繖閲岀殑澶栭摼灏卞湴鍧�鍙兘鐢�/sf锛�
if (serviceSubtask.getType().equals("1"))
sendMagParam.setUrl(ip + ":" + req_path + "/sf?p=" + format);
- if (visitHosp == 2) {
+ if (active.equals("ls") || active.equals("ssltd")) {
sendMagParam.setContent("鎮ㄥソ锛岄個璇锋偍濉啓鍑洪櫌璋冩煡琛紝璇风偣鍑�" + sendMagParam.getUrl() + "鏌ョ湅銆傛劅璋㈡偍閰嶅悎锛�");
- } else if (visitHosp == 1) {
+ } else if (active.equals("xh")) {
sendMagParam.setContent("銆愭柊鍗庡尰闄€�戞偍濂斤紝閭�璇锋偍濉啓鍑洪櫌璋冩煡琛紝璇风偣鍑�" + sendMagParam.getUrl() + "濉啓銆傛劅璋㈡偍閰嶅悎锛�");
- } else if (visitHosp == 4) {
- sendMagParam.setContent("銆愮渷绔嬪悓寰枫�戞偍濂斤紝閭�璇锋偍濉啓鍑洪櫌璋冩煡琛紝璇风偣鍑�" + sendMagParam.getUrl() + "濉啓銆傛劅璋㈡偍閰嶅悎锛�");
+ } else if (active.equals("druid")) {
+ sendMagParam.setContent("鎮ㄥソ锛岄個璇锋偍濉啓鍑洪櫌璋冩煡琛紝璇风偣鍑�" + sendMagParam.getUrl() + "濉啓銆傛劅璋㈡偍閰嶅悎锛�");
}
} else if (type == 3) {
//瀹f暀
@@ -350,12 +347,10 @@
if (heLibrary.getHetype().equals("1")) {
sendMagParam.setPhone(serviceSubtask.getPhone());
sendMagParam.setUrl(ip + ":" + req_path + "/xj?p=" + format);
- if (visitHosp == 2) {
+ if (active.equals("ls") || active.equals("sltd")) {
sendMagParam.setContent("鎮ㄥソ锛岄個璇锋偍濉啓鍑洪櫌瀹f暀璋冩煡琛紝璇风偣鍑�" + sendMagParam.getUrl() + "鏌ョ湅銆傛劅璋㈡偍閰嶅悎锛�");
- } else if (visitHosp == 1) {
+ } else if (active.equals("xh")) {
sendMagParam.setContent("銆愭柊鍗庡尰闄€�戞偍濂斤紝閭�璇锋偍濉啓鍑洪櫌瀹f暀璋冩煡琛紝璇风偣鍑�" + sendMagParam.getUrl() + "鏌ョ湅銆傛劅璋㈡偍閰嶅悎锛�");
- }else if (visitHosp == 4) {
- sendMagParam.setContent("銆愮渷绔嬪悓寰枫�戞偍濂斤紝閭�璇锋偍濉啓鍑洪櫌瀹f暀璋冩煡琛紝璇风偣鍑�" + sendMagParam.getUrl() + "鏌ョ湅銆傛劅璋㈡偍閰嶅悎锛�");
}
} else {
//閫氱煡
@@ -366,13 +361,13 @@
//鐭俊杩橀渶瑕佹ā鏉�
String s = null;
- if (visitHosp == 1) {
+ if (active.equals("xh")) {
//鏂板崕鐨勭煭淇″彂閫佹柟寮�
Map<String, String> req = new HashMap<>();
req.put("phone", sendMagParam.getPhone());
req.put("content", sendMagParam.getContent());
s = HttpUtil.postJsonRequest(xhsmsPath, new Gson().toJson(req));
- } else if (visitHosp == 2) {
+ } else if (active.equals("ls")) {
String url = configService.selectConfigByKey("token.360", serviceSubtask.getOrgid());
log.info("-------00token.360鐨刄RL涓猴細{}", url);
//涓芥按鐨勭煭淇″彂閫佹柟寮�
@@ -400,7 +395,7 @@
setFailPreachForm(serviceSubtask, sendPreachform, "鐭俊鍙戦�佸け璐�", "5");
throw new BaseException("鐭俊鍙戦�佸け璐�");
}
- } else if (visitHosp == 4) {
+ } else if (active.equals("sltd")) {
//鐪佺珛鍚屽痉鐨勭煭淇″彂閫佹柟寮�
JSONObject data = MessageSend.sendMsg(sendMagParam.getContent(), "2", sendMagParam.getPhone(), LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss")));
String code = data.get("code").toString();
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedInhospController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedInhospController.java
index 6e59d31..3ccd381 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedInhospController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedInhospController.java
@@ -42,9 +42,6 @@
@Autowired
private IPatMedOuthospService iPatMedOuthospService;
- @Value("${visitHosp}")
- private Integer visitHosp;
-
/**
* 鏌ヨ鎮h�呬綇闄㈣褰曞垪琛�
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/tools/BaseSmsaccountController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/tools/BaseSmsaccountController.java
index dd4aebf..3b67108 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/tools/BaseSmsaccountController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/tools/BaseSmsaccountController.java
@@ -40,9 +40,6 @@
@Autowired
private IBaseSmsaccountService baseSmsaccountService;
- @Value("${visitHosp}")
- private Integer visitHosp;
-
@Value("${xhsmsPath}")
private String xhsmsPath;
@@ -52,11 +49,14 @@
@Value("${xhsmsPwd}")
private String xhsmsPwd;
+ @Value("${spring.profiles.active}")
+ private String active;
+
/**
* 鏌ヨ鐭俊璐﹀彿鍒楄〃
*/
//@PreAuthorize("@ss.hasPermi('smartor:smsaccount:list')")
- @PostMapping("/list")
+ @PostMapping("/list")
public TableDataInfo list(@RequestBody BaseSmsaccount baseSmsaccount) {
startPage();
List<BaseSmsaccount> list = baseSmsaccountService.selectBaseSmsaccountList(baseSmsaccount);
@@ -122,17 +122,17 @@
@PostMapping("/sendMsg")
@RepeatSubmit
public AjaxResult sendMsg(@RequestBody BaseSmsRequest baseSmsRequest) {
- String sendMsg="";
- if(visitHosp.equals("3")) {
- try{
+ String sendMsg = "";
+ if (active.equals("hzszlyy")) {
+ try {
JSONObject jsTemp = JSON.parseObject(baseSmsRequest.getTemplateParam());
- String content=jsTemp.getString("name");
- sendMsg= smsUtils.sendSms(xhsmsPath,xhsmsAccount,xhsmsPwd,baseSmsRequest.getPhoneNumber(),content);
+ String content = jsTemp.getString("name");
+ sendMsg = smsUtils.sendSms(xhsmsPath, xhsmsAccount, xhsmsPwd, baseSmsRequest.getPhoneNumber(), content);
} catch (Exception ex) {
- return AjaxResult.error(ex.getMessage()) ;
+ return AjaxResult.error(ex.getMessage());
}
return AjaxResult.success(sendMsg);
- }else {
+ } else {
if (baseSmsaccountService.sendMsg(baseSmsRequest) == null) {
return error();
}
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index fdd3e7b..37110f0 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -266,8 +266,6 @@
#admin绠$悊鍛榰serId
isAdmin: 1,2,3,4,5,6,7,8,9,10,11,12,13
-#闅忚鍖婚櫌锛�1鏂板崕 2涓芥按
-visitHosp: 2
isEncryp:
diff --git a/ruoyi-admin/src/main/resources/application-hn.yml b/ruoyi-admin/src/main/resources/application-hn.yml
index 4aa989f..0e263c9 100644
--- a/ruoyi-admin/src/main/resources/application-hn.yml
+++ b/ruoyi-admin/src/main/resources/application-hn.yml
@@ -254,9 +254,6 @@
#admin绠$悊鍛榰serId
isAdmin: 1,2,3,4,5,6,7,8,9,10,11,12,13
-#闅忚鍖婚櫌锛�1鏂板崕 2涓芥按 3鐪佺珛鍚屽痉
-visitHosp: 0
-
#澶勭悊鎶曡瘔寤鸿鐨勯儴闂ㄧ紪鐮�
dealDeptCode:
diff --git a/ruoyi-admin/src/main/resources/application-hzszlyy.yml b/ruoyi-admin/src/main/resources/application-hzszlyy.yml
index 4c2bc54..c60e4d8 100644
--- a/ruoyi-admin/src/main/resources/application-hzszlyy.yml
+++ b/ruoyi-admin/src/main/resources/application-hzszlyy.yml
@@ -213,5 +213,3 @@
#admin绠$悊鍛榰serId
isAdmin: 1,2,3,4,5,6,7,8,9,10,11,12,13
-#闅忚鍖婚櫌锛�1鏂板崕 2涓芥按 3 鏉窞甯備竴鍖婚櫌鍚村北闄㈠尯
-visitHosp: 3
diff --git a/ruoyi-admin/src/main/resources/application-ls.yml b/ruoyi-admin/src/main/resources/application-ls.yml
index 70eeb24..b0fb629 100644
--- a/ruoyi-admin/src/main/resources/application-ls.yml
+++ b/ruoyi-admin/src/main/resources/application-ls.yml
@@ -243,9 +243,6 @@
#admin绠$悊鍛榰serId
isAdmin: 1,2,3,4,5,6,7,8,9,10,11,12,13
-#闅忚鍖婚櫌锛�1鏂板崕 2涓芥按 4鐪佺珛鍚屽痉
-visitHosp: 2
-
#澶勭悊鎶曡瘔寤鸿鐨勯儴闂ㄧ紪鐮�
dealDeptCode:
diff --git a/ruoyi-admin/src/main/resources/application-sltd.yml b/ruoyi-admin/src/main/resources/application-sltd.yml
index b239f5c..3891972 100644
--- a/ruoyi-admin/src/main/resources/application-sltd.yml
+++ b/ruoyi-admin/src/main/resources/application-sltd.yml
@@ -231,9 +231,6 @@
#admin绠$悊鍛榰serId
isAdmin: 1,2,3,4,5,6,7,8,9,10,11,12,13
-#闅忚鍖婚櫌锛�1鏂板崕 2涓芥按 3甯備竴 4鐪佺珛鍚屽痉
-visitHosp: 4
-
#鐢ㄦ埛榛樿瀵嗙爜
userPwd: sltd@0230
diff --git a/ruoyi-admin/src/main/resources/application-xh.yml b/ruoyi-admin/src/main/resources/application-xh.yml
index 692cc4b..663631f 100644
--- a/ruoyi-admin/src/main/resources/application-xh.yml
+++ b/ruoyi-admin/src/main/resources/application-xh.yml
@@ -229,8 +229,6 @@
#admin绠$悊鍛榰serId
isAdmin: 1,2,3,4,5,6,7,8,9,10,11,12,13
-#闅忚鍖婚櫌锛�1鏂板崕 2涓芥按 3鐪佺珛鍚屽痉
-visitHosp: 1
#澶勭悊鎶曡瘔寤鸿鐨勯儴闂ㄧ紪鐮�
dealDeptCode:
diff --git a/ruoyi-admin/src/main/resources/application-ywry.yml b/ruoyi-admin/src/main/resources/application-ywry.yml
index b278b68..225a3e2 100644
--- a/ruoyi-admin/src/main/resources/application-ywry.yml
+++ b/ruoyi-admin/src/main/resources/application-ywry.yml
@@ -215,8 +215,6 @@
#admin绠$悊鍛榰serId
isAdmin: 1,2,3,4,5,6,7,8,9,10,11,12,13
-#闅忚鍖婚櫌锛�1鏂板崕 2涓芥按
-visitHosp: 2
#澶勭悊鎶曡瘔寤鸿鐨勯儴闂ㄧ紪鐮�
dealDeptCode:
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 9634a5b..7c0275b 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -74,7 +74,7 @@
# 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
basename: i18n/messages
profiles:
- active: ls
+ active: druid
# 鏂囦欢涓婁紶
servlet:
multipart:
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 3f02e38..0d9072d 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
@@ -5,7 +5,7 @@
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.gson.Gson;
import com.ruoyi.common.core.redis.RedisCache;
-import com.ruoyi.common.dx2.MessageSend;
+import com.ruoyi.common.dx.MessageSend;
import com.ruoyi.common.enums.MsgLSEnum;
import com.ruoyi.common.enums.ServiceFromEnum;
import com.ruoyi.common.enums.WxGZHEnum;
@@ -111,9 +111,6 @@
@Value("${req_path}")
private String req_path;
-
- @Value("${visitHosp}")
- private Integer visitHosp;
@Autowired
private ServiceTaskMapper serviceTaskMapper;
@@ -339,7 +336,7 @@
//鍑洪櫌琛�
iPatMedInhospService.dealOutHospInfo();
//闂ㄨ瘖琛�
- if (visitHosp != 1) {
+ if (active.equals("xh")) {
iPatMedOuthospService.dealOutpatientInfo();
}
}
@@ -588,12 +585,12 @@
}
}
String isSuccess = null;
- if (visitHosp == 1) {
+ if (active.equals("xh")) {
Map<String, String> req = new HashMap<>();
req.put("phone", sendMagParam.getPhone());
req.put("content", sendMagParam.getContent());
isSuccess = HttpUtil.postJsonRequest(xhsmsPath, new Gson().toJson(req));
- } else if (visitHosp == 2) {
+ } else if (active.equals("ls")) {
String url = configService.selectConfigByKey("token.360", serviceSubtask.getOrgid());
//涓芥按鐨勭煭淇″彂閫佹柟寮�
Map<String, String> map = MsgLSEnum.getAddressByCode(serviceSubtask.getOrgid());
@@ -611,14 +608,14 @@
if (code.equals("0")) {
isSuccess = "true";
}
- } else if (visitHosp == 4) {
+ } else if (active.equals("sltd")) {
//鐪佺珛鍚屽痉鐨勭煭淇″彂閫佹柟寮�
JSONObject data = MessageSend.sendMsg(sendMagParam.getContent(), "2", sendMagParam.getPhone(), LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss")));
String code = data.get("code").toString();
if (StringUtils.isNotEmpty(code) && code.equals("00000")) {
isSuccess = "true";
}
- } else if (visitHosp == 3) {//甯備竴鍖婚櫌
+ } else if (active.equals("hzszlyy")) {//甯備竴鍖婚櫌
String content = sendMagParam.getContent().replace("銆愭柊鍗庡尰闄€��", "");
String result = smsUtils.sendSms(xhsmsPath, xhsmsAccount, xhsmsPwd, sendMagParam.getPhone(), content);
//杩欓噷闇�瑕佹牴鎹畆esult杩斿洖鐨勫�煎幓鍒ゆ柇锛屾槸鍚︽垚鍔燂紝鐒跺悗灏嗗�艰祴鍊肩粰isSuccess
@@ -679,10 +676,8 @@
return;
}
String wxCode = "";
- if (visitHosp == 3) {//甯備竴鍖婚櫌
- String urlTemp = "http://192.200.54.14:5003/sfjk/SendMessage?sfzh=" + serviceSubtask.getSfzh()
- + "&title=鎮ㄥソ锛岄個璇锋偍濉啓鍑洪櫌璋冩煡琛紝璇风偣鍑诲~鍐欍��&content=鎮ㄥソ锛岄個璇锋偍濉啓鍑洪櫌璋冩煡琛紝璇风偣鍑诲~鍐欍��&phone=" + patArchive.getTelcode()
- + "&url=" + url + "&key=ff76f8904f5f32b5ee1739e8ea46e60g";
+ if (active.equals("hzszlyy")) {//甯備竴鍖婚櫌
+ String urlTemp = "http://192.200.54.14:5003/sfjk/SendMessage?sfzh=" + serviceSubtask.getSfzh() + "&title=鎮ㄥソ锛岄個璇锋偍濉啓鍑洪櫌璋冩煡琛紝璇风偣鍑诲~鍐欍��&content=鎮ㄥソ锛岄個璇锋偍濉啓鍑洪櫌璋冩煡琛紝璇风偣鍑诲~鍐欍��&phone=" + patArchive.getTelcode() + "&url=" + url + "&key=ff76f8904f5f32b5ee1739e8ea46e60g";
HttpUtils.sendGet(urlTemp);
} else {
wxCode = getWXCode(serviceSubtask.getSfzh(), url, serviceSubtask.getTaskName(), serviceSubtask.getTaskDesc(), patArchive.getTelcode(), serviceSubtask.getSendname(), patArchive.getPatidHis(), wxqqxx);
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask2.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask2.java
deleted file mode 100644
index a5cf25d..0000000
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask2.java
+++ /dev/null
@@ -1,920 +0,0 @@
-//package com.ruoyi.quartz.task;
-//
-//import com.alibaba.fastjson2.JSONObject;
-//import com.fasterxml.jackson.databind.JsonNode;
-//import com.fasterxml.jackson.databind.ObjectMapper;
-//import com.google.common.reflect.TypeToken;
-//import com.google.gson.Gson;
-//import com.google.gson.JsonArray;
-//import com.google.gson.JsonObject;
-//import com.ruoyi.common.core.redis.RedisCache;
-//import com.ruoyi.common.enums.MsgLSEnum;
-//import com.ruoyi.common.enums.ServiceFromEnum;
-//import com.ruoyi.common.enums.WxGZHEnum;
-//import com.ruoyi.common.utils.HttpUtil;
-//import com.ruoyi.common.utils.OkHttpExample;
-//import com.ruoyi.common.utils.RSAPublicKeyExample;
-//import com.ruoyi.common.utils.StringUtils;
-//import com.ruoyi.common.utils.http.HttpUtils;
-//import com.smartor.common.LSHospTokenUtil;
-//import com.smartor.domain.*;
-//import com.smartor.mapper.ServiceSubtaskMapper;
-//import com.smartor.mapper.ServiceTaskMapper;
-//import com.smartor.mapper.SysUserImportMapper;
-//import com.smartor.service.*;
-//import lombok.extern.slf4j.Slf4j;
-//import org.apache.commons.collections4.CollectionUtils;
-//import org.apache.commons.lang3.ObjectUtils;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.beans.factory.annotation.Value;
-//import org.springframework.stereotype.Component;
-//import org.springframework.transaction.PlatformTransactionManager;
-//import org.springframework.transaction.annotation.Transactional;
-//
-//import java.io.File;
-//import java.io.FileWriter;
-//import java.io.IOException;
-//import java.lang.reflect.Type;
-//import java.net.URLEncoder;
-//import java.nio.charset.StandardCharsets;
-//import java.nio.file.Files;
-//import java.nio.file.Paths;
-//import java.security.MessageDigest;
-//import java.text.ParseException;
-//import java.text.SimpleDateFormat;
-//import java.time.LocalDate;
-//import java.time.LocalDateTime;
-//import java.time.LocalTime;
-//import java.time.ZoneId;
-//import java.time.format.DateTimeFormatter;
-//import java.util.*;
-//import java.util.stream.Collectors;
-//
-//import static cn.hutool.core.convert.Convert.toHex;
-//
-///**
-// * 瀹氭椂浠诲姟璋冨害娴嬭瘯
-// *
-// * @author ruoyi
-// */
-//@Slf4j
-//@Component("ryTask2")
-//public class RyTask2 {
-// @Autowired
-// private IServiceThirdDataService iServiceThirdDataService;
-//
-// @Autowired
-// private IServiceOutPathService iServiceOutPathService;
-//
-// @Autowired
-// private IServiceSubtaskAnswerService serviceSubtaskAnswerService;
-//
-// @Autowired
-// private IPatMedInhospService iPatMedInhospService;
-//
-// @Autowired
-// private IPatMedOuthospService iPatMedOuthospService;
-//
-// @Autowired
-// private IPatMedOperationService iPatMedOperationService;
-//
-// @Autowired
-// private IServiceSubtaskService iServiceSubtaskService;
-//
-// @Autowired
-// private IServicePatientTempService iServicePatientTempService;
-//
-// @Autowired
-// private PlatformTransactionManager transactionManager;
-//
-// @Autowired
-// private SysUserImportMapper sysUserImportMapper;
-//
-// @Value("${localIP}")
-// private String localIP;
-//
-// @Value("${xhsmsPath}")
-// private String xhsmsPath;
-//
-// @Value("${pub_key}")
-// private String pub_key;
-//
-// @Value("${req_path}")
-// private String req_path;
-//
-// @Value("${visitHosp}")
-// private Integer visitHosp;
-//
-// @Autowired
-// private ServiceTaskMapper serviceTaskMapper;
-//
-// @Autowired
-// private ServiceSubtaskMapper serviceSubtaskMapper;
-//
-// @Autowired
-// private RedisCache redisCache;
-//
-// @Autowired
-// private IServiceSubtaskRecordService serviceSubtaskRecordService;
-//
-// @Autowired
-// IBaseSmsaccountService baseSmsaccountService;
-//
-// @Autowired
-// IPatArchiveService patArchiveService;
-//
-// @Autowired
-// IPatMedInhospService patMedInhospService;
-//
-// @Autowired
-// IPatMedOuthospService patMedOuthospService;
-//
-// @Autowired
-// ISvyTaskTemplateService svyTaskTemplateService;
-//
-// @Autowired
-// IIvrTaskTemplateService iIvrTaskTemplateService;
-//
-// @Value("${hosp_info_url}")
-// private String hospInfoUrl;
-//
-// @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));
-// }
-//
-// public void ryParams(String params) {
-// System.out.println("鎵ц鏈夊弬鏂规硶锛�" + params);
-// }
-//
-// public void ryNoParams() {
-// System.out.println("鎵ц鏃犲弬鏂规硶");
-// }
-//
-// public void importData() {
-// String filePath = "C:\\Users\\86176\\Desktop\\鏂板缓鏂囨湰鏂囨。 4.txt"; // 鏇挎崲涓轰綘鐨勬枃浠惰矾寰�
-//
-// try {
-// // 璇诲彇鏂囦欢鍐呭
-// String jsonContent = new String(Files.readAllBytes(Paths.get(filePath)), StandardCharsets.UTF_8);
-//
-// // 鍒涘缓ObjectMapper瀵硅薄
-// ObjectMapper objectMapper = new ObjectMapper();
-// // 瑙f瀽JSON涓篔sonNode
-// JsonNode rootNode = objectMapper.readTree(jsonContent);
-// // 鑾峰彇resultList
-// JsonNode resultListNode = rootNode.path("results").path("resultList");
-// // 閬嶅巻resultList涓殑姣忎釜瀵硅薄
-// for (JsonNode item : resultListNode) {
-//
-// SysUserImport person = objectMapper.treeToValue(item, SysUserImport.class);
-// person.setStaffPhoto("");
-// sysUserImportMapper.insertSysUserImport(person);
-//
-// }
-//
-// } catch (IOException e) {
-// e.printStackTrace();
-// }
-//
-// }
-//
-// public void analysisData() {
-// System.out.println("---------------------------");
-// //鏁版嵁瑙f瀽
-// ServiceThirdData serviceThirdData = new ServiceThirdData();
-// serviceThirdData.setDataType("ADT^A03");
-// serviceThirdData.setIsDeal(0);
-// serviceThirdData.setCreateTime(new Date());
-// iServiceThirdDataService.queryList(serviceThirdData);
-//
-// }
-//
-// /**
-// * 瀹氭椂澶勭悊澶栭摼鐨勬暟鎹�
-// */
-// public void runServiceSubTaskAnswer() {
-// serviceSubtaskAnswerService.saveQuestionAnswer(null, 0L);
-// }
-//
-//
-// /**
-// * 澶勭悊his鏁版嵁
-// */
-// public void dealHisData() {
-// //灏嗘偅鑰呬俊鎭�佸嚭闄€�侀棬璇婃暟鎹叏閮ㄩ噰闆�
-// // 鑾峰彇褰撳墠鏃ユ湡鍜屾椂闂�
-// LocalDateTime endTime = LocalDateTime.now();
-// endTime = endTime.with(LocalTime.MIN);
-//// String dateStr = "2024/11/30 00:00:00";
-//// DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy/MM/dd HH:mm:ss");
-//// LocalDateTime endTime = LocalDateTime.parse(dateStr, formatter);
-// // 鑾峰彇鍓嶄竴澶╃殑鏃ユ湡鍜屾椂闂�
-// LocalDateTime startTime = endTime.minusDays(1);
-// startTime = startTime.with(LocalTime.MIN);
-// getInHospInfo("0", startTime, endTime);
-// getInHospInfo("1", startTime, endTime);
-//
-// //璋冪敤dealOupHospInfo鏁版嵁澶勭悊鏂规硶锛屽鐞嗗畬鍚庯紝灏嗏�滃嚭闄㈣〃鐨刢heck_flag=1鈥�
-// //鑾峰彇褰撳墠鏃ユ湡 锛堢簿纭埌澶╋級寰�鍓嶆帹鐩稿簲澶╂暟锛堝湪鎸囧畾鐨勫熀纭�妯℃澘涓壘瀵瑰簲鐨勫ぉ鏁帮級锛�
-// //寰幆鎮h�呬俊鎭紝鏍规嵁鎮h��"鍑洪櫌璇婃柇ICD鍊尖�濊幏鍙栧埌鐩稿綋鐨勬ā鏉匡紙鑾峰彇鍙栫浉搴旂殑澶╂暟锛�;
-// //鏍规嵁鏌ヨ鍑烘潵鐨勬ā鏉匡紝鍘诲浐瀹氫换鍔★紙鍥哄畾浠诲姟锛屽凡缁忓皢妯℃澘涔熷浐瀹氫簡锛夊幓鍖归厤妯℃澘
-// //鏍规嵁鍖归厤鍑烘潵鐨勬ā鏉垮拰浠诲姟涓庢偅鑰呬俊鎭紝灏嗘暟鎹彃鍏ュ埌瀛愪换鍔¤〃涓�
-// }
-//
-// public void dealHisData2() {
-// //灏嗘偅鑰呬俊鎭�佸嚭闄€�侀棬璇婃暟鎹叏閮ㄩ噰闆�
-// // 鎸囧畾鐨勫紑濮嬫棩鏈�
-// LocalDate endDate = LocalDate.of(2025, 3, 3);
-// // 褰撳墠鏃ユ湡
-// LocalDate currentDate = LocalDate.now();
-// // 瀹氫箟鏃ユ湡鏍煎紡
-// DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd ");
-//
-// // 浠庡紑濮嬫棩鏈熷埌褰撳墠鏃ユ湡閫愬ぉ鎵撳嵃
-// for (LocalDate date = endDate; !date.isAfter(currentDate); date = date.plusDays(1)) {
-// System.out.println(date.format(formatter));
-// getInHospInfo("0", date.minusDays(1).atStartOfDay(), date.atStartOfDay());
-// getInHospInfo("1", date.minusDays(1).atStartOfDay(), date.atStartOfDay());
-// }
-//
-// }
-//
-// /**
-// * 澶勭悊鎮h�呬俊鎭紝杩涘叆瀛愪换鍔¤〃
-// */
-// public void dealOutHospInfo() {
-// if (port.equals("8095")) {
-// //鍑洪櫌琛�
-// iPatMedInhospService.dealOutHospInfo();
-// //闂ㄨ瘖琛�
-// if (visitHosp != 1) {
-// iPatMedOuthospService.dealOutpatientInfo();
-// }
-// }
-// }
-//
-//
-// /**
-// * 澶勭悊鎵嬫湳淇℃伅锛岃繘鍏ュ瓙浠诲姟琛�
-// */
-// public void dealOperationInfo() {
-// if (port.equals("8095")) iPatMedOperationService.dealOperationInfo();
-//
-// }
-//
-// /**
-// * 澶勭悊鎮h�呬俊鎭紝杩涘叆瀛愪换鍔¤〃(寰俊灏忕▼搴�)
-// */
-// public void dealOutHospInfoXHC() {
-// if (port.equals("8095")) {
-// PatMedInhosp patMedInhosp = new PatMedInhosp();
-// //鑾峰彇鏈鐞嗙殑鏁版嵁
-// List<ServicePatientTemp> servicePatientTemps = iServicePatientTempService.selectServicePatientTempList(new ServicePatientTemp());
-// }
-// }
-//
-//
-// /**
-// * 闀挎湡浠诲姟鎵ц
-// */
-// public void longTaskSend() {
-// //鑾峰彇浠诲姟淇℃伅
-// ServiceTask st = new ServiceTask();
-// st.setDelFlag("0");
-// st.setLongTask(1);
-// List<ServiceTask> serviceTasks = serviceTaskMapper.selectServiceTaskList(st);
-// log.info("serviceTasks杩涙潵浜嗗悧锛焮}", serviceTasks.size());
-// for (ServiceTask serviceTask : serviceTasks) {
-// CommonTaskcallMQ commonTaskcallMQ = new CommonTaskcallMQ();
-// commonTaskcallMQ.setTaskid(serviceTask.getTaskid());
-// commonTaskcallMQ.setPreachform(serviceTask.getPreachform());
-// commonTaskcallMQ.setSendType("2");
-// sfHandlle(commonTaskcallMQ, localIP);
-// }
-// }
-//
-// /**
-// * 鍒ゆ柇鏃ユ湡鏄惁鏄粖澶�
-// *
-// * @param date
-// * @return
-// */
-// public boolean isDateToday(Date date) {
-// if (date == null) {
-// return false;
-// }
-// // 灏� Date 杞负 LocalDate
-// LocalDate localDate = date.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
-// // 鑾峰彇浠婂ぉ鐨� LocalDate
-// LocalDate today = LocalDate.now();
-// // 濡傛灉鏃ユ湡鏃╀簬鎴栫瓑浜庝粖澶╋紝杩斿洖 true
-// return !localDate.isAfter(today);
-// }
-//
-// public void sfHandlle(CommonTaskcallMQ commonTaskcallMQ, String ip) {
-// log.info("sfHandlle杩涙潵浜嗗悧锛焮}", commonTaskcallMQ);
-// //鍒ゆ柇涓�涓媍ommonTaskcallMQ涓殑stopstate鏄惁涓巌vr_task涓殑涓�鑷达紝涓嶄竴鑷达紝鍒欒鏄庢槸鏆傚仠浜�
-// ServiceTask ivrTask1 = serviceTaskMapper.selectServiceTaskByTaskid(commonTaskcallMQ.getTaskid());
-//
-// if (StringUtils.isNotEmpty(commonTaskcallMQ.getPreachform())) {
-// //濡備綍浠诲姟鍙戦�佹柟寮忎笉涓虹┖
-// String[] split = commonTaskcallMQ.getPreachform().split(",");
-// log.info("split杩涙潵浜嗗悧锛焮}", split);
-// for (String serviceFrom : split) {
-// String descByCode = ServiceFromEnum.getDescByCode(Integer.valueOf(serviceFrom));
-// //閫氳繃浠诲姟ID鎷垮埌鎮h�呬俊鎭�
-// ServiceSubtaskVO ivrTaskcall = new ServiceSubtaskVO();
-// ivrTaskcall.setTaskid(commonTaskcallMQ.getTaskid());
-// ivrTaskcall.setSendstate(2L);
-// List<ServiceSubtask> subtaskList = iServiceSubtaskService.selectServiceSubtaskList(ivrTaskcall);
-// //涓芥按鏈夌殑鍖婚櫌杩樻病娉曞仛闀挎湡浠诲姟闅忚
-// List<ServiceSubtask> subtaskList2 = new ArrayList<>();
-// if (visitHosp == 2) {
-// for (ServiceSubtask serviceSubtask : subtaskList) {
-//// Boolean b = VisitSendStateEnum.getDescByCode(serviceSubtask.getOrgid());
-// Boolean b = false;
-// if (b) subtaskList2.add(serviceSubtask);
-// }
-// subtaskList = subtaskList2;
-// }
-//
-// // 鎸夌収 endtime 绂诲綋鍓嶆椂闂存渶杩戠殑鎺掑簭
-// List<ServiceSubtask> selectServiceSubtaskList = subtaskList.stream().sorted(Comparator.comparing(subtask -> Math.abs(subtask.getEndtime().getTime() - new Date().getTime()))).collect(Collectors.toList());
-//
-// if (descByCode.equals("鐢佃瘽")) {
-// String value = "";
-// List<String> list = new ArrayList<>();
-// for (ServiceSubtask serviceSubtask : selectServiceSubtaskList) {
-// ServiceTask ivrTask = serviceTaskMapper.selectServiceTaskByTaskid(serviceSubtask.getTaskid());
-// if (ivrTask.getSendState() != null && ivrTask.getSendState() == 3 || ivrTask.getSendState() != null && ivrTask.getSendState() == 4) {
-// //濡備綍浠诲姟琚�滄殏鍋溾�濇垨鈥滅粓姝⑩��
-// break;
-// }
-// if (org.apache.commons.lang3.StringUtils.isEmpty(serviceSubtask.getPhone())) {
-// serviceSubtask.setRemark("鎵嬫満鍙蜂负绌�");
-// serviceSubtask.setSendstate(4L);
-// serviceSubtask.setResult("error");
-//// serviceSubtask.setFinishtime(new Date());
-// serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
-// continue;
-// }
-// boolean dateToday = isDateToday(serviceSubtask.getLongSendTime());
-// //璇存槑鏄珛鍗冲彂閫�(鍏堟妸娑堟伅鏀惧埌cache-0涓紝 displayNo涓嶇煡閬撴�庝箞閰嶇疆)
-// if (dateToday) {
-// list.add(serviceSubtask.getId().toString());
-// //鍦ㄥ瓙浠诲姟琛ㄩ噷璁板綍涓�涓�
-// String uuid = UUID.randomUUID().toString();
-// serviceSubtask.setResult("success");
-// serviceSubtask.setRemark("闀挎湡浠诲姟锛岀數璇濊繘鍏ラ槦鍒楁垚鍔�");
-// serviceSubtask.setGuid(uuid);
-// serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
-//
-// //浠诲姟鍙戦�佽褰�
-// ServiceSubtaskRecord serviceSubtaskRecord = new ServiceSubtaskRecord();
-// serviceSubtaskRecord.setTaskid(serviceSubtask.getTaskid().toString());
-// serviceSubtaskRecord.setSubtaskId(serviceSubtask.getId());
-// serviceSubtaskRecord.setUuid(uuid);
-// serviceSubtaskRecord.setTasktype(serviceSubtask.getType());
-// serviceSubtaskRecord.setPreachform("3");
-// serviceSubtaskRecord.setStartTime(System.currentTimeMillis());
-// serviceSubtaskRecord.setRemark("闀挎湡浠诲姟锛岀數璇濊繘鍏ラ槦鍒楁垚鍔�");
-// serviceSubtaskRecordService.insertServiceSubtaskRecord(serviceSubtaskRecord);
-//
-// }
-// }
-// //灏嗚鎵ц鐨勬斁鍒扮紦瀛樹腑
-// if (list.size() > 0) {
-//// redisCache.setCacheListLeft("cache-0", list);
-// redisCache.setCacheListLeftAndDistinct("cache-0", list);
-// }
-// } else if (descByCode.equals("澶氬獟浣�")) {
-// //澶氬獟浣�
-// } else if (descByCode.equals("绾歌川")) {
-// //绾歌川
-// } else if (descByCode.equals("寰俊灏忕▼搴�")) {
-// //寰俊灏忕▼搴�
-// log.info("ivrTask1鐨勫�间负锛歿}", ivrTask1);
-// if (ObjectUtils.isNotEmpty(ivrTask1) && ivrTask1.getPatCycle() == 1) {
-// //璇存槑璇ヤ换鍔$殑鎮h�呮槸寰幆鎵ц鐨�
-// ServiceSubtaskVO serviceSubtaskVO = new ServiceSubtaskVO();
-// serviceSubtaskVO.setTaskid(ivrTask1.getTaskid());
-// List<ServiceSubtask> serviceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtaskVO);
-// //杩欓噷闇�瑕佹牴鎹韩浠借瘉鍘婚噸
-// List<ServiceSubtask> serviceSubtaskListFilter = new ArrayList<>();
-// aa:
-// for (ServiceSubtask serviceSubtask : serviceSubtaskList) {
-// for (ServiceSubtask ss : serviceSubtaskListFilter) {
-// if (ss.getSfzh().equals(serviceSubtask.getSfzh())) {
-// continue aa;
-// }
-// }
-// serviceSubtaskListFilter.add(serviceSubtask);
-// }
-// for (ServiceSubtask serviceSubtask : serviceSubtaskListFilter) {
-// //灏嗗瓙浠诲姟ID鍒犻櫎 銆乻endstate鏀规垚3
-// serviceSubtask.setSendstate(3L);
-// serviceSubtask.setId(null);
-// serviceSubtask.setFinishtime(null);
-// serviceSubtask.setCreateTime(new Date());
-// serviceSubtask.setUpdateTime(new Date());
-// //澶勭悊閲嶅鏂板闂锛屽厛鏌ヤ竴涓嬩粖澶╂槸涓嶆槸鏈夋柊澧炶繃锛屾柊澧炶繃灏变笉鏂板浜�
-// ServiceSubtaskVO ssvo = new ServiceSubtaskVO();
-// LocalDate today = LocalDate.now();
-// LocalTime startOfDay = LocalTime.of(0, 0, 0);
-// LocalTime endOfDay = LocalTime.of(23, 59, 59);
-// Date startOfDayDate = Date.from(today.atTime(startOfDay).atZone(ZoneId.systemDefault()).toInstant());
-// Date endOfDayDate = Date.from(today.atTime(endOfDay).atZone(ZoneId.systemDefault()).toInstant());
-// ssvo.setCreateStartTime(startOfDayDate);
-// ssvo.setCreateEndTime(endOfDayDate);
-// ssvo.setCreateBy(serviceSubtask.getCreateBy());
-// ssvo.setSendname(serviceSubtask.getSendname());
-// ssvo.setSfzh(serviceSubtask.getSfzh());
-// List<ServiceSubtask> serviceSubtaskListByCreateTime = serviceSubtaskMapper.selectServiceSubtaskListByCreateTime(ssvo);
-// if (CollectionUtils.isEmpty(serviceSubtaskListByCreateTime))
-// serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
-// }
-// }
-// } else if (descByCode.equals("鐭俊")) {
-// RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample();
-// String taskId = rsaPublicKeyExample.encryptedData(ivrTask1.getTaskid().toString(), pub_key);
-// for (ServiceSubtask serviceSubtask : selectServiceSubtaskList) {
-// log.info("鐭俊闀挎湡浠诲姟鍙戦��---------杩涙潵浜嗗悧锛焮}", serviceSubtask);
-// boolean dateToday = isDateToday(serviceSubtask.getLongSendTime());
-// if (dateToday) {
-// try {
-// //鍏堝垽鏂偅鑰呮槸涓嶆槸杩樿鍙戦��
-// PatArchive patArchive = patArchiveService.selectPatArchiveByPatid(serviceSubtask.getPatid());
-// if (!Objects.isNull(patArchive) && patArchive.getNotrequiredFlag() == "1") {
-// //涓嶉渶瑕佸彂閫�
-// serviceSubtask.setResult("error");
-// serviceSubtask.setRemark(patArchive.getNotrequiredreason());
-// serviceSubtask.setSendstate(4L);
-//// serviceSubtask.setFinishtime(new Date());
-// iServiceSubtaskService.insertServiceSubtask(serviceSubtask);
-// continue;
-// }
-// String patid = rsaPublicKeyExample.encryptedData(serviceSubtask.getPatid().toString(), pub_key);
-// String subId = rsaPublicKeyExample.encryptedData(serviceSubtask.getId().toString(), pub_key);
-// SendMagParam sendMagParam = new SendMagParam();
-// sendMagParam.setType("4");
-// ServiceOutPath serviceOutPath = new ServiceOutPath();
-// serviceOutPath.setParam1(taskId);
-// serviceOutPath.setParam2(patid);
-// serviceOutPath.setParam3(ivrTask1.getTaskName());
-// serviceOutPath.setParam6(subId);
-// serviceOutPath.setCreateTime(new Date());
-// iServiceOutPathService.insertServiceOutPath(serviceOutPath);
-// String format = String.format("%03X", serviceOutPath.getId());
-// serviceOutPath.setRadix(format);
-// serviceOutPath.setUpdateTime(new Date());
-// iServiceOutPathService.updateServiceOutPath(serviceOutPath);
-// sendMagParam.setPhone(serviceSubtask.getPhone());
-// sendMagParam.setUrl(ip + ":" + req_path + "/wt?p=" + format);
-// sendMagParam.setContent("銆愭柊鍗庡尰闄€�戞偍濂斤紝閭�璇锋偍濉啓鍑洪櫌璋冩煡琛紝璇风偣鍑�" + sendMagParam.getUrl() + "濉啓銆傛劅璋㈡偍閰嶅悎锛�");
-// String isSuccess = null;
-// if (visitHosp == 1) {
-// Map<String, String> req = new HashMap<>();
-// req.put("phone", sendMagParam.getPhone());
-// req.put("content", sendMagParam.getContent());
-// isSuccess = HttpUtil.postJsonRequest(xhsmsPath, new Gson().toJson(req));
-// } else if (visitHosp == 2) {
-// //涓芥按鐨勭煭淇″彂閫佹柟寮�
-// Map<String, String> map = MsgLSEnum.getAddressByCode(serviceSubtask.getOrgid());
-// String token = LSHospTokenUtil.getToken(serviceSubtask.getOrgid());
-// if (ObjectUtils.isNotEmpty(map) && StringUtils.isEmpty(map.get("address"))) {
-// ServiceSubtask ss = new ServiceSubtask();
-// ss.setResult("error");
-// ss.setRemark("鐭俊鍙戦�佸け璐�,璇ユ満鏋勬病鏈夐厤缃煭淇″湴鍧�");
-// ss.setSendstate(5L);
-// ss.setId(serviceSubtask.getId());
-//// ss.setFinishtime(new Date());
-// serviceSubtaskMapper.updateServiceSubtask(ss);
-// continue;
-// }
-// log.info("---------涓芥按鐭俊鍙戦�佸叆鍙俛ddress锛歿}, sendMagParam:{}, orgid:{}-------", map.get("address"), sendMagParam, serviceSubtask.getOrgid());
-// String dxCode = getDXCode(map.get("address"), sendMagParam.getPhone(), sendMagParam.getContent(), map.get("sendPersonId"), map.get("sendPersonName"), MsgLSEnum.getHeaderByCode(serviceSubtask.getOrgid()), token);
-// log.info("---------涓芥按鐭俊鍙戦�佺粨鏋滐細{}-------", dxCode);
-// ObjectMapper objectMapper = new ObjectMapper();
-// Map<String, Object> textParam = objectMapper.readValue(dxCode, Map.class);
-// String code = textParam.get("Code").toString();
-// if (code.equals("0")) {
-// isSuccess = "true";
-// }
-// }
-// //浠诲姟鍙戦�佽褰�
-// ServiceSubtaskRecord serviceSubtaskRecord = new ServiceSubtaskRecord();
-// serviceSubtaskRecord.setTaskid(serviceSubtask.getTaskid().toString());
-// serviceSubtaskRecord.setUuid(UUID.randomUUID().toString());
-// serviceSubtaskRecord.setTasktype(serviceSubtask.getType());
-// serviceSubtaskRecord.setPreachform("4");
-// serviceSubtaskRecord.setStartTime(System.currentTimeMillis());
-// serviceSubtaskRecord.setResult("success");
-// if (StringUtils.isNotEmpty(isSuccess) && !isSuccess.equals("true"))
-// serviceSubtaskRecord.setResult("error");
-// serviceSubtaskRecordService.insertServiceSubtaskRecord(serviceSubtaskRecord);
-//
-// //鍙戦�佸畬鎴愬悗锛屼慨鏀圭姸鎬�
-// serviceSubtask.setSendstate(3L);
-// if (StringUtils.isNotEmpty(isSuccess) && !isSuccess.equals("true")) {
-// serviceSubtask.setResult("success");
-// serviceSubtask.setRemark("鐭俊鍙戦�佹垚鍔�");
-// } else {
-// serviceSubtask.setResult("error");
-// serviceSubtask.setSendstate(5L);
-// serviceSubtask.setRemark("鐭俊鍙戦�佸け璐�");
-// }
-// iServiceSubtaskService.updateServiceSubtask(serviceSubtask);
-// } catch (Exception e) {
-// String guid = UUID.randomUUID().toString();
-// log.error("闀挎湡浠诲姟锛岀煭淇″彂閫佸け璐ュ師鍥狅細{},{}", e.getMessage(), guid);
-// serviceSubtask.setResult("error");
-// serviceSubtask.setRemark("绯荤粺閿欒");
-// serviceSubtask.setSendstate(5L);
-//// serviceSubtask.setFinishtime(new Date());
-// serviceSubtask.setGuid(guid);
-// iServiceSubtaskService.updateServiceSubtask(serviceSubtask);
-// }
-// }
-// }
-// } else if (descByCode.equals("鍏紬鍙�")) {
-// log.info("鍏紬鍙疯繘鏉ヤ簡鍚楋紵{}", descByCode);
-// //鍏紬鍙�
-// RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample();
-// String taskId = rsaPublicKeyExample.encryptedData(ivrTask1.getTaskid().toString(), pub_key);
-// for (ServiceSubtask serviceSubtask : selectServiceSubtaskList) {
-// // log.error("serviceSubtask---------杩涙潵浜嗗悧锛焮}", serviceSubtask);
-// boolean dateToday = isDateToday(serviceSubtask.getLongSendTime());
-// if (dateToday) {
-// try {
-// //鍏堝垽鏂偅鑰呮槸涓嶆槸杩樿鍙戦��
-// PatArchive patArchive = patArchiveService.selectPatArchiveByPatid(serviceSubtask.getPatid());
-// if (!Objects.isNull(patArchive) && patArchive.getNotrequiredFlag() == "1") {
-// //涓嶉渶瑕佸彂閫�
-// serviceSubtask.setResult("error");
-// serviceSubtask.setRemark(patArchive.getNotrequiredreason());
-// serviceSubtask.setSendstate(4L);
-//// serviceSubtask.setFinishtime(new Date());
-// iServiceSubtaskService.insertServiceSubtask(serviceSubtask);
-// continue;
-// }
-// String patid = rsaPublicKeyExample.encryptedData(serviceSubtask.getPatid().toString(), pub_key);
-// String url = null;
-// url = ip + ":" + req_path + "/outsideChainwt?param1=" + taskId + "¶m2=" + patid + "¶m3=" + URLEncoder.encode(ivrTask1.getTaskName(), StandardCharsets.UTF_8.toString()) + "¶m5=false";
-//// String wxCode = getWXCode(serviceSubtask.getSfzh(), url, serviceSubtask.getTaskName(), serviceSubtask.getTaskDesc(), "鏃�");
-//
-// //鑾峰彇寰俊鍏紬鍙疯姹備俊鎭牴鎹満鏋処D
-// List<String> wxqqxx = WxGZHEnum.getDescByCode(patArchive.getOrgid());
-// if (CollectionUtils.isEmpty(wxqqxx) || wxqqxx.size() < 4) {
-// ServiceSubtask ss = new ServiceSubtask();
-// ss.setResult("error");
-// ss.setRemark("璇ユ満鏋勭殑鍏紬鍙烽厤缃俊鎭笉鍏紝鏃犳硶閫氳繃鍏紬鍙峰彂閫�");
-// ss.setSendstate(5L);
-// ss.setId(serviceSubtask.getId());
-//// ss.setFinishtime(new Date());
-// serviceSubtaskMapper.updateServiceSubtask(ss);
-// continue;
-// }
-//
-// if (StringUtils.isEmpty(patArchive.getPatidHis())) {
-// ServiceSubtask ss = new ServiceSubtask();
-// ss.setResult("error");
-// ss.setRemark("鍏紬鍙峰彂閫佸け璐�,his绯荤粺鐨勬偅鑰卛d涓虹┖");
-// ss.setSendstate(5L);
-// ss.setId(serviceSubtask.getId());
-//// ss.setFinishtime(new Date());
-// serviceSubtaskMapper.updateServiceSubtask(ss);
-// continue;
-// }
-// String wxCode = getWXCode(serviceSubtask.getSfzh(), url, serviceSubtask.getTaskName(), serviceSubtask.getTaskDesc(), patArchive.getTelcode(), serviceSubtask.getSendname(), patArchive.getPatidHis(), wxqqxx);
-//
-// Map<String, Object> map = JSONObject.parseObject(wxCode, Map.class);
-// //浠诲姟鍙戦�佽褰�
-// ServiceSubtaskRecord serviceSubtaskRecord = new ServiceSubtaskRecord();
-// serviceSubtaskRecord.setTaskid(serviceSubtask.getTaskid().toString());
-// serviceSubtaskRecord.setUuid(UUID.randomUUID().toString());
-// serviceSubtaskRecord.setTasktype(serviceSubtask.getType());
-// serviceSubtaskRecord.setPreachform("4");
-// serviceSubtaskRecord.setStartTime(System.currentTimeMillis());
-// serviceSubtaskRecord.setResult("success");
-// if (!map.isEmpty() && (Boolean) map.get("succ") == false)
-// serviceSubtaskRecord.setResult("error");
-// serviceSubtaskRecordService.insertServiceSubtaskRecord(serviceSubtaskRecord);
-//
-// //鍙戦�佸畬鎴愬悗锛屼慨鏀圭姸鎬�
-// serviceSubtask.setSendstate(3L);
-// if ((Boolean) map.get("succ") == true) {
-// serviceSubtask.setResult("success");
-// } else {
-// serviceSubtask.setResult("error");
-// serviceSubtask.setSendstate(5L);
-// serviceSubtask.setRemark(map.get("msg").toString());
-// }
-// iServiceSubtaskService.updateServiceSubtask(serviceSubtask);
-// } catch (Exception e) {
-// String guid = UUID.randomUUID().toString();
-// log.error("闀挎湡浠诲姟锛屽叕浼楀彿鍙戦�佸け璐ュ師鍥狅細{},{}", e.getMessage(), guid);
-// serviceSubtask.setResult("error");
-// serviceSubtask.setRemark("绯荤粺閿欒");
-// serviceSubtask.setSendstate(5L);
-//// serviceSubtask.setFinishtime(new Date());
-// serviceSubtask.setGuid(guid);
-// iServiceSubtaskService.updateServiceSubtask(serviceSubtask);
-// }
-// }
-// }
-// }
-// //閫氱煡 MQ 娑堟伅宸茶鎺ユ敹,鍙互ACK(浠庨槦鍒椾腑鍒犻櫎)浜� 锛堣繖涓渶瑕佹牴鎹笟鍔″啀鍘诲鐞咥CK锛�
-// }
-// }
-// }
-//
-//
-// /**
-// * 鑾峰嚭闄㈡偅鑰呬俊鎭�
-// * cry 鍑哄叆闄細 0 鍏ラ櫌 1 鍑洪櫌
-// */
-// @Transactional
-// public void getInHospInfo(String cry, LocalDateTime startTime, LocalDateTime endTime) {
-// // 瀹氫箟鏃ユ湡鏃堕棿鏍煎紡
-// DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.S");
-// Map<String, String> req = new HashMap<>();
-// if (cry.equals("1")) {
-// req.put("cashStartDate", startTime.format(formatter));
-// req.put("cashEndDate", endTime.format(formatter));
-// req.put("currStatus", "4");
-// } else if (cry.equals("0")) {
-// req.put("admissStartDate", startTime.format(formatter));
-// req.put("admissEndDate", endTime.format(formatter));
-// req.put("currStatus", "2");
-// }
-// Map<String, String> header = new HashMap<>();
-// header.put("x-hcsb-serviceno", "IS002347");
-// header.put("x-hcsb-version", "2.0");
-// header.put("x-hcsb-sourcesyscode", "14");
-// header.put("x-hcsb-token", "ArGE2JnHtxG/Zx5nrnGY4eOfMUJGGJokAJHigG1BrCY=");
-// header.put("x-hcsb-msgdate", startTime.format(formatter));
-// String result = HttpUtils.sendPostByHeader(hospInfoUrl, new Gson().toJson(req), header);
-// //鏁版嵁瑙f瀽
-// Gson gson = new Gson();
-// JsonObject jsonObject = gson.fromJson(result, JsonObject.class);
-// JsonArray resultArray = jsonObject.getAsJsonObject("data").getAsJsonArray("result");
-// Type resultType = new TypeToken<List<ThiedInhospInfo>>() {
-// }.getType();
-// List<ThiedInhospInfo> thiedInhospInfoList = gson.fromJson(resultArray, resultType);
-//
-// // 鍒涘缓涓�涓柊鏂囦欢
-// String filename = null;
-// if (cry.equals("0")) filename = "鍏ラ櫌淇℃伅" + System.currentTimeMillis();
-// if (cry.equals("1")) filename = "鍑洪櫌淇℃伅" + System.currentTimeMillis();
-// File file = new File("D:\\public\\HIS鏁版嵁閲囬泦\\" + filename);
-// if (!file.exists()) {
-// // 濡傛灉鏂囦欢涓嶅瓨鍦紝鍒欏垱寤烘柊鏂囦欢
-// try {
-// if (file.createNewFile()) {
-// System.out.println("鎴愬姛鍒涘缓浜嗘柊鏂囦欢!");
-// } else {
-// System.out.println("澶辫触锛佹枃浠舵棤娉曞垱寤猴紒");
-// }
-// } catch (IOException e) {
-// e.printStackTrace();
-// }
-// }
-// // 灏嗘暟鎹啓鍏ュ埌鏂囦欢涓�
-// try {
-// FileWriter writer = new FileWriter(file);
-// writer.write(result);
-// } catch (IOException e) {
-// e.printStackTrace();
-// }
-//
-// if (CollectionUtils.isNotEmpty(thiedInhospInfoList)) {
-// for (ThiedInhospInfo thiedInhospInfo : thiedInhospInfoList) {
-// //閫氳繃韬唤璇佸彿鏌ヨ璇ユ偅鑰呭湪鎮h�呰〃鏄惁瀛樺湪
-// PatArchive patArchive = new PatArchive();
-// List<PatArchive> patArchives = null;
-// patArchive.setIdcardno(thiedInhospInfo.getPatiIdCardNo().trim());
-// if (StringUtils.isNotEmpty(thiedInhospInfo.getPatiIdCardNo().trim())) {
-// patArchives = patArchiveService.selectPatArchiveList(patArchive);
-// } else {
-// //鎮h�呬俊鎭负绌猴紝鐩存帴 涓嬩竴涓�
-// continue;
-// }
-//
-// patArchive.setPatientno(thiedInhospInfo.getPatiMediaNo());
-// patArchive.setSourcefrom(2);
-// patArchive.setPattype("2");
-// if (StringUtils.isNotEmpty(thiedInhospInfo.getOutWayId()) && thiedInhospInfo.getOutWayId().equals("4")) {
-// //濡傛灉涓�4灏辨槸姝讳骸
-// patArchive.setNotrequiredFlag("1");
-// patArchive.setNotrequiredreason(thiedInhospInfo.getOutWayName());
-// }
-// if (cry.equals("1") && StringUtils.isEmpty(thiedInhospInfo.getOutWayId())) {
-// //濡傛灉涓�4灏辨槸姝讳骸
-// patArchive.setNotrequiredFlag("1");
-// patArchive.setNotrequiredreason("鍑洪櫌鏂瑰紡涓虹┖");
-// }
-// patArchive.setSex(thiedInhospInfo.getPatiRecordGender().equals("鐢�") ? 1L : 2L);
-// patArchive.setNation(thiedInhospInfo.getPatiNation());
-// patArchive.setNativePlace(thiedInhospInfo.getPatiNationality());
-// patArchive.setPlaceOfResidence(StringUtils.isNotEmpty(thiedInhospInfo.getPatiHomeAddr()) ? thiedInhospInfo.getPatiHomeAddr().replace("null", "") : "");
-// try {
-// if (StringUtils.isNotEmpty(thiedInhospInfo.getPatiBirthday()))
-// patArchive.setBirthdate(new SimpleDateFormat("yyyy-MM-dd").parse(thiedInhospInfo.getPatiBirthday()));
-// } catch (ParseException e) {
-// e.printStackTrace();
-// }
-// if (thiedInhospInfo.getTreateAge() != null) {
-// patArchive.setAge(Long.valueOf(thiedInhospInfo.getTreateAge()));
-// } else {
-// patArchive.setAge(null);
-// }
-// patArchive.setAgeUnit(thiedInhospInfo.getTreatAgeunit());
-// patArchive.setTelcode(thiedInhospInfo.getCompanyTelNum());
-// patArchive.setRelativetelcode(thiedInhospInfo.getContactPersonPhone());
-// patArchive.setDelFlag("0");
-// patArchive.setCreateTime(new Date());
-// patArchive.setUpdateTime(new Date());
-// patArchive.setName(thiedInhospInfo.getPatiRecordName());
-// if (CollectionUtils.isEmpty(patArchives) || patArchives.size() == 0) {
-// patArchiveService.insertPatArchive(patArchive);
-// } else {
-// patArchive.setId(patArchives.get(0).getId());
-// patArchiveService.updateArchive(patArchive);
-// }
-//
-// log.error("鍏ュ弬鐨刾atArchive锛歿}", patArchive);
-// PatMedInhosp patMedInhosp = new PatMedInhosp();
-// patMedInhosp.setPatid(patArchive.getId());
-// patMedInhosp.setPatno(patArchive.getPatientno());
-// patMedInhosp.setPatname(patArchive.getName());
-// patMedInhosp.setNurseId(thiedInhospInfo.getNurseId());
-// patMedInhosp.setNurseName(thiedInhospInfo.getNurseName());
-// patMedInhosp.setSerialnum(thiedInhospInfo.getInpatientId());
-// patMedInhosp.setFuflag("1");
-// if (cry.equals("0")) {
-// patMedInhosp.setInhospstate("0");
-// } else if (cry.equals("1")) {
-// patMedInhosp.setInhospstate("1");
-// }
-// patMedInhosp.setHospitalcode(thiedInhospInfo.getAreaId());
-// patMedInhosp.setIcd10code(thiedInhospInfo.getDiagIcd10());
-// patMedInhosp.setDiagname(thiedInhospInfo.getDiagName());
-// try {
-// if (StringUtils.isNotEmpty(thiedInhospInfo.getAdmissDate()))
-// patMedInhosp.setStarttime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(thiedInhospInfo.getAdmissDate()));
-// } catch (ParseException e) {
-// e.printStackTrace();
-// }
-// try {
-// if (StringUtils.isNotEmpty(thiedInhospInfo.getOutDate()))
-// patMedInhosp.setEndtime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(thiedInhospInfo.getOutDate()));
-// } catch (ParseException e) {
-// e.printStackTrace();
-// }
-// patMedInhosp.setDeptcode(thiedInhospInfo.getAdmissDeptId());
-// patMedInhosp.setDeptid(thiedInhospInfo.getAdmissDeptId());
-// patMedInhosp.setDeptname(thiedInhospInfo.getAdmissDeptName());
-// patMedInhosp.setBedNo(thiedInhospInfo.getAdmissBedNo());
-// patMedInhosp.setDelFlag("0");
-//// patMedInhosp.setLeaveldeptcode(thiedInhospInfo.getCurrDeptCode());
-// patMedInhosp.setLeaveldeptcode(thiedInhospInfo.getCurrDeptId());
-// patMedInhosp.setLeaveldeptname(thiedInhospInfo.getCurrDeptName());
-// patMedInhosp.setLeavediagname(thiedInhospInfo.getDiagName());
-// patMedInhosp.setLeaveicd10code(thiedInhospInfo.getDiagIcd10());
-// patMedInhosp.setDrname(thiedInhospInfo.getDoctName());
-// patMedInhosp.setDrcode(thiedInhospInfo.getDoctId());
-// patMedInhosp.setOutWayId(thiedInhospInfo.getOutWayId());
-// patMedInhosp.setOutWayName(thiedInhospInfo.getOutWayName());
-// if (cry.equals("0")) {
-// patMedInhosp.setSchemestatus(1L);
-// } else if (cry.equals("1")) {
-// patMedInhosp.setSchemestatus(2L);
-// }
-// patMedInhosp.setLeavehospitaldistrictid(thiedInhospInfo.getCurrWardCode());
-// patMedInhosp.setLeavehospitaldistrictcode(thiedInhospInfo.getCurrWardId());
-// patMedInhosp.setLeavehospitaldistrictname(thiedInhospInfo.getCurrWardName());
-// patMedInhosp.setLeaveldeptid(thiedInhospInfo.getCurrDeptCode());
-// patMedInhosp.setOrgid("1");
-// //濡傛灉鏄嚭闄紝鍏堥�氳繃鎮h�呯紪鍙峰拰娴佹按鍙峰幓鏌ヤ竴涓嬶紝鎮h�呮槸鍚﹀瓨鍦紝濡傛灉瀛樺湪锛屽垯杩涜淇敼
-// PatMedInhosp inhosp = new PatMedInhosp();
-// inhosp.setPatno(patArchive.getPatientno());
-// inhosp.setSerialnum(patMedInhosp.getSerialnum());
-// List<PatMedInhosp> patMedInhosps = patMedInhospService.selectPatMedInhospList(inhosp);
-// log.error("鏄惁闇�瑕佹洿鏂帮細{}", patMedInhosps.size());
-// if (CollectionUtils.isNotEmpty(patMedInhosps)) {
-// patMedInhosp.setInhospid(patMedInhosps.get(0).getInhospid());
-// log.error("------鎮h�呭嚭鍏ラ櫌淇敼淇℃伅锛歿}", patMedInhosp);
-// patMedInhospService.updatePatMedInhosp(patMedInhosp);
-// } else {
-// log.error("----鎮h�呭嚭鍏ラ櫌鏂板淇℃伅锛歿}", patMedInhosp);
-// patMedInhospService.insertPatMedInhosp(patMedInhosp);
-// }
-//
-// }
-// }
-// }
-//
-//
-// private String getKey() {
-// Map<String, String> map = new HashMap<>();
-// for (int i = 0; i < 6; i++) {
-// Boolean aBoolean = redisCache.hasKey("cache-" + i);
-// if (!aBoolean) {
-// redisCache.setCacheObject("cache-" + i, "");
-// map.put("cache-" + i, "");
-// } else {
-// map.put("cache-" + i, redisCache.getCacheObject("cache-" + i));
-// }
-// }
-//
-// String key = null;
-// String value = "";
-// for (Map.Entry<String, String> entry : map.entrySet()) {
-// if (StringUtils.isEmpty(value)) {
-// value = entry.getValue();
-// key = entry.getKey();
-// } else {
-// if (entry.getValue().split(",").length < value.split(",").length) {
-// value = entry.getValue();
-// key = entry.getKey();
-// }
-// }
-// }
-// return key;
-// }
-//
-// private String getDXCode(String address, String ShouJiHM, String FaSongNR, String FaSongRID, String FaSongRXM, Map<String, Object> headerMap, String token) {
-// Map<String, Object> map = new LinkedHashMap<>();
-//
-// Map<String, Object> YeWuXX = new LinkedHashMap<>();
-// Map<String, Object> DuanXinXX = new LinkedHashMap<>();
-// DuanXinXX.put("ShouJiHM", ShouJiHM);
-// DuanXinXX.put("FaSongNR", FaSongNR);
-// DuanXinXX.put("FaSongRID", FaSongRID);
-// DuanXinXX.put("FaSongRXM", FaSongRXM);
-// YeWuXX.put("DuanXinXX", DuanXinXX);
-//
-// map.put("XiaoXiTou", headerMap);
-// map.put("YeWuXX", YeWuXX);
-//
-// String body = new Gson().toJson(map);
-//
-//// String result = HttpUtils.sendPost(address, body);
-// String result = null;
-// try {
-// result = OkHttpExample.sendPostRequest(address, body, token);
-// } catch (IOException e) {
-// e.printStackTrace();
-// }
-// log.error("--------result鐨勫�间负锛歿}-----", result);
-//
-// JSONObject jsonObject = JSONObject.parseObject(result);
-// String code = (String) jsonObject.toString();
-// return code;
-// }
-//
-//
-// private String getWXCode(String idcard, String url, String taskName, String taskDesc, String phone, String setPatientname, String setPatientid, List<String> wxqqxx) {
-// XinHuaWXReq xinHuaWXReq = new XinHuaWXReq();
-// xinHuaWXReq.setIdcard(idcard);
-// xinHuaWXReq.setUrl(url);
-// xinHuaWXReq.setPatientid(setPatientid);
-// xinHuaWXReq.setPatientname(setPatientname);
-// xinHuaWXReq.setMobile(phone);
-// xinHuaWXReq.setMedcardno(null);
-// xinHuaWXReq.setTitlename(taskName);
-// xinHuaWXReq.setContent(taskDesc);
-// xinHuaWXReq.setAppid(wxqqxx.get(1));
-// log.error("----getWXCode---xinHuaWXReq鐨勫嚭鍙備负锛歿}", xinHuaWXReq);
-// String body = new Gson().toJson(xinHuaWXReq);
-// String encode = encode(wxqqxx.get(2).concat(body));
-// Map<String, String> headerMap = new HashMap<>();
-// headerMap.put("sign", encode);
-// String result = HttpUtils.sendPostByHeader(wxqqxx.get(3), body, headerMap);
-//
-// JSONObject jsonObject = JSONObject.parseObject(result);
-// String code = (String) jsonObject.toString();
-// return code;
-// }
-//
-//
-// public String encode(String arg) {
-// if (arg == null) {
-// arg = "";
-// }
-// MessageDigest md5 = null;
-// try {
-// md5 = MessageDigest.getInstance("MD5");
-// md5.update(arg.getBytes("UTF-8"));
-// } catch (Exception e) {
-// e.printStackTrace();
-// }
-// return toHex(md5.digest());
-// }
-//}
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 7e34d50..7b0d8f1 100644
--- a/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
@@ -51,8 +51,9 @@
@Autowired
private ServiceSubtaskPreachformMapper serviceSubtaskPreachformMapper;
- @Value("${visitHosp}")
- private Integer visitHosp;
+ @Value("${spring.profiles.active}")
+ private String active;
+
/**
* 鏌ヨ鎮h�呬綇闄㈣褰�
@@ -260,8 +261,7 @@
}
//鏍规嵁鎮h�呮墍鍦ㄧ梾鍖猴紝鑾峰彇璇ョ梾鍖虹殑闀挎湡浠诲姟,鏂板崕鍖婚櫌鍙互鍏堜笉鐢ㄦ牴鎹梾鍖哄拰鐤剧梾鏉ュ仛
- if (visitHosp != 1) {
-
+ if (active.equals("xh")) {
PatMedInhosp pmbq = new PatMedInhosp();
//鑾峰彇闇�瑕佸嚭闄㈤儴闂ㄩ殢璁匡紝鏈鐞嗙殑鏁版嵁
pmbq.setWardcheckFlag("0");
--
Gitblit v1.9.3