From 25a0ba7b2706db3c5ee546da3e0e7c909777b890 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 29 七月 2026 15:37:32 +0800
Subject: [PATCH] 1，患者过滤状态修改（之前只支持发送之前的过滤，现在支持发送之后的过滤，如果任务发送后，外链不能再打开） 2.在出入院表新增入院申请单字段 3.采集入院数据时，同时要采集importanceFlagCode emergencyLevelCode 4.外链的发送，也要查询子任务状态，如果是不执行，也不能再发送
---
ruoyi-common/src/main/java/com/ruoyi/common/enums/MsgLSEnum.java | 65 +++++++++++---------------------
1 files changed, 23 insertions(+), 42 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/MsgLSEnum.java b/ruoyi-common/src/main/java/com/ruoyi/common/enums/MsgLSEnum.java
index 602d6d5..66aca93 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/MsgLSEnum.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/enums/MsgLSEnum.java
@@ -13,10 +13,10 @@
* XiaoXiLX FZ_PT_DuanXinFS
* XiaoXiMC 鐭俊鍙戦��
*/
-public enum MsgLSEnum {
- ZYY("47231022633110211A2101", "https://9.0.124.104:13011/mediinfo-grus-fuwuzxwg/api/esb/lyraAsyncRun", "1400360867068907520", "涓芥按甯備腑鍖婚櫌", "2361", "閮戠弽鎱�"),
- JN("47255004333112711A1001", null, "1400361376454545408", "鏅畞鐣叉棌鑷不鍘夸汉姘戝尰闄�", "", "");
-
+public class MsgLSEnum {
+ // ZYY("47231022633110211A2101", "https://9.0.124.104:13011/mediinfo-grus-fuwuzxwg/api/esb/lyraAsyncRun", "1400360867068907520", "涓芥按甯備腑鍖婚櫌", "2361", "閮戠弽鎱�"),
+// JN("47255004333112711A1001", "", "1400361376454545408", "鏅畞鐣叉棌鑷不鍘夸汉姘戝尰闄�", "0073", "鍛ㄧ編濯�");
+//
private String orgid;
private String address;
private String ZuHuID;
@@ -33,46 +33,27 @@
this.sendPersonName = sendPersonName;
}
- public static Map<String, Object> getHeaderByCode(String orgid) {
+ public static Map<String, Object> getHeaderByCode(Map<String, String> srmInfo) {
Map<String, Object> map = new LinkedHashMap<>();
- MsgLSEnum[] organEnums = values();
- for (int i = 0; i < organEnums.length; i++) {
- MsgLSEnum organEnum = organEnums[i];
- //鑾峰彇鏃堕棿
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- String formattedDate = sdf.format(new Date());
- if (organEnum.getOrgid().equals(orgid)) {
- map.put("XiaoXiID", IdUtils.simpleUUID());
- map.put("FaSongSJ", formattedDate);
- map.put("ZuHuID", organEnum.getZuHuID());
- map.put("ZuHuMC", organEnum.getZuHuMC());
- map.put("FaSongJGID", organEnum.getOrgid());
- map.put("FaSongJGMC", organEnum.getZuHuMC());
- //map.put("FaSongXTJC", "闅忚绯荤粺");
- map.put("FaSongXTJC", "SUIFANGXT");
- map.put("FaSongXTMC", "闅忚绯荤粺");
- //map.put("FaSongFCSJC", "浜ュ皵鏃�");
- map.put("FaSongFCSJC", "ZJHES");
- map.put("XiaoXiLX", "FZ_PT_DuanXinFS");
- map.put("XiaoXiMC", "鐭俊鍙戦��");
- }
- }
- return map;
- }
- public static Map<String, String> getAddressByCode(String orgid) {
- MsgLSEnum[] organEnums = values();
- Map<String, String> map = new HashMap<>();
- for (int i = 0; i < organEnums.length; i++) {
- MsgLSEnum organEnum = organEnums[i];
- if (organEnum.getOrgid().equals(orgid)) {
- map.put("address", organEnum.getAddress());
- map.put("sendPersonId", organEnum.getSendPersonId());
- map.put("sendPersonName", organEnum.getSendPersonName());
- return map;
- }
- }
- return null;
+ //鑾峰彇鏃堕棿
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ String formattedDate = sdf.format(new Date());
+ map.put("XiaoXiID", IdUtils.simpleUUID());
+ map.put("FaSongSJ", formattedDate);
+ map.put("ZuHuID", srmInfo.get("ZuHuID"));
+ map.put("ZuHuMC", srmInfo.get("ZuHuMC"));
+ map.put("FaSongJGID", srmInfo.get("orgid"));
+ map.put("FaSongJGMC", srmInfo.get("ZuHuMC"));
+ //map.put("FaSongXTJC", "闅忚绯荤粺");
+ map.put("FaSongXTJC", "SUIFANGXT");
+ map.put("FaSongXTMC", "闅忚绯荤粺");
+ //map.put("FaSongFCSJC", "浜ュ皵鏃�");
+ map.put("FaSongFCSJC", "ZJHES");
+ map.put("XiaoXiLX", "FZ_PT_DuanXinFS");
+ map.put("XiaoXiMC", "鐭俊鍙戦��");
+
+ return map;
}
public String getOrgid() {
--
Gitblit v1.9.3