diff --git a/ruisi_java/pom.xml b/ruisi_java/pom.xml
index 34de2ee..e9d62bf 100644
--- a/ruisi_java/pom.xml
+++ b/ruisi_java/pom.xml
@@ -230,7 +230,19 @@
HikariCP
${hikaricp.version}
+
+
+ com.oracle.database.jdbc
+ ojdbc8
+ 21.9.0.0
+
+
+
+ org.apache.commons
+ commons-lang3
+ 3.12.0
+
diff --git a/ruisi_java/ruisi-cc-framework/src/main/java/com/ccsens/framework/config/DruidConfig.java b/ruisi_java/ruisi-cc-framework/src/main/java/com/ccsens/framework/config/DruidConfig.java
index dd49640..7c7ab3b 100644
--- a/ruisi_java/ruisi-cc-framework/src/main/java/com/ccsens/framework/config/DruidConfig.java
+++ b/ruisi_java/ruisi-cc-framework/src/main/java/com/ccsens/framework/config/DruidConfig.java
@@ -58,7 +58,7 @@ public class DruidConfig {
public DynamicDataSource dataSource(DataSource masterDataSource) {
Map targetDataSources = new HashMap<>();
targetDataSources.put(DataSourceType.MASTER.name(), masterDataSource);
-// setDataSource(targetDataSources, DataSourceType.SLAVE.name(), "slaveDataSource");
+ setDataSource(targetDataSources, DataSourceType.SLAVE.name(), "slaveDataSource");
return new DynamicDataSource(masterDataSource, targetDataSources);
}
diff --git a/ruisi_java/ruisi-cc-framework/src/main/java/com/ccsens/framework/config/LoadingDataSource.java b/ruisi_java/ruisi-cc-framework/src/main/java/com/ccsens/framework/config/LoadingDataSource.java
index 7cf5a87..fe98f5a 100644
--- a/ruisi_java/ruisi-cc-framework/src/main/java/com/ccsens/framework/config/LoadingDataSource.java
+++ b/ruisi_java/ruisi-cc-framework/src/main/java/com/ccsens/framework/config/LoadingDataSource.java
@@ -2,6 +2,7 @@ package com.ccsens.framework.config;
import cn.hutool.core.collection.CollectionUtil;
import com.ccsens.common.utils.ExceptionUtil;
+import com.ccsens.common.utils.StringUtils;
import com.ccsens.framework.datasource.DataSourceManager;
import com.ccsens.framework.datasource.DynamicDataSource;
import com.ccsens.system.domain.po.UmsDataSource;
@@ -10,6 +11,7 @@ import com.ccsens.system.persist.mapper.UmsDataSourceMapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource;
import org.springframework.scheduling.annotation.Scheduled;
@@ -51,5 +53,9 @@ public class LoadingDataSource implements InitializingBean {
log.error("加载数据源失败:", ExceptionUtil.getExceptionMessage(e));
}
}
+
+ // 3. 打印当前所有数据源
+ log.info("当前数据源池中的key: {}", DataSourceManager.DATA_SOURCE_POOL_JDBC.keySet());
}
+
}
\ No newline at end of file
diff --git a/ruisi_java/ruisi-cc-framework/src/main/java/com/ccsens/framework/datasource/DataSourceManager.java b/ruisi_java/ruisi-cc-framework/src/main/java/com/ccsens/framework/datasource/DataSourceManager.java
index d5a201a..1e80c29 100644
--- a/ruisi_java/ruisi-cc-framework/src/main/java/com/ccsens/framework/datasource/DataSourceManager.java
+++ b/ruisi_java/ruisi-cc-framework/src/main/java/com/ccsens/framework/datasource/DataSourceManager.java
@@ -1,5 +1,6 @@
package com.ccsens.framework.datasource;
+import com.ccsens.common.utils.StringUtils;
import com.ccsens.system.domain.po.UmsDataSource;
import com.zaxxer.hikari.HikariDataSource;
import org.springframework.stereotype.Component;
diff --git a/ruisi_java/ruisi-cc-framework/src/main/java/com/ccsens/framework/datasource/DynamicDataSource.java b/ruisi_java/ruisi-cc-framework/src/main/java/com/ccsens/framework/datasource/DynamicDataSource.java
index c2987ae..8e189ee 100644
--- a/ruisi_java/ruisi-cc-framework/src/main/java/com/ccsens/framework/datasource/DynamicDataSource.java
+++ b/ruisi_java/ruisi-cc-framework/src/main/java/com/ccsens/framework/datasource/DynamicDataSource.java
@@ -5,6 +5,7 @@ import java.sql.SQLException;
import java.util.Map;
import javax.sql.DataSource;
+import cn.hutool.core.collection.CollUtil;
import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource;
/**
@@ -38,13 +39,19 @@ public class DynamicDataSource extends AbstractRoutingDataSource {
if (dataSourceKey == null) {
return super.getResolvedDefaultDataSource();
}
- DataSource dataSource = DataSourceManager.DATA_SOURCE_POOL_JDBC.get(dataSourceKey);
+
+ DataSource dataSource;
+ Map resolvedDataSources = super.getResolvedDataSources();
+ if (CollUtil.isNotEmpty(resolvedDataSources) && resolvedDataSources.containsKey(dataSourceKey)) {
+ dataSource = resolvedDataSources.get(dataSourceKey);
+ }else {
+ dataSource = DataSourceManager.DATA_SOURCE_POOL_JDBC.get(dataSourceKey);
+ }
if (dataSource == null) {
throw new RuntimeException("数据源不存在！");
}
-
return dataSource;
}
diff --git a/ruisi_java/ruisi-cc-generator/src/main/resources/mbg.xml b/ruisi_java/ruisi-cc-generator/src/main/resources/mbg.xml
index f73c053..e5547e9 100644
--- a/ruisi_java/ruisi-cc-generator/src/main/resources/mbg.xml
+++ b/ruisi_java/ruisi-cc-generator/src/main/resources/mbg.xml
@@ -81,7 +81,7 @@
-
+
@@ -114,7 +114,7 @@
-
+
@@ -122,7 +122,7 @@
-
+
diff --git a/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/dto/PmsPatientDto.java b/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/dto/PmsPatientDto.java
index b3bc3c6..278376f 100644
--- a/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/dto/PmsPatientDto.java
+++ b/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/dto/PmsPatientDto.java
@@ -69,7 +69,7 @@ public class PmsPatientDto {
private String patientNumber;
@ApiModelProperty("病人住院号")
private String hospitalNumber;
- @NotNull(message="请填写身份证号")
+// @NotNull(message="请填写身份证号")
@ApiModelProperty("病人身份证号")
private String idcard;
@NotNull(message = "请选择性别")
@@ -101,7 +101,7 @@ public class PmsPatientDto {
// @NotNull(message="请填写联系人")
// @ApiModelProperty("联系人")
// private String contact;
- @NotNull(message = "请填写联系电话")
+// @NotNull(message = "请填写联系电话")
@ApiModelProperty("手机")
private String mobile;
@ApiModelProperty("电话")
diff --git a/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/dto/RmsDto.java b/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/dto/RmsDto.java
index 51b7110..a903baa 100644
--- a/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/dto/RmsDto.java
+++ b/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/dto/RmsDto.java
@@ -252,4 +252,14 @@ public class RmsDto {
@ApiModelProperty("结束时间")
private String endTime;
}
+
+ @ApiModel("导出历史报告单-DTO")
+ @Data
+ public static class ReportPDF{
+ @ApiModelProperty("患者的就诊流水号")
+ private String patientNo;
+ @ApiModelProperty("医护人员工号")
+ private String emplCode;
+ }
+
}
diff --git a/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/po/EmsEvaluation.java b/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/po/EmsEvaluation.java
index d34f26e..711b3ed 100644
--- a/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/po/EmsEvaluation.java
+++ b/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/po/EmsEvaluation.java
@@ -44,6 +44,8 @@ public class EmsEvaluation implements Serializable {
private String version;
+ private String visitNo;
+
private static final long serialVersionUID = 1L;
public Long getId() {
@@ -206,6 +208,14 @@ public class EmsEvaluation implements Serializable {
this.version = version == null ? null : version.trim();
}
+ public String getVisitNo() {
+ return visitNo;
+ }
+
+ public void setVisitNo(String visitNo) {
+ this.visitNo = visitNo == null ? null : visitNo.trim();
+ }
+
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
@@ -232,6 +242,7 @@ public class EmsEvaluation implements Serializable {
sb.append(", delFlag=").append(delFlag);
sb.append(", status=").append(status);
sb.append(", version=").append(version);
+ sb.append(", visitNo=").append(visitNo);
sb.append("]");
return sb.toString();
}
diff --git a/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/po/EmsEvaluationExample.java b/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/po/EmsEvaluationExample.java
index 8ac7da7..dd90e61 100644
--- a/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/po/EmsEvaluationExample.java
+++ b/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/po/EmsEvaluationExample.java
@@ -1384,6 +1384,76 @@ public class EmsEvaluationExample {
addCriterion("version not between", value1, value2, "version");
return (Criteria) this;
}
+
+ public Criteria andVisitNoIsNull() {
+ addCriterion("visit_no is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andVisitNoIsNotNull() {
+ addCriterion("visit_no is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andVisitNoEqualTo(String value) {
+ addCriterion("visit_no =", value, "visitNo");
+ return (Criteria) this;
+ }
+
+ public Criteria andVisitNoNotEqualTo(String value) {
+ addCriterion("visit_no <>", value, "visitNo");
+ return (Criteria) this;
+ }
+
+ public Criteria andVisitNoGreaterThan(String value) {
+ addCriterion("visit_no >", value, "visitNo");
+ return (Criteria) this;
+ }
+
+ public Criteria andVisitNoGreaterThanOrEqualTo(String value) {
+ addCriterion("visit_no >=", value, "visitNo");
+ return (Criteria) this;
+ }
+
+ public Criteria andVisitNoLessThan(String value) {
+ addCriterion("visit_no <", value, "visitNo");
+ return (Criteria) this;
+ }
+
+ public Criteria andVisitNoLessThanOrEqualTo(String value) {
+ addCriterion("visit_no <=", value, "visitNo");
+ return (Criteria) this;
+ }
+
+ public Criteria andVisitNoLike(String value) {
+ addCriterion("visit_no like", value, "visitNo");
+ return (Criteria) this;
+ }
+
+ public Criteria andVisitNoNotLike(String value) {
+ addCriterion("visit_no not like", value, "visitNo");
+ return (Criteria) this;
+ }
+
+ public Criteria andVisitNoIn(List values) {
+ addCriterion("visit_no in", values, "visitNo");
+ return (Criteria) this;
+ }
+
+ public Criteria andVisitNoNotIn(List values) {
+ addCriterion("visit_no not in", values, "visitNo");
+ return (Criteria) this;
+ }
+
+ public Criteria andVisitNoBetween(String value1, String value2) {
+ addCriterion("visit_no between", value1, value2, "visitNo");
+ return (Criteria) this;
+ }
+
+ public Criteria andVisitNoNotBetween(String value1, String value2) {
+ addCriterion("visit_no not between", value1, value2, "visitNo");
+ return (Criteria) this;
+ }
}
public static class Criteria extends GeneratedCriteria {
diff --git a/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/po/RmsReport.java b/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/po/RmsReport.java
index 20c4f09..94d9818 100644
--- a/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/po/RmsReport.java
+++ b/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/po/RmsReport.java
@@ -50,6 +50,8 @@ public class RmsReport implements Serializable {
private Byte delFlag;
+ private String visitNo;
+
private static final long serialVersionUID = 1L;
public Long getId() {
@@ -236,6 +238,14 @@ public class RmsReport implements Serializable {
this.delFlag = delFlag;
}
+ public String getVisitNo() {
+ return visitNo;
+ }
+
+ public void setVisitNo(String visitNo) {
+ this.visitNo = visitNo == null ? null : visitNo.trim();
+ }
+
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
@@ -265,6 +275,7 @@ public class RmsReport implements Serializable {
sb.append(", updateBy=").append(updateBy);
sb.append(", updateTime=").append(updateTime);
sb.append(", delFlag=").append(delFlag);
+ sb.append(", visitNo=").append(visitNo);
sb.append("]");
return sb.toString();
}
diff --git a/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/po/RmsReportExample.java b/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/po/RmsReportExample.java
index 4068288..ba89234 100644
--- a/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/po/RmsReportExample.java
+++ b/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/po/RmsReportExample.java
@@ -1614,6 +1614,76 @@ public class RmsReportExample {
addCriterion("del_flag not between", value1, value2, "delFlag");
return (Criteria) this;
}
+
+ public Criteria andVisitNoIsNull() {
+ addCriterion("visit_no is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andVisitNoIsNotNull() {
+ addCriterion("visit_no is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andVisitNoEqualTo(String value) {
+ addCriterion("visit_no =", value, "visitNo");
+ return (Criteria) this;
+ }
+
+ public Criteria andVisitNoNotEqualTo(String value) {
+ addCriterion("visit_no <>", value, "visitNo");
+ return (Criteria) this;
+ }
+
+ public Criteria andVisitNoGreaterThan(String value) {
+ addCriterion("visit_no >", value, "visitNo");
+ return (Criteria) this;
+ }
+
+ public Criteria andVisitNoGreaterThanOrEqualTo(String value) {
+ addCriterion("visit_no >=", value, "visitNo");
+ return (Criteria) this;
+ }
+
+ public Criteria andVisitNoLessThan(String value) {
+ addCriterion("visit_no <", value, "visitNo");
+ return (Criteria) this;
+ }
+
+ public Criteria andVisitNoLessThanOrEqualTo(String value) {
+ addCriterion("visit_no <=", value, "visitNo");
+ return (Criteria) this;
+ }
+
+ public Criteria andVisitNoLike(String value) {
+ addCriterion("visit_no like", value, "visitNo");
+ return (Criteria) this;
+ }
+
+ public Criteria andVisitNoNotLike(String value) {
+ addCriterion("visit_no not like", value, "visitNo");
+ return (Criteria) this;
+ }
+
+ public Criteria andVisitNoIn(List values) {
+ addCriterion("visit_no in", values, "visitNo");
+ return (Criteria) this;
+ }
+
+ public Criteria andVisitNoNotIn(List values) {
+ addCriterion("visit_no not in", values, "visitNo");
+ return (Criteria) this;
+ }
+
+ public Criteria andVisitNoBetween(String value1, String value2) {
+ addCriterion("visit_no between", value1, value2, "visitNo");
+ return (Criteria) this;
+ }
+
+ public Criteria andVisitNoNotBetween(String value1, String value2) {
+ addCriterion("visit_no not between", value1, value2, "visitNo");
+ return (Criteria) this;
+ }
}
public static class Criteria extends GeneratedCriteria {
diff --git a/ruisi_java/ruisi-system/src/main/resources/mapper/system/EmsEvaluationMapper.xml b/ruisi_java/ruisi-system/src/main/resources/mapper/system/EmsEvaluationMapper.xml
index 1597163..427b223 100644
--- a/ruisi_java/ruisi-system/src/main/resources/mapper/system/EmsEvaluationMapper.xml
+++ b/ruisi_java/ruisi-system/src/main/resources/mapper/system/EmsEvaluationMapper.xml
@@ -22,6 +22,7 @@
+
@@ -84,7 +85,7 @@
id, doctor_name, patient_id, patient_idcard, patient_age, tester_id, serial_number,
check_time, remark, hospital, complete_status, recording, duration, create_by, create_time,
- update_by, update_time, del_flag, status, version
+ update_by, update_time, del_flag, status, version, visit_no