From 198ee38684b844473cd38dbb27ac984a2e932480 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 16 四月 2025 17:53:20 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/domain/PatMedOuthosp.java | 12 ++++++
smartor/src/main/java/com/smartor/domain/PatMedOperation.java | 11 +++++
ruoyi-admin/src/main/resources/application-druid.yml | 16 ++++----
smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java | 2 -
smartor/src/main/resources/mapper/smartor/PatMedOperationMapper.xml | 10 ++++-
smartor/src/main/resources/mapper/smartor/PatMedOuthospMapper.xml | 8 +++
ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/HospitalFilterInterceptor.java | 2
7 files changed, 47 insertions(+), 14 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index e30aa14..e65bd6c 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -13,10 +13,10 @@
# 鍏徃
# url: jdbc:mysql://192.168.2.9:3308/smartor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
# 涓芥按
- url: jdbc:mysql://127.0.0.1:3308/smartor-lisui?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: smartor
- password: Smartor.2023
- driverClassName: com.mysql.cj.jdbc.Driver
+# url: jdbc:mysql://127.0.0.1:3308/smartor-lisui?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+# username: smartor
+# password: Smartor.2023
+# driverClassName: com.mysql.cj.jdbc.Driver
# # 鏂板崕
# url: jdbc:mysql://192.168.191.181:3308/smartor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
# username: smartor
@@ -24,10 +24,10 @@
# driverClassName: com.mysql.cj.jdbc.Driver
# 鍏徃浜�
-# url: jdbc:mysql://116.62.18.175:6002/smartor_lisui?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-# username: hxsoft
-# password: Hxerp2000
-# driverClassName: com.mysql.cj.jdbc.Driver
+ url: jdbc:mysql://116.62.18.175:6002/smartor_lisui?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ username: hxsoft
+ password: Hxerp2000
+ driverClassName: com.mysql.cj.jdbc.Driver
# 浠庡簱鏁版嵁婧�
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/HospitalFilterInterceptor.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/HospitalFilterInterceptor.java
index ef73cfd..0120572 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/HospitalFilterInterceptor.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/HospitalFilterInterceptor.java
@@ -97,7 +97,7 @@
}
// 淇敼 SQL
- if (originalSql.toUpperCase().contains("ORGID =")) {
+ if (originalSql.toUpperCase().contains("ORGID =") || originalSql.toUpperCase().contains("ORGID=")) {
return originalSql;
} else if (originalSql.toUpperCase().contains("WHERE")) {
// 鍦ㄥ凡鏈� WHERE 鍚庢坊鍔� orgid 鏉′欢
diff --git a/smartor/src/main/java/com/smartor/domain/PatMedOperation.java b/smartor/src/main/java/com/smartor/domain/PatMedOperation.java
index 36ef2ff..e4c6111 100644
--- a/smartor/src/main/java/com/smartor/domain/PatMedOperation.java
+++ b/smartor/src/main/java/com/smartor/domain/PatMedOperation.java
@@ -487,5 +487,16 @@
@Excel(name = "鎵嬫湳绾у埆鍚嶇О")
private String opleveldesc;
+
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = " ", width = 30, dateFormat = "yyyy-MM-dd")
+ @ApiModelProperty(value = "寮�濮嬫墜鏈椂闂�")
+ private Date beginTime;
+
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = " ", width = 30, dateFormat = "yyyy-MM-dd")
+ @ApiModelProperty(value = "缁撴潫鎵嬫湳鏃堕棿")
+ private Date endTime;
+
}
diff --git a/smartor/src/main/java/com/smartor/domain/PatMedOuthosp.java b/smartor/src/main/java/com/smartor/domain/PatMedOuthosp.java
index 84cd003..3779efc 100644
--- a/smartor/src/main/java/com/smartor/domain/PatMedOuthosp.java
+++ b/smartor/src/main/java/com/smartor/domain/PatMedOuthosp.java
@@ -197,4 +197,16 @@
@ApiModelProperty(value = "鎵嬫満鍙�")
private String telcode;
+
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = " ", width = 30, dateFormat = "yyyy-MM-dd")
+ @ApiModelProperty(value = "寮�濮嬪氨璇婃椂闂�")
+ private Date beginTime;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = " ", width = 30, dateFormat = "yyyy-MM-dd")
+ @ApiModelProperty(value = "缁撴潫灏辫瘖鏃堕棿")
+ private Date endTime;
+
}
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 b7f2ec5..d308c42 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
@@ -257,8 +257,6 @@
public Boolean addInDeptInfo(Map dataMap) {
log.error("ServiceExternalServiceImpl---addInDeptInfo鐨勬柊澧炵殑鍊间负锛歿}", dataMap);
Map yeWuXX = (Map) dataMap.get("YeWuXX");
-
-// List<HashMap<String, Object>> hospPatientDiagnoseInfos = ObjectUtils.isNotEmpty(yeWuXX) ? (List<HashMap<String, Object>>) yeWuXX.get("ZhenDuanList") : null;
Map<String, Object> BingRenXX = ObjectUtils.isNotEmpty(yeWuXX) ? (Map<String, Object>) yeWuXX.get("BingRenXX") : null;
Map<String, Object> RuKeXX = ObjectUtils.isNotEmpty(yeWuXX) ? (Map<String, Object>) yeWuXX.get("RuKeXX") : null;
diff --git a/smartor/src/main/resources/mapper/smartor/PatMedOperationMapper.xml b/smartor/src/main/resources/mapper/smartor/PatMedOperationMapper.xml
index e673eac..aba4680 100644
--- a/smartor/src/main/resources/mapper/smartor/PatMedOperationMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatMedOperationMapper.xml
@@ -182,8 +182,14 @@
<if test="optypename != null and optypename != ''">
and optypename like concat('%', #{optypename}, '%')
</if>
- <if test="operatortime != null ">
- and operatortime = #{operatortime}
+ <!-- <if test="operatortime != null ">-->
+ <!-- and operatortime = #{operatortime}-->
+ <!-- </if>-->
+ <if test="beginTime != null ">and date_format(operatortime,'%y%m%d') >=
+ date_format(#{beginTime},'%y%m%d')
+ </if>
+ <if test="endTime != null ">and date_format(operatortime,'%y%m%d') <=
+ date_format(#{endTime},'%y%m%d')
</if>
<if test="opreqtime != null ">
and opreqtime = #{opreqtime}
diff --git a/smartor/src/main/resources/mapper/smartor/PatMedOuthospMapper.xml b/smartor/src/main/resources/mapper/smartor/PatMedOuthospMapper.xml
index 87a12f9..136a36e 100644
--- a/smartor/src/main/resources/mapper/smartor/PatMedOuthospMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatMedOuthospMapper.xml
@@ -114,7 +114,13 @@
<if test="deptname != null and deptname != ''">and pmo.deptname like concat('%', #{deptname}, '%')</if>
<if test="drname != null and drname != ''">and pmo.drname like concat('%', #{drname}, '%')</if>
<if test="patname != null and patname != ''">and pmo.patname like concat('%', #{patname}, '%')</if>
- <if test="admitdate != null ">and pmo.admitdate = #{admitdate}</if>
+
+ <if test="beginTime != null ">and date_format(pmo.admitdate,'%Y%m%d%H%i%s') >=
+ date_format(#{beginTime},'%Y%m%d%H%i%s')
+ </if>
+ <if test="endTime != null ">and date_format(pmo.admitdate,'%Y%m%d%H%i%s') <=
+ date_format(#{endTime},'%Y%m%d%H%i%s')
+ </if>
<if test="patid != null ">and pmo.patid = #{patid}</if>
<if test="patno != null ">and pmo.patno = #{patno}</if>
<if test="orgid != null and orgid != ''">and pmo.orgid = #{orgid}</if>
--
Gitblit v1.9.3