From 1ecb6109954d22e9be03518d64cdcfd89b599091 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 02 六月 2026 18:20:11 +0800
Subject: [PATCH] 1.处理修改service_task时，子任务删除，未将出院数据还原的问题； 2.新增省立同德满意度接口 3.处理患者基本信息并发新增的问题
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java | 50 ++++++++++++++++++++++++++++++++------------------
1 files changed, 32 insertions(+), 18 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
index ec56533..956cdad 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
@@ -19,6 +19,7 @@
import com.ruoyi.system.mapper.SysUserDeptMapper;
import com.smartor.service.IServiceSLTDHealthcareRecordService;
import lombok.extern.slf4j.Slf4j;
+import me.chanjar.weixin.mp.bean.template.WxMpTemplateData;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.beans.factory.annotation.Value;
@@ -28,6 +29,7 @@
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -60,11 +62,11 @@
@Qualifier("sysUserDeptSystemMapper")
private SysUserDeptMapper sysUserDeptMapper;
- @Value("${wx_appid}")
- private String wxAppid;
-
- @Value("${wx_appSecret}")
- private String wxAppSecret;
+// @Value("${wx_appid}")
+// private String wxAppid;
+//
+// @Value("${wx_appSecret}")
+// private String wxAppSecret;
/**
* 鐧诲綍鏂规硶
@@ -82,18 +84,28 @@
}
- /**
- * 鐧诲綍鏂规硶
- *
- * @param map 鐧诲綍淇℃伅
- * @return 缁撴灉
- */
- @PostMapping("/test")
- public void test(@RequestBody Map<String, Object> map) {
- WxMpUtils wxMpUtils = new WxMpUtils(wxAppid, wxAppSecret);
- boolean b = wxMpUtils.sendTextMessage("bA_nlW7yM6CCfQMUX5HpBg", "浣犲ソ");
- System.out.println("b鐨勫�间负锛�" + b);
- }
+// /**
+// * 鐧诲綍鏂规硶
+// *
+// * @param map 鐧诲綍淇℃伅
+// * @return 缁撴灉
+// */
+// @PostMapping("/test")
+// public void test(@RequestBody Map<String, Object> map) {
+// WxMpUtils wxMpUtils = new WxMpUtils(wxAppid, wxAppSecret);
+//
+// Map<String, WxMpTemplateData> dataMap = new HashMap();
+//
+// dataMap.put("thing2", new WxMpTemplateData("thing2", "搴峰鎶ュ憡閫氱煡", "#FFB6C1"));
+// dataMap.put("thing4", new WxMpTemplateData("thing4", "xx甯倄x鍘縳x璺痻x鍙�", "#173177"));
+// dataMap.put("time7", new WxMpTemplateData("time7", "2023-05-15 00:00:00", "#B95EA6"));
+// dataMap.put("thing8", new WxMpTemplateData("thing8", "寮犱笁", "#87cefa"));
+//
+//
+// String s = wxMpUtils.sendTemplateMessage("oK3-Z59miSE_ebKdXP4IZuXilEvE", "TDF0WB3hndi1gtQybzcHCXeZWm_Q7HjtjVLNG4MOX8Q", "", dataMap);
+//
+// System.out.println("s鐨勫�间负锛�" + s);
+// }
/**
* 鍗曠偣鐧诲綍鏂规硶(闇�瑕侀厤缃甀P鐧藉悕鍗�)
@@ -136,7 +148,8 @@
private RedirectView buildRedirect(String url) {
RedirectView redirectView = new RedirectView();
redirectView.setUrl(url);
- redirectView.setStatusCode(HttpStatus.MOVED_PERMANENTLY);
+ redirectView.setStatusCode(HttpStatus.FOUND); // 302 涓存椂閲嶅畾鍚�,閬垮厤娴忚鍣ㄧ紦瀛�
+ redirectView.setExposeModelAttributes(false); // 閬垮厤妯″瀷灞炴�ф毚闇�
return redirectView;
}
@@ -175,6 +188,7 @@
sysUserDept.setUserId(user.getUserId());
sysUserDept.setDeptType("1");
sysUserDept.setOrgid(user.getOrgid());
+ sysUserDept.setCampusid(user.getCampusid());
sysUserDeptKSs = sysUserDeptMapper.selectSysUserDeptList(sysUserDept);
ajax.put("belongDepts", sysUserDeptKSs);
sysUserDept.setDeptType("2");
--
Gitblit v1.9.3