emr_medicalrecord_record2.0
/
EMR_Medical_Record
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

1、超期提醒修改2、超期时间计算修改

Browse Source
master
ALW 3 years ago
parent c2fbfd7ba6
commit 3bd7ba34ea
16 changed files with 128 additions and 95 deletions
Show Stats Download Patch File Download Diff File

15
src/main/java/com/emr/controller/FontController.java
Unescape Escape View File

@ -26,12 +26,10 @@ import org.springframework.web.bind.annotation.ResponseBody;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
import java.util.*;
/**
* @author zwh
@ -424,6 +422,15 @@ public class FontController {
Power_User user = (Power_User) request.getSession().getAttribute("CURRENT_USER");
title="超期的病案通知";
OverdueRemindVO overdueRemindVO= new OverdueRemindVO();
DateFormat format = new SimpleDateFormat("yyyy-MM-dd");
String date2="2021-01-01";
Date date1=null;
try {
date1=format.parse(date2);
} catch (ParseException e) {
e.printStackTrace();
}
overdueRemindVO.setDate1(date1);
//查询主治医生id
String s = user.getUserName();
System.out.println("s:::" + s);

1
src/main/java/com/emr/controller/beHospitaledController.java
Unescape Escape View File

@ -9,6 +9,7 @@ package com.emr.controller;
import com.emr.entity.*;
import com.emr.service.*;
import com.emr.util.IDHelper;
import com.emr.util.OracleConnect;
import com.emr.util.ThreadExcelUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.cxf.endpoint.Client;

7
src/main/java/com/emr/controller/commitController.java
Unescape Escape View File

@ -112,10 +112,9 @@ public class commitController {
String nowTime = format1.format(new Date());
emrFaultDetail.setUpdater(username);
emrFaultDetail.setUpdateTime(nowTime);
//修改复审内容
//1、查询出该病案的创建时间最近的缺陷记录
//Emr_Fault_Detail entity= emrFaultDetailService.selectByArchiveDetailId(emrFaultDetail);
//emrFaultDetail.setId(entity.getId());
emrFaultDetail.setArchiveDetailId(emrFaultDetail.getArchiveDetailId());
Emr_Fault_Detail entity= emrFaultDetailService.selectByArchiveDetailId(emrFaultDetail);
emrFaultDetail.setId(entity.getId());
//2、修改缺陷记录
bol = emrFaultDetailService.updateCloByPrimaryKey(emrFaultDetail);
}

16
src/main/java/com/emr/entity/Archive_Master_Vo.java
Unescape Escape View File

@ -31,6 +31,10 @@ public class Archive_Master_Vo {
private String dischargeDateTime;
private Date dischargeDateTime1;
public Date getDischargeDateTime1() {
return dischargeDateTime1;
}
@ -39,8 +43,6 @@ public class Archive_Master_Vo {
this.dischargeDateTime1 = dischargeDateTime1;
}
private Date dischargeDateTime1;
private String archivestate;
private String admissionDateTime;
@ -222,10 +224,18 @@ public class Archive_Master_Vo {
this.jqFlag = jqFlag;
}
public Integer getOverTime2() {
return overTime2;
}
public void setOverTime2(Integer overTime2) {
this.overTime2 = overTime2;
}
private Integer overTime;
private Integer jqFlag;
private Integer overTime2;
public String getOverTime1() {
return overTime1;

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

@ -9,6 +9,16 @@ public class Emr_Fault_Detail {
private String assortId;
private String visitId;
public String getVisitId() {
return visitId;
}
public void setVisitId(String visitId) {
this.visitId = visitId;
}
private Integer parentId;
private String content;

11
src/main/java/com/emr/entity/Sign_List_Vo.java
Unescape Escape View File

@ -58,11 +58,22 @@ public class Sign_List_Vo {
private BigDecimal n2;
private BigDecimal n3;
public String getOperateName() {
return operateName;
}
public void setOperateName(String operateName) {
this.operateName = operateName;
}
/**
* 纸质病历送达时间（可等同于签收时间）
*/
private String t1;
private String operateName;
private String t2;
private String T3;

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

