From 0a10b51863b939e646661394ae7e03acb0cb0039 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 14 四月 2025 19:08:47 +0800
Subject: [PATCH] 代码提交
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUserDept.java | 1 +
smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml | 12 ++++++------
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 2 ++
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java | 11 +++++++++--
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceExternalController.java | 4 ++--
smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java | 7 +++++--
ruoyi-admin/src/main/resources/logback.xml | 4 ++--
ruoyi-common/src/main/java/com/ruoyi/common/enums/TaskTypeEnum.java | 2 +-
ruoyi-common/src/main/java/com/ruoyi/common/enums/ServiceTaskTypeEnum.java | 2 +-
ruoyi-admin/src/main/resources/application.yml | 2 +-
10 files changed, 30 insertions(+), 17 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceExternalController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceExternalController.java
index 5509b78..b315345 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceExternalController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceExternalController.java
@@ -57,9 +57,9 @@
}
/**
- * 鏂板浠诲姟
+ * 鏂板浣撴浠诲姟杩涘瓙浠诲姟
*/
- @ApiOperation("鏂板浠诲姟")
+ @ApiOperation("鏂板浣撴浠诲姟杩涘瓙浠诲姟")
@PostMapping("/generalInterfaceAddTask")
public AjaxResult generalInterfaceAddTask(@RequestBody ServiceTaskInfo serviceTaskInfo) {
log.error("------serviceTaskInfo鐨勫�间负锛歿}", serviceTaskInfo);
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index cacd166..1d111a2 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -18,7 +18,7 @@
# 寮�鍙戠幆澧冮厤缃�
server:
# 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 8096
+ port: 8095
servlet:
# 搴旂敤鐨勮闂矾寰�
context-path: /
diff --git a/ruoyi-admin/src/main/resources/logback.xml b/ruoyi-admin/src/main/resources/logback.xml
index c913c5d..1c6d63f 100644
--- a/ruoyi-admin/src/main/resources/logback.xml
+++ b/ruoyi-admin/src/main/resources/logback.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<!-- 鏃ュ織瀛樻斁璺緞 8095-->
- <!-- <property name="log.path" value="D:/health/logs"/>-->
+ <property name="log.path" value="D:/health/logs"/>
<!-- 鏃ュ織瀛樻斁璺緞 8096-->
- <property name="log.path" value="D:/lihu/logs"/>
+ <!-- <property name="log.path" value="D:/lihu/logs"/>-->
<!-- 涓芥按鏃ュ織瀛樻斁璺緞 -->
<!-- <property name="log.path" value="/home/software/smartor-logs" />-->
<!-- 鏃ュ織杈撳嚭鏍煎紡 -->
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUserDept.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUserDept.java
index 7f81d80..ea0120d 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUserDept.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUserDept.java
@@ -37,6 +37,7 @@
@ApiModelProperty("閮ㄩ棬绫诲瀷")
@Excel(name = "閮ㄩ棬绫诲瀷 1:绉戝 2:鐥呭尯")
private String deptType;
+
private String guid;
/**
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/ServiceTaskTypeEnum.java b/ruoyi-common/src/main/java/com/ruoyi/common/enums/ServiceTaskTypeEnum.java
index 7648a86..66c4cee 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/ServiceTaskTypeEnum.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/enums/ServiceTaskTypeEnum.java
@@ -4,7 +4,7 @@
* 鍙戦�佺被鍨嬫灇涓�
*/
public enum ServiceTaskTypeEnum {
- 浣撴闅忚("9", "浣撴闅忚 "), 鍖绘妧闅忚("10", "鍖绘妧闅忚");
+ 浣撴闅忚("9", "浣撴闅忚"), 鍖绘妧闅忚("10", "鍖绘妧闅忚");
private String code;
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/TaskTypeEnum.java b/ruoyi-common/src/main/java/com/ruoyi/common/enums/TaskTypeEnum.java
index 28f1cd7..4b54b76 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/TaskTypeEnum.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/enums/TaskTypeEnum.java
@@ -4,7 +4,7 @@
* 鍙戦�佺被鍨嬫灇涓�
*/
public enum TaskTypeEnum {
- 浣撴闅忚("8", "浣撴闅忚"), 蹇冪數涓撶闅忚("9", "銆佸績鐢典笓绉戦殢璁�"), 褰卞儚涓撶闅忚("10", "褰卞儚涓撶闅忚");
+ 浣撴闅忚("8", "浣撴闅忚"), 蹇冪數涓撶闅忚("9", "蹇冪數涓撶闅忚"), 褰卞儚涓撶闅忚("10", "褰卞儚涓撶闅忚");
private String code;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index 9143807..e05d76a 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -468,6 +468,7 @@
sysUserDept.setUserId(user.getUserId());
sysUserDept.setOrgid(user.getOrgid());
sysUserDept.setDeptCode(deptCode);
+ sysUserDept.setDeptId(sysDept.getDeptId());
List<SysUserDept> sysUserDepts = sysUserDeptMapper.selectSysUserDeptList(sysUserDept);
sysUserDept.setDelFlag(0L);
sysUserDept.setDeptType("1");
@@ -489,6 +490,7 @@
SysUserDept sysUserDept = new SysUserDept();
sysUserDept.setUserId(user.getUserId());
sysUserDept.setDeptCode(wardCode);
+ sysUserDept.setDeptId(sysDept.getDeptId());
List<SysUserDept> sysUserDepts = sysUserDeptMapper.selectSysUserDeptList(sysUserDept);
sysUserDept.setDelFlag(0L);
sysUserDept.setDeptType("2");
diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
index d2345fb..e9ec5ab 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
@@ -526,6 +526,7 @@
Map yeWuXX = (Map) dataMap.get("YeWuXX");
Map XiaoXiTou = (Map) dataMap.get("XiaoXiTou");
String FaSongJGID = ObjectUtils.isNotEmpty(XiaoXiTou.get("FaSongJGID")) ? XiaoXiTou.get("FaSongJGID").toString() : null;
+ String FaSongJGMC = ObjectUtils.isNotEmpty(XiaoXiTou.get("FaSongJGMC")) ? XiaoXiTou.get("FaSongJGMC").toString() : null;
Map<String, Object> BingRenXX = ObjectUtils.isNotEmpty(yeWuXX) ? (Map<String, Object>) yeWuXX.get("BingRenXX") : null;
Map<String, Object> JiuZhenXX = ObjectUtils.isNotEmpty(yeWuXX) ? (Map<String, Object>) yeWuXX.get("JiuZhenXX") : null;
@@ -546,6 +547,7 @@
info.setZhenDuanMC((String) map.get("ZhenDuanMC"));
info.setZhenDuanLBDM((String) map.get("ZhenDuanLBDM"));
info.setZhenDuanLBMC((String) map.get("ZhenDuanLBMC"));
+ info.setIcd10((String) map.get("Icd10"));
return info;
}).collect(Collectors.toList());
}
@@ -560,7 +562,7 @@
PatMedOuthosp patMedOuthosp = new PatMedOuthosp();
patMedOuthosp.setOuthospno(externalInHospPatientInfo.getBingAnHao());
- patMedOuthosp.setSerialnum(ObjectUtils.isNotEmpty(yeWuXX.get("JiuZhenYWID")) ? yeWuXX.get("JiuZhenYWID").toString() : null);
+ patMedOuthosp.setSerialnum(externalInHospPatientInfo.getJiuZhenYWID());
List<PatMedOuthosp> patMedOuthosps = patMedOuthospMapper.selectPatMedOuthospList(patMedOuthosp);
patMedOuthosp.setPatid(patArchive.getId());
@@ -572,6 +574,7 @@
patMedOuthosp.setDeptcode(externalJZInfo.getJiuZhenKSID());
patMedOuthosp.setAdmitdate(externalJZInfo.getJiuZhenRQ());
patMedOuthosp.setOrgid(FaSongJGID);
+ patMedOuthosp.setHospitalname(FaSongJGMC);
for (ExternalDiagnosisInfo externalDiagnosisInfo : externalDiagnosisInfoList) {
if (externalDiagnosisInfo.getZhenDuanLBMC().equals("涓昏瘖鏂�")) {
@@ -751,7 +754,7 @@
patMedOperation.setPatno(externalInHospPatientInfo.getBingRenID());
patMedOperation.setPatname(externalInHospPatientInfo.getXingMing());
patMedOperation.setOrgid(externalInHospPatientInfo.getZuZhiJGID());
- patMedOperation.setSerialnum(externalInHospPatientInfo.getZhuYuanHao());
+ patMedOperation.setSerialnum(externalInHospPatientInfo.getJiuZhenYWID());
patMedOperation.setInhospno(externalInHospPatientInfo.getBingAnHao());
patMedOperation.setHospitalname(externalInHospPatientInfo.getZuZhiJGMC());
patMedOperation.setHospitalcode(externalInHospPatientInfo.getZuZhiJGID());
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 c2f3ecb..ab37179 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -375,13 +375,20 @@
if (serviceTask.getSendState() == null) {
serviceTask.setSendState(1L);
serviceTaskVO.setSendState(1L);
+ }else {
+ serviceTask.setSendState(serviceTaskVO.getSendState());
}
if (StringUtils.isNotEmpty(serviceTaskVO.getLibtemplateid())) {
serviceTask.setLibtemplateid(serviceTaskVO.getLibtemplateid());
serviceTask.setLibtemplatename(serviceTaskVO.getLibtemplatename());
}
- serviceTask.setTemplateid(tempid);
- serviceTask.setTemplatename(tempName);
+ if (serviceTaskVO.getTemplateid() != null) {
+ serviceTask.setTemplateid(serviceTaskVO.getTemplateid());
+ serviceTask.setTemplatename(serviceTaskVO.getTemplatename());
+ } else {
+ serviceTask.setTemplateid(tempid);
+ serviceTask.setTemplatename(tempName);
+ }
serviceTask.setLeaveldeptcodes(serviceTaskVO.getLeaveldeptcodes());
serviceTask.setLeavehospitaldistrictcode(serviceTask.getLeavehospitaldistrictcode());
serviceTask.setSendState(2L);
diff --git a/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml b/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
index 6d19dff..d742b33 100644
--- a/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
@@ -545,7 +545,7 @@
FROM
pat_med_inhosp d
JOIN pat_archive a ON a.id = d.patid
- LEFT JOIN ( SELECT patid, GROUP_CONCAT( tagname ) AS tagname FROM pat_archivetag GROUP BY patid ) t ON t.patid =
+ LEFT JOIN ( SELECT patid, GROUP_CONCAT( tagname ) AS tagname FROM pat_archivetag where del_flag=0 GROUP BY patid ) t ON t.patid =
d.patid
<where>
d.del_flag != 1
@@ -669,7 +669,7 @@
t.tagname,
a.pattype
from pat_med_outhosp d JOIN pat_archive a ON a.id = d.patid
- LEFT JOIN ( SELECT patid, GROUP_CONCAT( tagname ) AS tagname FROM pat_archivetag GROUP BY patid ) t ON t.patid =
+ LEFT JOIN ( SELECT patid, GROUP_CONCAT( tagname ) AS tagname FROM pat_archivetag where del_flag=0 GROUP BY patid ) t ON t.patid =
d.patid
<where>
d.del_flag != 1
@@ -756,7 +756,7 @@
t.tagname,
a.pattype
from pat_med_physical d JOIN pat_archive a ON a.id = d.patid
- LEFT JOIN ( SELECT patid, GROUP_CONCAT( tagname ) AS tagname FROM pat_archivetag GROUP BY patid ) t ON t.patid =
+ LEFT JOIN ( SELECT patid, GROUP_CONCAT( tagname ) AS tagname FROM pat_archivetag where del_flag=0 GROUP BY patid ) t ON t.patid =
d.patid
<where>
d.del_flag != 1
@@ -855,7 +855,7 @@
FROM
pat_med_inhosp d
JOIN pat_archive a ON a.id = d.patid
- LEFT JOIN ( SELECT patid, GROUP_CONCAT( tagname ) AS tagname FROM pat_archivetag GROUP BY patid ) t ON t.patid =
+ LEFT JOIN ( SELECT patid, GROUP_CONCAT( tagname ) AS tagname FROM pat_archivetag where del_flag=0 GROUP BY patid ) t ON t.patid =
d.patid
<where>
d.del_flag != 1
@@ -961,7 +961,7 @@
t.tagname,
a.pattype
from pat_med_outhosp d JOIN pat_archive a ON a.id = d.patid
- LEFT JOIN ( SELECT patid, GROUP_CONCAT( tagname ) AS tagname FROM pat_archivetag GROUP BY patid ) t ON t.patid =
+ LEFT JOIN ( SELECT patid, GROUP_CONCAT( tagname ) AS tagname FROM pat_archivetag where del_flag=0 GROUP BY patid ) t ON t.patid =
d.patid
<where>
d.del_flag != 1
@@ -1048,7 +1048,7 @@
t.tagname,
a.pattype
from pat_med_physical d JOIN pat_archive a ON a.id = d.patid
- LEFT JOIN ( SELECT patid, GROUP_CONCAT( tagname ) AS tagname FROM pat_archivetag GROUP BY patid ) t ON t.patid =
+ LEFT JOIN ( SELECT patid, GROUP_CONCAT( tagname ) AS tagname FROM pat_archivetag where del_flag=0 GROUP BY patid ) t ON t.patid =
d.patid
<where>
d.del_flag != 1
--
Gitblit v1.9.3