zhanjiang2.0
/
EMR_Medical_Record
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

完成需求：

Browse Source 
1.选出院科室之前，置空之前的选择，默认出院科室都不选中
2.出院浏览、科主任审核、病案室终审，医生护士初审人目前显示工号需改为名字
————2021.01.07 王泽钦
master
wzqgit 5 years ago
parent 5f53739baa
commit 261a20aabf
15 changed files with 511 additions and 11068 deletions
Show Stats Download Patch File Download Diff File

21
.idea/EMR_Medical_Record.iml
Unescape Escape View File

@ -15,7 +15,7 @@
<configuration />
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
@ -49,7 +49,26 @@
<orderEntry type="library" name="Maven: com.github.miemiedev:mybatis-paginator:1.2.15" level="project" />
<orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.0.0" level="project" />
<orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:0.9.5" level="project" />
<orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.32" level="project" />
<orderEntry type="library" name="Maven: com.alibaba:druid:1.0.9" level="project" />
<orderEntry type="module-library">
<library name="Maven: com.alibaba:jconsole:1.8.0">
<CLASSES>
<root url="jar://D:/java/jdk/lib/jconsole.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="Maven: com.alibaba:tools:1.8.0">
<CLASSES>
<root url="jar://D:/java/jdk/lib/tools.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="library" name="Maven: org.springframework:spring-context:5.0.2.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-aop:5.0.2.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-core:5.0.2.RELEASE" level="project" />

1
.idea/artifacts/EMR_Medical_Record_war_exploded.xml
Unescape Escape View File

@ -31,6 +31,7 @@
<element id="library" level="project" name="Maven: com.github.miemiedev:mybatis-paginator:1.2.15" />
<element id="library" level="project" name="Maven: com.github.pagehelper:pagehelper:5.0.0" />
<element id="library" level="project" name="Maven: com.github.jsqlparser:jsqlparser:0.9.5" />
<element id="library" level="project" name="Maven: mysql:mysql-connector-java:5.1.32" />
<element id="library" level="project" name="Maven: com.alibaba:druid:1.0.9" />
<element id="library" level="project" name="Maven: org.springframework:spring-context:5.0.2.RELEASE" />
<element id="library" level="project" name="Maven: org.springframework:spring-aop:5.0.2.RELEASE" />

2
.idea/misc.xml
Unescape Escape View File

@ -13,5 +13,5 @@
</list>
</option>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
</project>

11392
.idea/workspace.xml
View File

File diff suppressed because it is too large Load Diff

10
pom.xml
Unescape Escape View File

@ -144,11 +144,11 @@
</dependency>
<!-- MySql -->
<!--<dependency>-->
<!--<groupId>mysql</groupId>-->
<!--<artifactId>mysql-connector-java</artifactId>-->
<!--<version>${mysql.version}</version>-->
<!--</dependency>-->
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql.version}</version>
</dependency>
<!--sqlserver-->
<!--<dependency>-->
<!--<groupId>com.microsoft.sqlserver</groupId>-->

46
src/main/java/com/emr/DataSourceHolder.java
Unescape Escape View File

@ -0,0 +1,46 @@
package com.emr;
public class DataSourceHolder {
/**
* sqlserver库数据源
*/
public static final String SQLSERVER_DATA_SOURCE ="sqlServerDataSource";
/**
* mysql库数据源
*/
public static final String MYSQL_DATA_SOURCE ="mysqlDataSource";
//用ThreadLocal来设置当前线程使用哪个dataSource
private static final ThreadLocal<String> contextHolder = new ThreadLocal<String>();
//设置当前线程要使用的数据源
public static void setDataSourceType(String dataSourceType) {
contextHolder.set(dataSourceType);
}
/**
* 获取要当前线程的数据源
*/
public static String getDataSourceType() {
return contextHolder.get();
}
/**
*
* 清楚掉当前线程的数据源
*/
public static void clearDataSourceType() {
contextHolder.remove();
}
/**
* 切换数据源
*/
public static void changeCurrentDataSource(String dataSourceType) {
clearDataSourceType();
setDataSourceType(dataSourceType);
}
/**
* 切换回默认数据源
*/
public static void change2DefaulDataSource() {
clearDataSourceType();
}
}

10
src/main/java/com/emr/DynamicDataSource.java
Unescape Escape View File

@ -0,0 +1,10 @@
package com.emr;
import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource;
public class DynamicDataSource extends AbstractRoutingDataSource {
@Override
protected Object determineCurrentLookupKey() {
return DataSourceHolder.getDataSourceType();
}
}

3
src/main/java/com/emr/dao/Archive_MasterMapper.java
Unescape Escape View File

@ -41,5 +41,6 @@ public interface Archive_MasterMapper {
List<Archive_Master> getDoctorInCharge(Archive_Master record);
//power查询用户姓名
String getFName(String userName);
}

2
src/main/java/com/emr/service/Archive_MasterService.java
Unescape Escape View File

@ -164,6 +164,8 @@ public interface Archive_MasterService {
*/
OffsetLimitPage bbSel2(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit);
//power查询用户姓名
String getFullName(String userName);
}

5
src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java
Unescape Escape View File

@ -149,6 +149,11 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
List<Archive_Master> list = archiveMasterMapper.bbSel2(archiveMasterVo);
return new OffsetLimitPage((Page) list);
}
@Override
public String getFullName(String userName) {
return archiveMasterMapper.getFName(userName);
}
}

23
src/main/resources/config/applicationContext.xml
Unescape Escape View File