@ -506,8 +506,6 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
Date date1=null;
Date date2=null;
Date date3=null;
Date date4=null;
Date date5=null;
List<Archive_Master_Vo> list = archiveMasterMapper.selectOverdue(archiveMasterVo);
@ -552,43 +550,38 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
//遍历匹配工号赋值姓名
String overTime1 = archiveMaster.getOverTime1();
String handleTime = archiveMaster.getHandleTime();
String dischargeDateTime = archiveMaster.getDischargeDateTime();
try {
date1=format.parse(overTime1);
date2=format.parse(handleTime);
date3=format.parse(dischargeDateTime);
} catch (ParseException e) {
e.printStackTrace();
}
System.out.println("date3::::"+date3);
Calendar ca1 = Calendar.getInstance();
Calendar ca2 = Calendar.getInstance();
ca1.setTime(date1);
ca2.setTime(date2);
long distanceMin =( ca2.getTimeInMillis()- ca1.getTimeInMillis())/(1000*60*60*24);
int i= (int)distanceMin;
if (i>0){
archiveMaster.setOverTime(i);
}else{
archiveMaster.setOverTime(0);
archiveMasterVo.setDischargeDateTime1(date3);
Integer integer = archiveMasterMapper.selectTime1(archiveMasterVo);
System.out.println("integer:::::"+integer);
if (integer==1){
if (i>0){
archiveMaster.setOverTime(i);
}else {
archiveMaster.setOverTime(0);
}
}else
if (integer==2){
if (i>0){
archiveMaster.setOverTime(i);
}else {
archiveMaster.setOverTime(0);
}
}
// String inpNo = archiveMaster.getInpNo();
// int iinpNo = Integer.parseInt(inpNo);
// System.out.println("iinpNo:::::"+iinpNo);
// if (iinpNo==1598263){
// archiveMaster.setOverTime(1);
// }else
// if (i>0 && integer1==2){
// int i1 = i - 2;
// if (i1>0){
// archiveMaster.setOverTime(i1);
// }else {
// archiveMaster.setOverTime(0);
// }
// }else if (i>0 && integer1==1) {
// archiveMaster.setOverTime(i);
// }else{
// archiveMaster.setOverTime(0);
// }
for (Power_User_Dto powerUserDto : powerUserList) {
String name = powerUserDto.getName();
if (StringUtils.isNotBlank(doctorInCharge) && powerUserDto.getUserName().equals(doctorInCharge)) {

30
src/main/java/com/emr/util/OracleConnect.java
Unescape Escape View File

@ -1,4 +1,3 @@
/*
package com.emr.util;
import com.alibaba.druid.pool.DruidDataSource;
@ -9,15 +8,13 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
*/
/**
* Oracle链接数据库对象
*
* @author ZL
*
* 2017年7月27日
*//*
*/
public class OracleConnect {
private static DruidDataSource dataSourceTest = null;
private static PreparedStatement pst = null;
@ -26,11 +23,9 @@ public class OracleConnect {
private String url = PropertiesUtils.getProperty("oracleUrl");
private String userName = PropertiesUtils.getProperty("oracleUserName");
private String passWord = PropertiesUtils.getProperty("oraclePassWord");
*/
/**
/**
* 构造函数完成数据库的连接和连接对象的生成
*//*
*/
private OracleConnect() {
try {
if (dataSourceTest == null) {
@ -48,13 +43,11 @@ public class OracleConnect {
}
}
*/
/**
/**
* 取得已经构造生成的数据库连接
*
* @return 返回数据库连接对象
*//*
*/
public Connection getConnect() {
try {
return dataSourceTest.getConnection();
@ -64,15 +57,13 @@ public class OracleConnect {
return null;
}
*/
/**
/**
* 使用完一定要关闭（释放资源）
* @param rs ResultSet
* @param stat Statement
* @param conn Connection
* @throws Exception
*//*
*/
private static void CloseConn(ResultSet rs, Statement stat, Connection conn){
if (rs != null) {
try {
@ -97,15 +88,13 @@ public class OracleConnect {
}
}
*/
/**
/**
* 查询一条(多条)记录
*
* @param arg0 查询的sql语句
* @return list
* @throws Exception
*//*
*/
@SuppressWarnings({ "rawtypes", "unchecked" })
public static String select(String arg0) throws Exception {
String str = "";
@ -198,4 +187,3 @@ public class OracleConnect {
return 1;
}
}
*/

29
src/main/java/com/emr/util/PropertiesUtils.java
Unescape Escape View File

@ -0,0 +1,29 @@
package com.emr.util;
import java.io.IOException;
import java.util.Properties;
public class PropertiesUtils {
private static String fileName = "\\config\\config.properties";
private static Properties props;
synchronized static private void loadProps(){
if (props==null) {
props = new Properties();
ClassLoader loader = Thread.currentThread().getContextClassLoader();
try {
props.load(loader.getResourceAsStream(fileName));
} catch (IOException e) {
e.printStackTrace();
}
}
}
public static String getProperty(String key){
if(null == props) {
loadProps();
}
return props.getProperty(key);
}
}

2
src/main/java/com/emr/vo/OverdueRemindVO.java
Unescape Escape View File

@ -29,4 +29,6 @@ public class OverdueRemindVO {
/**提醒时间*/
private Date reminderTime;
private String DOCTOR_IN_CHARGE;
private Date date1;
}

3
src/main/resources/config/config.properties
Unescape Escape View File

@ -10,6 +10,3 @@ sqlServerClassName=com.microsoft.sqlserver.jdbc.SQLServerDriver
sqlServerUrl=jdbc:sqlserver://10.3.6.94:1433;DatabaseName=headpage_gyfs_1
sqlServerUserName=sa
sqlServerPassword=xjgs+docus911

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

@ -108,6 +108,7 @@
<result column="overTime" jdbcType="INTEGER" property="overTime" />
<result column="jqFlag" jdbcType="INTEGER" property="jqFlag" />
<result column="overTime1" jdbcType="NVARCHAR" property="overTime1" />
<result column="overTime2" jdbcType="INTEGER" property="overTime2" />
<result column="flag" jdbcType="INTEGER" property="flag" />
<result column="countNum" jdbcType="INTEGER" property="countNum" />
</resultMap>
@ -1466,9 +1467,9 @@
0) diffDay,
(SELECT max(b.date)
FROM (select top 4 date from emr_holiday_set where date >= CONVERT (
VARCHAR (100),
VARCHAR (10),
m.discharge_date_time,
23
120
) and flag= 1 order by date asc) as b) as overTime1
-- (
-- SELECT MAX(b.date)

5
src/main/resources/mapper/Sign_ListMapper.xml
Unescape Escape View File

@ -56,6 +56,7 @@
<result column="admission_date_time" property="admissionDateTime" />
<result column="isscaned" jdbcType="NVARCHAR" property="isscaned" />
<result column="num" property="num" />
<result column="operateName" property="operateName" />
</resultMap>
<sql id="Base_Column_List">
@ -65,11 +66,11 @@
<select id="selectSignList" parameterType="Sign_List_Vo" resultMap="BaseResultMapNew">
select DISTINCT s.id,f.name dept_name,s.discharge_date_time, s.pid,s.createdtime, s.otherInfo, s.masterID, s.detailID, s.dTime,s.sysFlag, s.C1, s.C2, s.C3, s.C4, s.C5, s.N1, s.N2, s.N3, s.T1,
s.T2,s.T3,s.IsFullText,s.inp_no,s.visit_id,s.name,s.admissionDateTime,d.name as deptAdmissionTo,s.isscaned,s.num
s.T2,s.T3,s.IsFullText,s.inp_no,s.visit_id,s.name,s.admissionDateTime,d.name as deptAdmissionTo,s.isscaned,s.num,s.operateName
from (
select
DISTINCT m.id,CONVERT(varchar(10),m.discharge_date_time, 120) discharge_date_time, s.pid,s.createdtime, s.otherInfo, s.masterID, s.detailID, s.dTime,s.sysFlag, s.C1, s.C2, s.C3, s.C4, s.C5, s.N1, s.N2, s.N3, s.T1,
s.T2,s.T3,s.IsFullText,m.inp_no,m.visit_id,m.name,CONVERT(varchar(10),m.admission_date_time, 120) admissionDateTime,m.dept_name, m.isscaned,m.dept_admission_to,(select COUNT(1) from archive_other where archive_other.masterID=s.masterID and archive_other.sysFlag = 1)as num
s.T2,s.T3,s.IsFullText,s.operateName,m.inp_no,m.visit_id,m.name,CONVERT(varchar(10),m.admission_date_time, 120) admissionDateTime,m.dept_name, m.isscaned,m.dept_admission_to,(select COUNT(1) from archive_other where archive_other.masterID=s.masterID and archive_other.sysFlag = 1)as num
from archive_other s
left join archive_master m
on s.masterID=m.id

33
src/main/resources/mapper/overdueRemindMapper.xml
Unescape Escape View File

@ -9,33 +9,11 @@
<select id="selectoverdueNumAndDoctorId" parameterType="com.emr.vo.OverdueRemindVO" resultType="java.lang.String">
select COUNT(*)as overdueNum from Archive_Master a
left JOIN Archive_Master_Following f on f.master_id=a.ID
where a.DOCTOR_IN_CHARGE=#{doctorInCharge} and a.DOCTOR_IN_CHARGE is not null and a.DOCTOR_IN_CHARGE!=''
and a.discharge_date_time>'2021-01-01 '
and a.ArchiveState='归档中'
and 3 &lt;=
(
CASE
WHEN (
(
SELECT
count(1)
FROM
emr_holiday_set
WHERE
flag = 1
AND date >= CONVERT (
VARCHAR (100),
a.discharge_date_time,
23
)
AND date &lt;= CONVERT (
VARCHAR (100),
f.handle_time,
23
)
) - 3
) &lt;= 0 THEN 0 else
(
(
SELECT
count(1)
FROM
@ -49,12 +27,11 @@
)
AND date &lt;= CONVERT(
VARCHAR (100),
f.handle_time,
getDate(),
23
)
) - 3
)
end)
) - 4
</select>
<insert id="insertRemind" parameterType="com.emr.vo.OverdueRemindVO"

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

@ -2178,7 +2178,7 @@
//获取初审
$.ajax({
url: "${path}/lastVerify/getDetailByArchId", // 获取表格数据的url
url: "${path}/commCtr/getDetailByArchId", // 获取表格数据的url
type: "POST",
data: {archiveDetailId: $("#idLab").html()},
success: function (result) {
@ -2238,6 +2238,7 @@
data.backContent = $("#backContent").val();
data.state = "主任退回";
data.backFlag = 3;
data.returnFlag = 3;
//data.archiveState="初审";
data.formToken = $("#formToken1").val();
//根据病案号保存缺陷信息

8
src/main/webapp/WEB-INF/views/signListDir/signList.jsp
Unescape Escape View File

@ -1338,11 +1338,11 @@
<input id="formToken" hidden>
<input id="archiveIdSign" type="text"/>
<input id="hiddenText" type="text" style="display:none" />
<input id="operateName" type="text" placeholder="请输入操作人姓名"/>
</div>
</form>
</div>
<div class="modal-footer">
<input id="operateName" type="text" placeholder="请输入操作人姓名"/>
<button type="button" class="btn btn-default btn-sm" data-dismiss="modal">返回</button>
<button type="button" class="btn btn-primary btn-sm" id="signBtn2">签收</button>
<button type="button" class="btn btn-warning btn-sm" id="signBtn3">取消签收</button>
@ -3271,6 +3271,12 @@
align: 'center',
valign: 'middle',
},
{
title: '经管员姓名',
field: 'operateName',
align: 'center',
valign: 'middle',
},
{
title: "操作",
align: 'left',

Write Preview
Loading…
Cancel
Save