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

Merge remote-tracking branch 'origin/master'

Browse Source
master
wzqgit 4 years ago
parent d98d62df4e 61022eaf5b
commit 2475b4e685
14 changed files with 178 additions and 134 deletions
Show Stats Download Patch File Download Diff File

25
src/main/java/com/emr/controller/MedicalRecallController.java
Unescape Escape View File

@ -80,14 +80,16 @@ public class MedicalRecallController {
//替换科室
for (int k = 0; k < dicList.size(); k++) {
String deptName = list.get(i).getDeptName();
String dept2 = list.get(i).getDeptAdmissionTo();
if (deptName.equals(dicList.get(k).getCode())) {
//出院科室
deptName = deptName.replace(deptName, dicList.get(k).getName());
list.get(i).setDeptName(deptName);
}
if(dept2 != null && dept2.equals(dicList.get(k).getCode())) {
//入院科室dept_admission_to
deptName = list.get(i).getDeptAdmissionTo();
deptName = deptName.replace(deptName, dicList.get(k).getName());
list.get(i).setDeptAdmissionTo(deptName);
dept2 = dept2.replace(dept2, dicList.get(k).getName());
list.get(i).setDeptAdmissionTo(dept2);
}
}
}
@ -101,24 +103,18 @@ public class MedicalRecallController {
@RequestMapping(value = "/updateState")
public int updateState(HttpServletRequest request, HttpServletResponse response, Emr_Fault_Detail emrFaultDetail) throws UnsupportedEncodingException {
response.setCharacterEncoding("utf-8");
request.setCharacterEncoding("utf-8");
//request.setCharacterEncoding("utf-8");
Subject currentUser = SecurityUtils.getSubject();
Session session = currentUser.getSession();
String username = (String) session.getAttribute("userSession");//获取前面登录的用户名
//2021-01-30
Power_User user = (Power_User) request.getSession().getAttribute("CURRENT_USER");
String handleName = user.getUserPosition();//姓名
//2021-01-30
emrFaultDetail.setUpdater(username);
SimpleDateFormat format1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String nowTime = format1.format(new Date());
emrFaultDetail.setUpdater(username);
emrFaultDetail.setUpdateTime(nowTime);
if(emrFaultDetail.getRecallReason()==null ||emrFaultDetail.getRecallReason()==""){
emrFaultDetail.setRecallReason(recallReason);
//医院需要这份病案
emrFaultDetail.setRecallReason( new String(recallReason.getBytes("iso-8859-1"),"utf-8"));
}
//emrFaultDetail.setRecallReason("医院需要这份病案");
Archive_Master archiveMaster=new Archive_Master();
archiveMaster.setId(emrFaultDetail.getArchiveDetailId());
archiveMaster.setCmtNurse(1);
@ -137,6 +133,9 @@ public class MedicalRecallController {
bol = emrFaultDetailService.insertSel(emrFaultDetail);
}
//2021-01-30 初审成功日志
Power_User user = (Power_User) request.getSession().getAttribute("CURRENT_USER");
String handleName = user.getUserPosition();//姓名
Archive_Master_Following archive_master_following = new Archive_Master_Following();
archive_master_following.setMasterId(emrFaultDetail.getArchiveDetailId());
//following表中添加病案室审核操作记录

22
src/main/java/com/emr/controller/VCountController.java
Unescape Escape View File

@ -87,12 +87,12 @@ public class VCountController {
String deptName = list.get(i).getDeptName();
//入院科室dept_admission_to
String dept2 = list.get(i).getDeptAdmissionTo();
if ((deptName != null && deptName.equals(dicList.get(k).getCode())) || (dept2 != null && dept2.equals(dicList.get(k).getCode()))) {
if ((deptName != null && deptName.equals(dicList.get(k).getCode()))) {
//出院科室
if(deptName != null) {
deptName = deptName.replace(deptName, dicList.get(k).getName());
list.get(i).setDeptName(deptName);
}
deptName = deptName.replace(deptName, dicList.get(k).getName());
list.get(i).setDeptName(deptName);
}
if(dept2 != null && dept2.equals(dicList.get(k).getCode())) {
dept2 = dept2.replace(dept2, dicList.get(k).getName());
list.get(i).setDeptAdmissionTo(dept2);
}
@ -122,13 +122,13 @@ public class VCountController {
String deptName = list.get(i).getDeptName();
//入院科室dept_admission_to
String dept2 = list.get(i).getDeptAdmissionTo();
if ((deptName != null && deptName.equals(dicList.get(k).getCode())) || (dept2 != null && dept2.equals(dicList.get(k).getCode()))) {
if (deptName != null && deptName.equals(dicList.get(k).getCode())) {
//出院科室
if(deptName != null) {
deptName = deptName.replace(deptName, dicList.get(k).getName());
list.get(i).setDeptName(deptName);
}
deptName = deptName.replace(deptName, dicList.get(k).getName());
list.get(i).setDeptName(deptName);
}
if(dept2 != null && dept2.equals(dicList.get(k).getCode())){
//入院科室dept_admission_to
dept2 = dept2.replace(dept2, dicList.get(k).getName());
list.get(i).setDeptAdmissionTo(dept2);
}

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

@ -153,6 +153,19 @@ public class beHospitaledController {
emrFaultDetail.setCreateTime(nowTime);
emrFaultDetail.setState("未召回");
bol = emrFaultDetailService.insertSel(emrFaultDetail);
//初审成功日志
Power_User user = (Power_User) request.getSession().getAttribute("CURRENT_USER");
String handleName = user.getUserPosition();//姓名
Archive_Master_Following archive_master_following = new Archive_Master_Following();
archive_master_following.setMasterId(emrFaultDetail.getArchiveDetailId());
//following表中添加科主任审核操作记录
archive_master_following.setFollowingType("5");
archive_master_following.setFollowingContent("科主任审核");
archive_master_following.setHandleTime(nowTime);
archive_master_following.setHandleId(username);
archive_master_following.setHandleName(handleName);
archive_master_followingService.insertSelective(archive_master_following);
}
}else{
//修改病案归档完整内容Lockinfo
@ -168,19 +181,6 @@ public class beHospitaledController {
archiveMasterService.updateByClo(archiveMaster);
}
Power_User user = (Power_User) request.getSession().getAttribute("CURRENT_USER");
String handleName = user.getUserPosition();//姓名
Archive_Master_Following archive_master_following = new Archive_Master_Following();
archive_master_following.setMasterId(emrFaultDetail.getArchiveDetailId());
//following表中添加科主任审核操作记录
archive_master_following.setFollowingType("5");
archive_master_following.setFollowingContent("科主任审核");
archive_master_following.setHandleTime(nowTime);
archive_master_following.setHandleId(username);
archive_master_following.setHandleName(handleName);
archive_master_followingService.insertSelective(archive_master_following);
return result;
}
@ -204,19 +204,31 @@ public class beHospitaledController {
archiveMaster.setFirstInstance(username);
archiveMaster.setLockinfo(emrFaultDetail.getContent());
int bol = archiveMasterService.updateByClo(archiveMaster);
emrFaultDetail.setCreater(username);
emrFaultDetail.setCreateTime(nowTime);
emrFaultDetail.setArchiveState("初审");
bol = emrFaultDetailService.insertSel(emrFaultDetail);
//添加初审内容
if (bol == 1) {
//参数输入
emrFaultDetail.setState("未召回");
emrFaultDetail.setArchiveState(null);
if(bol==1) {
emrFaultDetail.setCreater(username);
emrFaultDetail.setCreateTime(nowTime);
emrFaultDetail.setArchiveState("初审");
bol = emrFaultDetailService.insertSel(emrFaultDetail);
//添加初审内容
if (bol == 1) {
//参数输入
emrFaultDetail.setState("未召回");
emrFaultDetail.setArchiveState(null);
bol = emrFaultDetailService.insertSel(emrFaultDetail);
}
//初审成功日志
Power_User user = (Power_User) request.getSession().getAttribute("CURRENT_USER");
String handleName = user.getUserPosition();//姓名
Archive_Master_Following archive_master_following = new Archive_Master_Following();
archive_master_following.setMasterId(emrFaultDetail.getArchiveDetailId());
//following表中添加科主任审核操作记录
archive_master_following.setFollowingType("5");
archive_master_following.setFollowingContent("科主任审核");
archive_master_following.setHandleTime(nowTime);
archive_master_following.setHandleId(username);
archive_master_following.setHandleName(handleName);
archive_master_followingService.insertSelective(archive_master_following);
}
return bol+"";
}

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

@ -91,12 +91,13 @@ public class faultController {
String deptName = list.get(i).getDeptName();
//入院科室dept_admission_to
String dept2 = list.get(i).getDeptAdmissionTo();
;
if ((deptName != null && deptName.equals(dicList.get(k).getCode())) || (dept2 != null && dept2.equals(dicList.get(k).getCode()))) {
if ((deptName != null && deptName.equals(dicList.get(k).getCode()))) {
//出院科室
deptName = deptName.replace(deptName, dicList.get(k).getName());
list.get(i).setDeptName(deptName);
}
if(dept2 != null && dept2.equals(dicList.get(k).getCode())) {
//入院科室
dept2 = dept2.replace(dept2, dicList.get(k).getName());
list.get(i).setDeptAdmissionTo(dept2);
}

97
src/main/java/com/emr/controller/lastVerifyController.java
Unescape Escape View File

@ -218,60 +218,61 @@ public class lastVerifyController {
public int updateStateByArchivId(HttpServletRequest request, HttpServletResponse response, Emr_Fault_Detail emrFaultDetail) throws UnsupportedEncodingException {
request.setCharacterEncoding("utf-8");
response.setCharacterEncoding("utf-8");
//修改病案归档状态
Archive_Master archiveMaster = new Archive_Master();
archiveMaster.setId(emrFaultDetail.getArchiveDetailId());
archiveMaster.setArchivestate("已归档");
archiveMaster.setCmtDoctor(1);
archiveMaster.setCmtNurse(1);
int bol = archiveMasterService.updateByClo(archiveMaster);
//添加初审内容
if (bol == 1) {
// 从session获取用户名
Subject currentUser = SecurityUtils.getSubject();
Session session = currentUser.getSession();
String username = (String) session.getAttribute("userSession");//获取前面登录的用户名
SimpleDateFormat format1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String nowTime = format1.format(new Date());
//参数输入
emrFaultDetail.setCreater(username);
emrFaultDetail.setCreateTime(nowTime);
emrFaultDetail.setState("未召回");
//判断是否已经有召回记录
Emr_Fault_Vo vo=new Emr_Fault_Vo();
vo.setArchiveDetailId(emrFaultDetail.getArchiveDetailId());
List<Emr_Fault_Vo> list = emrFaultDetailService.selectByCol(vo);
if(list.size()>0){
bol = emrFaultDetailService.delbyCol(emrFaultDetail);
if(bol==1){
bol = emrFaultDetailService.insertSel(emrFaultDetail);
}
}else{
//修改病案归档状态
Archive_Master archiveMaster = new Archive_Master();
archiveMaster.setId(emrFaultDetail.getArchiveDetailId());
archiveMaster.setArchivestate("已归档");
archiveMaster.setCmtDoctor(1);
archiveMaster.setCmtNurse(1);
int bol = archiveMasterService.updateByClo(archiveMaster);
//添加初审内容
if (bol == 1) {
// 从session获取用户名
Subject currentUser = SecurityUtils.getSubject();
Session session = currentUser.getSession();
String username = (String) session.getAttribute("userSession");//获取前面登录的用户名
SimpleDateFormat format1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String nowTime = format1.format(new Date());
//参数输入
emrFaultDetail.setCreater(username);
emrFaultDetail.setCreateTime(nowTime);
emrFaultDetail.setState("未召回");
//判断是否已经有召回记录
Emr_Fault_Vo vo=new Emr_Fault_Vo();
vo.setArchiveDetailId(emrFaultDetail.getArchiveDetailId());
List<Emr_Fault_Vo> list = emrFaultDetailService.selectByCol(vo);
if(list.size()>0){
bol = emrFaultDetailService.delbyCol(emrFaultDetail);
if(bol==1){
bol = emrFaultDetailService.insertSel(emrFaultDetail);
}
Power_User user = (Power_User) request.getSession().getAttribute("CURRENT_USER");
String handleName = user.getUserPosition();//姓名
Archive_Master_Following archive_master_following = new Archive_Master_Following();
archive_master_following.setMasterId(emrFaultDetail.getArchiveDetailId());
//following表中添加病案室审核操作记录
archive_master_following.setFollowingType("8");
archive_master_following.setFollowingContent("病案室审核（已归档）");
archive_master_following.setHandleTime(nowTime);
archive_master_following.setHandleId(username);
archive_master_following.setHandleName(handleName);
archive_master_followingService.insertSelective(archive_master_following);
}else{
bol = emrFaultDetailService.insertSel(emrFaultDetail);
}
//初审成功日志
Power_User user = (Power_User) request.getSession().getAttribute("CURRENT_USER");
String handleName = user.getUserPosition();//姓名
Archive_Master_Following archive_master_following = new Archive_Master_Following();
archive_master_following.setMasterId(emrFaultDetail.getArchiveDetailId());
//following表中添加病案室审核操作记录
archive_master_following.setFollowingType("8");
archive_master_following.setFollowingContent("病案室审核（已归档）");
archive_master_following.setHandleTime(nowTime);
archive_master_following.setHandleId(username);
archive_master_following.setHandleName(handleName);
archive_master_followingService.insertSelective(archive_master_following);
}
return bol;
}
@ResponseBody
@RequestMapping(value = "/updateSignState")
public String updateStateByArchivId(HttpServletRequest request, HttpServletResponse response, Archive_Master archiveMaster) throws UnsupportedEncodingException {
public String updateSignState(HttpServletRequest request, HttpServletResponse response, Archive_Master archiveMaster) throws UnsupportedEncodingException {
request.setCharacterEncoding("utf-8");
response.setCharacterEncoding("utf-8");
String result="";
@ -310,11 +311,11 @@ public class lastVerifyController {
if(isSign == 1) {
result = "该份病案签收成功!";
followingContent="病案签收成功";
followingType="12";
followingType="13";
}else{
result = "该份病案取消签收成功!";
followingContent="病案取消签收成功";
followingType="13";
followingType="14";
}
//2021-05-13 following表中添加签收操作记录
Power_User user = (Power_User) request.getSession().getAttribute("CURRENT_USER");

16
src/main/java/com/emr/controller/medicalOverdueController.java
Unescape Escape View File

@ -46,12 +46,22 @@ public class medicalOverdueController {
@RequestMapping(value = "/exportExcel")
public void exportExcel(HttpServletResponse response, Archive_Master_Vo archiveMasterVo) throws Exception {
response.setContentType("application/vnd.ms-excel;charset=UTF-8");
String[] header = {"住院号","住院次数","姓名","入院科室","出院科室","出院日期","科室提交","初审人","主管医生","超期天数"};
String[] fileNames = {"inpNo","visitId","name","deptAdmissionTo","deptName","dischargeDateTime","createTime","firstInstance","doctorInCharge","overdue"};
String[] header = {"住院号","住院次数","姓名","入院科室","出院科室","出院日期","科室提交","初审人","主管医生","间隔天数","超期天数"};
String[] fileNames = {"inpNo","visitId","name","deptAdmissionTo","deptName","dischargeDateTime","createTime","firstInstance","doctorInCharge","overdue","score"};
//文件名
String fileName = "首次签收超期列表" + new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + ".xls";
//构造excel的数据
//构造excel的数据overdueDays
List<Archive_Master_Vo> list = archiveMasterService.selectOverdue(archiveMasterVo);
if(archiveMasterVo.getOverdueDays()!=null && archiveMasterVo.getOverdueDays()!="") {
if (list != null && list.size() > 0) {
for (int i = 0; i < list.size(); i++) {
if (list.get(i).getOverdue() != null && list.get(i).getOverdue() != "" ) {
int score = Integer.parseInt(list.get(i).getOverdue()) - Integer.parseInt(archiveMasterVo.getOverdueDays());
list.get(i).setScore("" + score);
}
}
}
}
ThreadExcelUtils utils = new ThreadExcelUtils(fileName, "", header, fileNames);
String result=utils.exportExcelToFilePath(response,utils.listConvert(list));
}

15
src/main/java/com/emr/service/ipml/Emr_Fault_DetailServiceImpl.java
Unescape Escape View File

@ -59,18 +59,19 @@ public class Emr_Fault_DetailServiceImpl implements Emr_Fault_DetailService {
obj.setEffective(1);
List<Emr_Fault_Type> typeLis = emrFaultTypeService.selectByCol(obj);
for (int i = 0; i < list.size(); i++) {
//替换科室
for (int k = 0; k < dicList.size(); k++) {
String deptName = list.get(i).getDeptName();
//入院科室dept_admission_to
String dept2 = list.get(i).getDeptAdmissionTo();
if ((deptName != null && deptName.equals(dicList.get(k).getCode())) || (dept2 != null && dept2.equals(dicList.get(k).getCode()))) {
if ((deptName != null && deptName.equals(dicList.get(k).getCode()))) {
//出院科室
deptName = deptName.replace(deptName, dicList.get(k).getName());
list.get(i).setDeptName(deptName);
}
if (dept2 != null && dept2.equals(dicList.get(k).getCode())) {
//入院科室
dept2 = dept2.replace(dept2, dicList.get(k).getName());
list.get(i).setDeptAdmissionTo(dept2);
}
@ -170,18 +171,18 @@ public class Emr_Fault_DetailServiceImpl implements Emr_Fault_DetailService {
obj.setEffective(1);
List<Emr_Fault_Type> typeLis = emrFaultTypeService.selectByCol(obj);
for (int i = 0; i < list.size(); i++) {
//替换科室
for (int k = 0; k < dicList.size(); k++) {
String deptName = list.get(i).getDeptName();
//入院科室dept_admission_to
String dept2 = list.get(i).getDeptAdmissionTo();
if ((deptName != null && deptName.equals(dicList.get(k).getCode())) || (dept2 != null && dept2.equals(dicList.get(k).getCode()))) {
if (deptName != null && deptName.equals(dicList.get(k).getCode())) {
//出院科室
deptName = deptName.replace(deptName, dicList.get(k).getName());
list.get(i).setDeptName(deptName);
}
if(dept2 != null && dept2.equals(dicList.get(k).getCode())){
//入院科室dept_admission_to
dept2 = dept2.replace(dept2, dicList.get(k).getName());
list.get(i).setDeptAdmissionTo(dept2);
}

4
src/main/java/com/emr/util/ThreadExcelUtils.java
Unescape Escape View File

@ -11,8 +11,6 @@ import org.apache.poi.hssf.util.HSSFColor;
import org.apache.poi.ss.usermodel.*;
import java.beans.PropertyDescriptor;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.lang.reflect.InvocationTargetException;
@ -149,7 +147,7 @@ public class ThreadExcelUtils {
else
pageCount = totalCount / excelSize;
// 创建线程池 多sheet多线程写入 线程数 为sheet页的 1/4
Integer threadNumber = pageCount / 4;
Integer threadNumber =pageCount;// pageCount / 4;
if (threadNumber == 0)
threadNumber = 1;
ExecutorService threadPool = Executors.newFixedThreadPool(threadNumber);

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

@ -1188,12 +1188,15 @@
ORDER BY f.handle_time desc
</select>
<select id="selectOverdue" parameterType="com.emr.entity.Archive_Master_Vo" resultMap="BaseResultMap2">
select DISTINCT m.id,m.patient_id, m.inp_no,m.visit_id,m.name,g.name dept_name,
m.discharge_date_time,t.name dept_admission_to,
CONVERT(varchar(10),m.admission_date_time, 120)admission_date_time,
d.create_time,m.first_instance,m.DOCTOR_IN_CHARGE,m.death_flag,[dbo].[getWorkday](m.discharge_date_time,d.create_time) overdue
from Archive_Master m join emr_dictionary e on m.dept_name = e.code
join emr_fault_detail d on m.ID=d.archive_detail_id
select m.id,m.patient_id, m.inp_no,m.visit_id,m.name,m.discharge_date_time
,CONVERT(varchar(10),m.admission_date_time, 120)admission_date_time,t.name dept_admission_to,g.name dept_name,m.DOCTOR_IN_CHARGE,m.death_flag,
d.*,[dbo].[getWorkday](m.discharge_date_time,d.create_time) overdue from archive_master m
LEFT JOIN(select master_id archive_detail_id,handle_time create_time,handle_name first_instance from (
select ROW_NUMBER() over(partition by master_id order by handle_time asc) RowNum
,Archive_Master_Following.*
from Archive_Master_Following where 1=1 and following_type ='5' ) as t1 where 1=1 and RowNum = 1
) d
on m.id=d.archive_detail_id
LEFT JOIN (select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where
typeCode='dept_code' )) t
on m.dept_admission_to=t.code
@ -1201,11 +1204,7 @@
typeCode='dept_code' )) g
on m.dept_name=g.code
where 1=1
--判断初审以及状态为null
and d.archive_state in ('初审', null)
--或者初审时间，时间最小
and d.create_time in (select create_time from emr_fault_detail A where create_time=(select min(create_time) from emr_fault_detail B where A.[archive_detail_id]=B.[archive_detail_id]))
<if test="id != null and id != ''">
<if test="id != null and id != ''">
and m.id = #{id,jdbcType=NVARCHAR}
</if>
<if test="inpNo != null and inpNo != ''">
@ -1269,7 +1268,7 @@
</if>
</if>
<if test="overdueDays != null and overdueDays != ''">
and [dbo].[getWorkday](m.discharge_date_time,d.create_time)>=#{overdueDays,jdbcType=NCHAR}
and convert(int,[dbo].[getWorkday](m.discharge_date_time,d.create_time))-convert(int,#{overdueDays,jdbcType=INTEGER})>0
</if>
</select>
<!--封存日志-->

2
src/main/resources/mapper/Emr_Fault_DetailMapper.xml
Unescape Escape View File

@ -151,7 +151,7 @@
and d.update_time = #{updateTime,jdbcType=NCHAR}
</if>
<!--<if test="backFlag != null and backFlag!=''">-->
<!--and d.back_flag= #{backFlag,jdbcType=NCHAR}-->
<!--and d.back_flag= #{backFlag,jdbcType=NCHAR}-->
<!--</if>order by d.update_time,d.create_time desc-->
ORDER BY case WHEN( d.update_time is not null) THEN d.update_time ELSE d.create_time END desc
</select>

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

@ -4356,7 +4356,6 @@
function initTable4() {
$("#table4").bootstrapTable({ // 对应table标签的id
//method: 'POST',
url: "${path}/commCtr/bbSelPage", // 获取表格数据的url

4
src/main/webapp/WEB-INF/views/faultDir/faultList.jsp
Unescape Escape View File

@ -18,7 +18,6 @@
href="${path}/static/bootstrap-3.3.7/plugins/bootstrap-multiselect-master/dist/css/bootstrap-multiselect.css"
type="text/css"/>
<style type="text/css">
<style>
.divCss {
margin-top: 5px;
}
@ -714,7 +713,8 @@
//导出ArchiveState in('已归档','已认证','初审')
window.location.href = "${path}/fault/exportExcel?inpNo=" + inpNo + "&visitId=" + visitId +
"&name=" + name + "&startDate=" + startDate + "&endDate=" + endDate + "&archivestate=" + archivestate+
"&deptName="+ deptName + "&doctorInCharge=" + doctorInCharge ;
"&deptName="+ deptName;
//+ "&doctorInCharge=" + doctorInCharge ;
//+ "&updater=" + updater + "&creater=" + creater;
});

16
src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp
Unescape Escape View File

@ -425,7 +425,7 @@
<div id="mb"></div>
<div style="margin-left:30px;margin-right:10px;height:auto">
<!--搜索-->
<form style="margin-top:20px;" onkeydown="enter()">
<form style="margin-top:20px;" >
<div class="form-inline">
<%--<div class="form-group divCss8" hidden="hidden">--%>
<%--<label for="id">病案号:</label>--%>
@ -1357,6 +1357,7 @@
<form>
<div class="form-group ">
<input id="archiveIdSign" type="text"/>
<input id="hiddenText" type="text" style="display:none" />
</div>
</form>
</div>
@ -2230,7 +2231,6 @@
//无纸质 或 有纸质且已签收
verinfyFun();
}else{
console.log("==========================");
//弹窗是否强制提交
$('#verinfyQZModal').modal({
backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。
@ -4290,6 +4290,14 @@
});
}
//回车事件绑定
$('#archiveIdSign').bind('keyup', function(event) {
if (event.keyCode == "13") {
//回车执行查询
$('#signBtn2').click();
}
});
$("#signBtn2").click(function () {
//签收
var signVal= $('#archiveIdSign').val();
@ -4543,11 +4551,11 @@
}
}
$(document).keydown(function (event) {
/*$(document).keydown(function (event) {
if (event.keyCode == 13) {
searchNode();
}
});
});*/
//展开
function expandAll() {

20
src/main/webapp/WEB-INF/views/medicalOverdueDir/medicalOverdueList.jsp
Unescape Escape View File

@ -252,6 +252,7 @@
<div class="form-group divCss8" id="deptDiv" style="height: 18px;margin-top: -7px;">
<label>入院科室 :</label>
<select class="selectpicker bla bla bli" multiple data-live-search="true" name="deptAdmissionTo"
data-actions-box="true" data-deselect-all-text="取消全选" data-select-all-text="全选" data-none-results-text="没找到相应记录{0}" title="请输入入院科室"
id="deptAdmissionTo" title="请输入入院科室">
<option value="">全部</option>
</select>
@ -1936,11 +1937,25 @@
return result
}
},
{
title: '间隔天数',
field: 'overdue',
align: 'center',
valign: 'middle',
},
{
title: '超期天数',
field: 'overdue',
align: 'center',
valign: 'middle',
formatter: function (value, row, index) {
var overdueDays=$("#overdueDays").val();
if(overdueDays!=null && overdueDays>0){
return row.overdue-overdueDays;
}else{
return row.overdue;
}
}
},
],
onLoadSuccess: function (result) { //加载成功时执行
@ -2364,8 +2379,9 @@
var createTimeEnd= $("#createTimeEnd").val();
var deathFlag= $("#deathFlag").val();
var overdueDays= $("#overdueDays").val();
window.location.href = "${path}/unfile/exportExcel?inpNo=" + inpNo + "&visitId=" + visitId +
"&name=" + name + "&deptName=" + deptName + "&deptAdmissionTo=" + deptAdmissionTo + "&archivestate=" + archivestate
window.location.href = "${path}/medicalOverdue/exportExcel?inpNo=" + inpNo + "&visitId=" + visitId +
"&name=" + name + "&deptName=" + deptName + "&deptAdmissionTo=" + deptAdmissionTo
//+ "&archivestate=" + archivestate
+ "&createTimeStart=" + createTimeStart + "&createTimeEnd=" + createTimeEnd+ "&startDate=" + startDate
+ "&endDate=" + endDate+ "&deathFlag=" + deathFlag + "&overdueDays=" + overdueDays;
});

Write Preview
Loading…
Cancel
Save