@ -34,7 +34,7 @@
<!--配置数据源-->
<bean id="dataSource" class="com.mchange.v2.c3p0.ComboPooledDataSource" destroy-method="close">
<bean id="sqlServerDataSource" class="com.mchange.v2.c3p0.ComboPooledDataSource" destroy-method="close">
<property name="driverClass" value="${jdbc.driver}"/> <!--数据库连接驱动-->
<property name="jdbcUrl" value="${jdbc.url}"/> <!--数据库地址-->
<property name="user" value="${jdbc.username}"/> <!--用户名-->
@ -44,6 +44,27 @@
<property name="initialPoolSize" value="10"/> <!-- 初始化连接池内的数据库连接-->
<property name="maxIdleTime" value="20"/> <!--最大空闲时间-->
</bean>
<!-- mysql库连接池 -->
<bean id="mysqlDataSource" class="com.alibaba.druid.pool.DruidDataSource"
init-method="init" destroy-method="close">
<!-- 基本属性 url、user、password driverClassName -->
<property name="driverClassName" value="${jdbc.mysql.driver}" />
<property name="url" value="${jdbc.mysql.url}" />
<property name="username" value="${jdbc.mysql.username}" />
<property name="password" value="${jdbc.mysql.password}" />
</bean>
<!-- 配置数据库切换类 -->
<bean id="dataSource" class="com.emr.DynamicDataSource">
<property name="targetDataSources">
<map>
<entry key="sqlServerDataSource" value-ref="sqlServerDataSource"/>
<entry key="mysqlDataSource" value-ref="mysqlDataSource"></entry>
</map>
</property>
<!-- 设置默认数据源 -->
<property name="defaultTargetDataSource" ref="sqlServerDataSource"/>
</bean>

14
src/main/resources/config/jdbc.properties
Unescape Escape View File

@ -1,11 +1,17 @@
jdbc.mysql.driver=com.mysql.jdbc.Driver
jdbc.mysql.url=jdbc\:mysql\://10.6.1.127\:3306/power?useUnicode\=true&characterEncoding\=utf-8
#jdbc.url=jdbc\:mysql\://120.27.212.36\:3306/emr_record?useUnicode\=true&characterEncoding\=utf-8
jdbc.mysql.username=root
jdbc.mysql.password=docus702
#jdbc.driver=com.mysql.jdbc.Driver
#jdbc.url=jdbc\:mysql\://localhost\:3306/emr_record?useUnicode\=true&characterEncoding\=utf-8
#jdbc.url=jdbc\:mysql\://120.27.212.36\:3306/emr_record?useUnicode\=true&characterEncoding\=utf-8
jdbc.driver=com.microsoft.sqlserver.jdbc.SQLServerDriver
jdbc.sqlserver.driver=com.microsoft.sqlserver.jdbc.SQLServerDriver
#jdbc.url=jdbc\:sqlserver\://120.27.212.36:1433;databaseName=emr_record_zc
jdbc.url=jdbc\:sqlserver\://10.6.1.127:1433;databaseName=DB_PrivilegeManagement_GYFY
jdbc.username=sa
jdbc.password=docus@702
jdbc.sqlserver.url=jdbc\:sqlserver\://10.6.1.127:1433;databaseName=DB_PrivilegeManagement_GYFY
jdbc.sqlserver.username=sa
jdbc.sqlserver.password=docus@702
#hibernate config
hibernate.dialect=org.hibernate.dialect.SQLServerDialect
hibernate.show_sql=true

3
src/main/resources/mapper/Archive_MasterMapper.xml
Unescape Escape View File

@ -936,4 +936,7 @@
first_instance=#{firstInstance,jdbcType=NVARCHAR}
where id = #{id,jdbcType=NVARCHAR}
</update>
<select id="getFName" parameterType="java.lang.String" resultType="java.lang.String">
SELECT `name` FROM `power_user` WHERE user_name = #{userName}
</select>
</mapper>

22
src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp
Unescape Escape View File

@ -2678,7 +2678,17 @@
{
title: '医生',
field: 'doctorName',
align: 'left'
align: 'left',
formatter: function (value, row, index) {
//调接口 参数：工号 返回：名字
var request = new XMLHttpRequest();
//var data = {"xxx":"xxx"};
request.open('GET', '${path}/getDoctorOrNursName?user_name=' + value, false);
request.send(null);
//request.send(data);
return request.responseText;
}
},
{
title: '医生提交日期',
@ -2711,7 +2721,15 @@
{
title: '护士',
field: 'nurseName',
align: 'left'
align: 'left',
formatter: function (value, row, index) {
//调接口 参数：工号 返回：名字
var request = new XMLHttpRequest();
request.open('GET', '${path}/getDoctorOrNursName?user_name=' + value, false);
request.send(null);
return request.responseText;
}
},
{
title: '护士提交日期',

21
src/main/webapp/WEB-INF/views/commitDir/commitList.jsp
Unescape Escape View File

@ -2171,7 +2171,15 @@
{
title: '医生',
field: 'doctorName',
align: 'left'
align: 'left',
formatter: function (value, row, index) {
//调接口 参数：工号 返回：名字
var request = new XMLHttpRequest();
request.open('GET', '${path}/getDoctorOrNursName?user_name=' + value, false);
request.send(null);
return request.responseText;
}
},
{
title: '医生提交日期',
@ -2204,7 +2212,15 @@
{
title: '护士',
field: 'nurseName',
align: 'left'
align: 'left',
formatter: function (value, row, index) {
//调接口 参数：工号 返回：名字
var request = new XMLHttpRequest();
request.open('GET', '${path}/getDoctorOrNursName?user_name=' + value, false);
request.send(null);
return request.responseText;
}
},
{
title: '护士提交日期',
@ -2924,6 +2940,7 @@
} else {
toastr.warning("正在查询，请稍等...");
}
$(".selectpicker").selectpicker( 'deselectAll' );
});

Write Preview
Loading…
Cancel
Save