更新版本2020-02-23

master
zengwh 4 years ago
parent 36a14ff3a8
commit 08f8729560

@ -78,16 +78,15 @@ public class inHospitalController {
@ResponseBody
@RequestMapping(value = "/exportExcel")
public void exportExcel(HttpServletResponse response, Archive_Master_Vo archiveMasterVo,Integer isSearch) throws Exception {
String tableThNames = "住院号,住院次数,名字,性别,身份证,入院科室,入院日期,主管医生,状态";
String fieldCns = "inpNo,visitId,name,sex,idNo,deptAdmissionTo,admissionDateTime,doctorInCharge,archivestate";
String tableThNames = "住院号,住院次数,名字,性别,身份证,当前科室,入院日期,主管医生,状态";
String fieldCns = "inpNo,visitId,name,sex,idNo,deptName,admissionDateTime,doctorInCharge,archivestate";
//构造excel的数据
//判断是否是初始化查询,是初始化查询把开始结束时间置空
if(isSearch == 0){
archiveMasterVo.setStartDateTo(null);
archiveMasterVo.setEndDateTo(null);
}
List<Archive_Master> list = archiveMasterService.selectByCol(archiveMasterVo);
List<Archive_Master_Vo> list = archiveMasterService.selectByCol(archiveMasterVo);
//文件名
String fileName = "在院浏览" + new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + ".xls";
//ExportExcelUtil

@ -16,7 +16,7 @@ public interface Archive_MasterMapper {
Archive_Master selectByPrimaryKey(String id);
List<Archive_Master> selectByCol(Archive_Master_Vo record);
List<Archive_Master_Vo> selectByCol(Archive_Master_Vo record);
List<Archive_Master_Vo> selectByColumn(Archive_Master_Vo record);

@ -26,7 +26,7 @@ public interface Archive_MasterService {
* @param archiveMasterVo
* @return
*/
List<Archive_Master> selectByCol(Archive_Master_Vo archiveMasterVo);
List<Archive_Master_Vo> selectByCol(Archive_Master_Vo archiveMasterVo);
/**
*

@ -36,18 +36,24 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
@Override
public OffsetLimitPage selectByCol(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit) {
PageHelper.offsetPage(offset, limit);
List<Archive_Master> list= archiveMasterMapper.selectByCol(archiveMasterVo);
List<Archive_Master_Vo> list = selectByCol(archiveMasterVo);
return new OffsetLimitPage((Page) list);
}
@Override
public List<Archive_Master> selectByCol(Archive_Master_Vo archiveMasterVo) {
return archiveMasterMapper.selectByCol(archiveMasterVo);
public List<Archive_Master_Vo> selectByCol(Archive_Master_Vo archiveMasterVo) {
List<Archive_Master_Vo> list= archiveMasterMapper.selectByCol(archiveMasterVo);
//设置科室
setDeptNameForList(list);
return list;
}
@Override
public List<Archive_Master_Vo> selectByColumn(Archive_Master_Vo archiveMasterVo) {
return archiveMasterMapper.selectByColumn(archiveMasterVo);
List<Archive_Master_Vo> list = archiveMasterMapper.selectByColumn(archiveMasterVo);
//设置科室
setDeptNameForList(list);
return list;
}
@Override
@ -63,9 +69,7 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
@Override
public OffsetLimitPage selectByColumn(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit) {
PageHelper.offsetPage(offset, limit);
List<Archive_Master_Vo> list = archiveMasterMapper.selectByColumn(archiveMasterVo);
//设置科室
setDeptNameForList(list);
List<Archive_Master_Vo> list = selectByColumn(archiveMasterVo);
return new OffsetLimitPage((Page) list);
}

@ -19,7 +19,7 @@ import java.util.List;
public class ExportExcelUtil {
private final int SPLIT_COUNT = 1000000; //Excel每个工作簿的行数
private final int SPLIT_COUNT = 1000000000; //Excel每个工作簿的行数
private static List<String> fieldName = null; //excel标题数据集

@ -18,7 +18,7 @@ import java.util.List;
public class ExportExcelUtil1 {
private final int SPLIT_COUNT = 1000;
private final int SPLIT_COUNT = 1000000000;
private static List<String> fieldName = null;

@ -92,20 +92,14 @@
<!--在院-->
<select id="selectByCol" parameterType="com.emr.entity.Archive_Master_Vo" resultMap="BaseResultMap">
select m.id,m.patient_id,m.inp_no,m.visit_id,m.name,m.sex,f.name
dept_name,m.discharge_date_time,m.ArchiveState,m.admission_date_time,d.name dept_admission_to
<select id="selectByCol" parameterType="com.emr.entity.Archive_Master_Vo" resultMap="BaseResultMap2">
select m.id,m.patient_id,m.inp_no,m.visit_id,m.name,m.sex,
dept_name,m.discharge_date_time,m.ArchiveState,m.admission_date_time,dept_admission_to
,m.check_doctor,m.checked_datetime,m.checked_doctor,m.LockInfo,m.DOCTOR_IN_CHARGE,m.ID_NO,m.DISCHARGE_DISPOSITION,m.dept_code_lend
from archive_master m
LEFT JOIN (select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where
typeCode='dept_code' )) d
on m.dept_admission_to=d.code
LEFT JOIN (select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where
typeCode='dept_code' )) f
on m.dept_name=f.code
where 1=1
<if test="deptAdmissionTo!= null and deptAdmissionTo!= ''">
and m.dept_admission_to in
and m.dept_name in
<foreach item="item" collection="deptAdmissionTo.split(',')" open="(" separator="," close=")">
#{item}
</foreach>
@ -131,12 +125,6 @@
<if test="sex != null and sex != ''">
and m.sex = #{sex,jdbcType=NVARCHAR}
</if>
<if test="deptName!= null and deptName!= ''">
and m.dept_name in
<foreach item="item" collection="deptName.split(',')" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="dischargeDateTime != null and dischargeDateTime != ''">
and m.discharge_date_time = #{dischargeDateTime,jdbcType=NVARCHAR}
</if>

@ -20,7 +20,7 @@
<link rel="stylesheet" href="${path}/static/bootstrap-3.3.7/plugins/bootstrap-table-develop/src/extensions/page-jump/bootstrap-table-pagejump.css"/>
<link rel="stylesheet" href="${path}/static/bootstrap-3.3.7/plugins/bootstrap-select-1.13.0-dev/dist/css/bootstrap-select.min.css">
<script type="text/javascript" src="${path}/static/js/comm.js?time=2021-01-13"></script>
<script type="text/javascript" src="${path}/static/js/comm.js?time=2021-02-23"></script>
<script type="text/javascript" src="${path}/static/bootstrap-3.3.7/bower_components/bootstrap-datepicker/js/bootstrap-datepicker.js"></script>
<script type="text/javascript" src="${path}/static/bootstrap-3.3.7/bower_components/bootstrap-datepicker/js/locales/bootstrap-datepicker.zh-CN.js"></script>
<script type="text/javascript" src="${path}/static/bootstrap-3.3.7/bower_components/bootstrap/dist/js/bootstrap.js"></script>

@ -160,7 +160,7 @@
<input type="text" class="input-sm form-control" id="name" placeholder="请输入姓名">
</div>
<div class="form-group divCss8" id="deptDiv" style="height: 18px;margin-top: -7px;">
<label >入院科室 :</label>
<label >当前科室 :</label>
<%--<select class="input-sm form-control" id="deptName">--%>
<%--<option value="">全部</option>--%>
<%--&lt;%&ndash;<option value="在院">在院</option>&ndash;%&gt;--%>
@ -171,7 +171,7 @@
<%--&lt;%&ndash;<option value="已归档">已归档</option>&ndash;%&gt;--%>
<%--</select>--%>
<select class="selectpicker bla bla bli" multiple data-live-search="true" name="deptName"
id="deptName" title="请输入入院科室">
id="deptName" title="请输入当前科室">
<option value="">全部</option>
</select>
</div>
@ -1248,7 +1248,7 @@
checkbox: true,
width: 25,
align: 'center',
valign: 'middle',
valign: 'middle'
}, {
title: '病案清单id',
@ -1261,25 +1261,25 @@
title: '住院号',
field: 'inpNo',
align: 'left',
valign: 'middle',
valign: 'middle'
},
{
title: '住院次数',
field: 'visitId',
align: 'center',
valign: 'middle',
valign: 'middle'
},
{
title: '姓名',
field: 'name',
align: 'left',
valign: 'middle',
valign: 'middle'
},
{
title: '性别',
field: 'sex',
align: 'center',
valign: 'middle',
valign: 'middle'
},
{
title: '身份证号',
@ -1289,10 +1289,10 @@
visible: false
},
{
title: '入院科室',
field: 'deptAdmissionTo',
title: '当前科室',
field: 'deptName',
align: 'left',
valign: 'middle',
valign: 'middle'
},
{
title: '入院日期',
@ -1305,7 +1305,7 @@
{
title: '主管医生',
field: 'doctorInCharge',
align: 'left',
align: 'left'
},
// {
// title: '出院科室',
@ -1417,7 +1417,6 @@
},
cellStyle: function (value, row, index) {
return {classes: 'success'}
}
}
],
@ -1429,7 +1428,6 @@
//console.info("加载数据失败");
tipLoad = 0;
}
});
}
}

Loading…
Cancel
Save