IssueLog_20111130编号为:72、74、105、107、109、110、135、139、140、141、142

master
hujl 4 years ago
parent 8878796ac9
commit 93c63952d8

@ -9,6 +9,7 @@ package com.emr.controller;
import com.emr.entity.*;
import com.emr.service.*;
import com.emr.util.ThreadExcelUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
@ -41,6 +42,17 @@ public class VCountController {
@ResponseBody
@RequestMapping(value = "/vCountList")
public OffsetLimitPage faultList(HttpServletRequest request, HttpServletResponse response, V_Count vCount, Integer offset, Integer limit) {
response.setCharacterEncoding("utf-8");
//判断所有都为空则签收日期按当前日期
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
if(StringUtils.isBlank(vCount.getDeptCode())&& StringUtils.isBlank(vCount.getOverdueDays()) && StringUtils.isBlank(vCount.getStartDate()) && StringUtils.isBlank(vCount.getEndDate())){
if (StringUtils.isBlank(vCount.getStartDate())) {
vCount.setStartDate(sdf.format(new Date()));
}
if (StringUtils.isBlank(vCount.getEndDate())) {
vCount.setEndDate(sdf.format(new Date()));
}
}
OffsetLimitPage result = v_countService.selectPageByClo(vCount,offset, limit);
return result;
}

@ -57,12 +57,12 @@ public class faultController {
public void exportExcel(HttpServletResponse response, Emr_Fault_Vo emrFaultVo) throws Exception {
response.setContentType("application/vnd.ms-excel;charset=UTF-8");
String[] header = {"病历清单id","住院号","住院次数","姓名","出院科室","出院日期","归档状态","评分","回退内容","缺陷选项","缺陷内容","创建时间"};
String[] fileNames = {"archiveDetailId","inpNo","visitId","name","deptName","dischargeDateTime","archivestate","score","backContent","assortId","content","createTime"};
String[] fileNames = {"id","inpNo","visitId","name","deptName","dischargeDateTime","archivestate","score","backContent","typeName","content","createTime"};
//文件名
String fileName = "缺陷信息数据" + new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + ".xls";
//构造excel的数据
List<Emr_Fault_Vo> list = emrFaultDetailService.selectByCol(emrFaultVo);
Emr_Dictionary dic = new Emr_Dictionary();
List<Emr_Fault_Vo> list = emrFaultDetailService.getQualityControlList(emrFaultVo);
/*Emr_Dictionary dic = new Emr_Dictionary();
dic.setEffective(1);
dic.setTypecode("dept_code");
//科室列表
@ -102,7 +102,7 @@ public class faultController {
list.get(i).setDeptAdmissionTo(dept2);
}
}
}
}*/
ThreadExcelUtils utils = new ThreadExcelUtils(fileName, "", header, fileNames);
/* System.out.println("开始执行导出.......");
long start = System.currentTimeMillis();*/

@ -89,13 +89,16 @@ public class signListController {
public OffsetLimitPage signList(HttpServletRequest request, HttpServletResponse response, Sign_List_Vo signListVo, Integer offset, Integer limit) throws UnsupportedEncodingException {
response.setCharacterEncoding("utf-8");
request.setCharacterEncoding("utf-8");
//判断所有都为空则签收日期按当前日期
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
//签收日期没进行选择的话则默认显示的是当前日期的数据
if (signListVo.getStartSignDate() == null || "".equals(signListVo.getStartSignDate())) {
signListVo.setStartSignDate(sdf.format(new Date()));
}
if (signListVo.getEndSignDate() == null || "".equals(signListVo.getEndSignDate())) {
signListVo.setEndSignDate(sdf.format(new Date()));
if(StringUtils.isBlank(signListVo.getInpNo())&&StringUtils.isBlank(signListVo.getVisitId())&&signListVo.getC1()==null){
//签收日期没进行选择的话则默认显示的是当前日期的数据
if (StringUtils.isBlank(signListVo.getStartSignDate())) {
signListVo.setStartSignDate(sdf.format(new Date()));
}
if (StringUtils.isBlank(signListVo.getEndSignDate())) {
signListVo.setEndSignDate(sdf.format(new Date()));
}
}
OffsetLimitPage result = signListService.selectSignList(signListVo, offset, limit);
return result;

@ -50,10 +50,25 @@ public class storageController {
@ResponseBody
@RequestMapping(value = "/StorageList")
public OffsetLimitPage recallList(HttpServletRequest request, HttpServletResponse response, Emr_Fault_Vo emrFaultVo, Integer offset, Integer limit) {
OffsetLimitPage result = emrFaultDetailService.selectStorageByCol(emrFaultVo, offset, limit);
public OffsetLimitPage recallList(HttpServletRequest request, HttpServletResponse response,Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit) {
OffsetLimitPage result = archiveMasterService.selectStorageByCol(archiveMasterVo, offset, limit);
return result;
}
@ResponseBody
@RequestMapping(value = "/exportExcelStorageList")
public void exportExcelStorageList(HttpServletResponse response,Archive_Master_Vo archiveMasterVo) throws Exception {
response.setContentType("application/vnd.ms-excel;charset=UTF-8");
String[] header = {"病历清单id","住院号","住院次数","名字","性别","入院科室","入院日期","出院科室","出院日期","状态","封存人","封存日期"};
String[] fileNames = {"id","inpNo","visitId","name","sex","deptAdmissionTo","admissionDateTime","deptName","dischargeDateTime","archivestate","handleName","handleTime"};
//文件名
String fileName = "病案封存列表" + new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + ".xls";
//构造excel的数据
List<Archive_Master_Vo> list=archiveMasterService.selectStorageByCol(archiveMasterVo);
ThreadExcelUtils utils = new ThreadExcelUtils(fileName, "", header, fileNames);
String result=utils.exportExcelToFilePath(response,utils.listConvert(list));
}
@ResponseBody
@RequestMapping(value = "/exportExcel")
public void exportExcel(HttpServletResponse response,Archive_Master_Vo archiveMasterVo) throws Exception {
@ -69,7 +84,7 @@ public class storageController {
}
/**
*
*
*
*
*/

@ -149,4 +149,12 @@ public interface Archive_MasterMapper {
* @return
*/
List<Archive_Master> getObservationRecordList(Archive_Master_Vo master);
/**
*
* @param record
* @return
*/
List<Archive_Master_Vo> selectStorageByCol(Archive_Master_Vo record);
}

@ -221,6 +221,21 @@ public interface Archive_MasterService {
List<Archive_Master_Vo> selectByCmtByColumn(Archive_Master_Vo archiveMasterVo,Integer offset, Integer limit);
List<Archive_Master_Vo> selectByUnfileAndColumn(Archive_Master_Vo archiveMasterVo,Integer offset, Integer limit);
/**
*
* @param archiveMasterVo
* @param offset
* @param limit
* @return
*/
OffsetLimitPage selectStorageByCol(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit);
/**
*
* @param record
* @return
*/
List<Archive_Master_Vo> selectStorageByCol(Archive_Master_Vo record);
}

@ -105,8 +105,18 @@ public interface Emr_Fault_DetailService {
*/
List<Emr_Fault_Vo> selectStorageByCol(Emr_Fault_Vo emrFaultVo);
List<Emr_Fault_Vo> getQualityControlList(Emr_Fault_Vo emrFaultVo);//获取质控缺陷评分列表
/**
*
* @param emrFaultVo
* @return
*/
List<Emr_Fault_Vo> getQualityControlList(Emr_Fault_Vo emrFaultVo);
/**
*
* @param emrFaultVo
* @return
*/
OffsetLimitPage getQualityControlList(Emr_Fault_Vo emrFaultVo, Integer offset, Integer limit);
}

@ -296,6 +296,19 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
return list;
}
@Override
public OffsetLimitPage selectStorageByCol(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit) {
PageHelper.offsetPage(offset, limit);
List<Archive_Master_Vo> list = archiveMasterMapper.selectStorageByCol(archiveMasterVo);
return new OffsetLimitPage((Page) list);
}
@Override
public List<Archive_Master_Vo> selectStorageByCol(Archive_Master_Vo archiveMasterVo) {
return archiveMasterMapper.selectStorageByCol(archiveMasterVo);
}
@Override
public OffsetLimitPage selectByLast(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit) {
List<Archive_Master_Vo> list = selectByLastByColumn(archiveMasterVo, offset, limit);

@ -57,7 +57,7 @@
<if test="patientId != null and patientId != ''">
and id=#{patientId,jdbcType=VARCHAR}
</if>)+'%'
and admission_date_time=(select admission_date_time from Archive_Master where 1=1
and admission_date_time in(select admission_date_time from Archive_Master where 1=1
<if test="patientId != null and patientId != ''">
and id=#{patientId,jdbcType=VARCHAR}
</if>)
@ -86,7 +86,7 @@
<if test="patientId != null and patientId != ''">
and id=#{patientId,jdbcType=VARCHAR}
</if>)+'%'
and admission_date_time=(select admission_date_time from Archive_Master where 1=1
and admission_date_time in(select admission_date_time from Archive_Master where 1=1
<if test="patientId != null and patientId != ''">
and id=#{patientId,jdbcType=VARCHAR}
</if>)
@ -111,7 +111,7 @@
<if test="masterid != null and masterid != ''">
and id=#{masterid,jdbcType=VARCHAR}
</if>)+'%'
and admission_date_time=(select admission_date_time from Archive_Master where 1=1
and admission_date_time in (select admission_date_time from Archive_Master where 1=1
<if test="masterid != null and masterid != ''">
and id=#{masterid,jdbcType=VARCHAR}
</if>)
@ -216,7 +216,7 @@
<if test="patientId != null and patientId != ''">
and id=#{patientId,jdbcType=VARCHAR}
</if>
and admission_date_time=(select admission_date_time from Archive_Master where 1=1
and admission_date_time in(select admission_date_time from Archive_Master where 1=1
<if test="patientId != null and patientId != ''">
and id=#{patientId,jdbcType=VARCHAR}
</if>)
@ -237,7 +237,7 @@
and id=#{patientId,jdbcType=VARCHAR}
</if>
)+'%'
and admission_date_time=(select admission_date_time from Archive_Master where 1=1
and admission_date_time in(select admission_date_time from Archive_Master where 1=1
<if test="patientId != null and patientId != ''">
and id=#{patientId,jdbcType=VARCHAR}
</if>)

@ -155,9 +155,10 @@
</if>
</select>
<select id="selectByCol" parameterType="com.emr.entity.Archive_Master_Vo" resultMap="BaseResultMap">
select distinct m.id,m.patient_id,m.inp_no,m.cmt_doctor,m.cmt_nurse,m.visit_id,m.name,m.sex,f.name
dept_name,CONVERT(varchar(10),m.discharge_date_time, 120) discharge_date_time,m.ArchiveState,CONVERT(varchar(10),m.admission_date_time, 120) admission_date_time,d.name dept_admission_to
,m.check_doctor,m.doctor_name,m.nurse_name,m.checked_datetime,m.checked_doctor,m.LockInfo,m.DOCTOR_IN_CHARGE,m.ID_NO,m.DISCHARGE_DISPOSITION,m.dept_code_lend,m.isscaned,m.is_scanning,bed_number
select distinct m.id,m.patient_id,m.inp_no,m.cmt_doctor,m.cmt_nurse,m.visit_id,m.name,m.sex,ISNULL(f.name, m.dept_name) dept_name
,CONVERT(varchar(10),m.discharge_date_time, 120) discharge_date_time,m.ArchiveState,CONVERT(varchar(10),m.admission_date_time, 120) admission_date_time
,ISNULL(d.name,m.dept_admission_to) dept_admission_to,m.check_doctor,m.doctor_name,m.nurse_name,m.checked_datetime,m.checked_doctor
,m.LockInfo,m.DOCTOR_IN_CHARGE,m.ID_NO,m.DISCHARGE_DISPOSITION,m.dept_code_lend,m.isscaned,m.is_scanning,bed_number
,ISNULL(printTable.num, 0) printNum
from archive_master m
LEFT JOIN (select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where
@ -265,8 +266,8 @@
ORDER BY admission_date_time desc
</select>
<select id="selectByColumn" 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,f.name
dept_name,CONVERT(varchar(10),m.discharge_date_time, 120) discharge_date_time,m.ArchiveState,CONVERT(varchar(10),m.admission_date_time, 120) admission_date_time,d.name dept_admission_to
select m.id,m.patient_id,m.inp_no,m.visit_id,m.name,m.sex,ISNULL(f.name, m.dept_name) dept_name
,CONVERT(varchar(10),m.discharge_date_time, 120) discharge_date_time,m.ArchiveState,CONVERT(varchar(10),m.admission_date_time, 120) admission_date_time,ISNULL(d.name,m.dept_admission_to) 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,m.isscaned,m.is_scanning,
m.cmt_doctor,m.cmt_nurse,m.doctor_name,m.nurse_name,m.cmt_doctor_date,m.cmt_nurse_date,m.emr_doctor_cmt,m.emr_nure_cmt,m.death_flag,m.bed_number,ISNULL(s.numb, 0) numb
,ISNULL(sDoctor.numb, 0) faultDoctorNum,ISNULL(sNurse.numb, 0) faultNurseNum,ISNULL(extDoctor.num, 0) doctorNum,ISNULL(extNurse.num, 0) nurseNum
@ -398,9 +399,8 @@
</select>
<select id="selectByLast" parameterType="com.emr.entity.Archive_Master_Vo" resultMap="BaseResultMap2">
select DISTINCT m.id,m.patient_id,m.inp_no,m.visit_id,m.name,m.sex,f.name
dept_name,CONVERT(varchar(10),m.discharge_date_time, 120) discharge_date_time,m.ArchiveState,CONVERT(varchar(10),m.admission_date_time, 120) admission_date_time,d.name 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,m.isscaned,
select DISTINCT m.id,m.patient_id,m.inp_no,m.visit_id,m.name,m.sex,ISNULL(f.name,m.dept_name) dept_name,CONVERT(varchar(10),m.discharge_date_time, 120) discharge_date_time,m.ArchiveState,CONVERT(varchar(10),m.admission_date_time, 120) admission_date_time,
ISNULL(d.name,m.dept_admission_to) 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,m.isscaned,
m.cmt_doctor,m.cmt_nurse,m.doctor_name,m.nurse_name,m.cmt_doctor_date,m.cmt_nurse_date,m.emr_doctor_cmt,m.emr_nure_cmt,m.death_flag,m.first_instance,
m.is_scanning,m.bed_number,amf.following_type,ISNULL(s.numb, 0) numb,ao.C5 is_sign
,ISNULL(sDoctor.numb, 0) faultDoctorNum,ISNULL(sNurse.numb, 0) faultNurseNum,ISNULL(printTable.num, 0) printNum
@ -551,8 +551,8 @@
</select>
<select id="selectByUnfile" 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,f.name
dept_name,CONVERT(varchar(10),m.discharge_date_time, 120) discharge_date_time,m.ArchiveState,CONVERT(varchar(10),m.admission_date_time, 120) admission_date_time,d.name dept_admission_to
select m.id,m.patient_id,m.inp_no,m.visit_id,m.name,m.sex,ISNULL(f.name,m.dept_name) dept_name,CONVERT(varchar(10),m.discharge_date_time, 120) discharge_date_time
,m.ArchiveState,CONVERT(varchar(10),m.admission_date_time, 120) admission_date_time,ISNULL(d.name,m.dept_admission_to) 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,m.isscaned,
m.cmt_doctor,m.cmt_nurse,m.doctor_name,m.nurse_name,m.cmt_doctor_date,m.cmt_nurse_date,m.emr_doctor_cmt,m.emr_nure_cmt,m.death_flag,m.is_scanning,
m.bed_number,ISNULL(s.numb, 0) numb
@ -674,8 +674,8 @@
</select>
<select id="selectByUnfileNew" 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,f.name
dept_name,CONVERT(varchar(10),m.discharge_date_time, 120) discharge_date_time,m.ArchiveState,CONVERT(varchar(10),m.admission_date_time, 120) admission_date_time,d.name dept_admission_to
select m.id,m.patient_id,m.inp_no,m.visit_id,m.name,m.sex,ISNULL(f.name,m.dept_name) dept_name
,CONVERT(varchar(10),m.discharge_date_time, 120) discharge_date_time,m.ArchiveState,CONVERT(varchar(10),m.admission_date_time, 120) admission_date_time,ISNULL(d.name,m.dept_admission_to) 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,m.isscaned,
m.cmt_doctor,m.cmt_nurse,m.doctor_name,m.nurse_name,m.cmt_doctor_date,m.cmt_nurse_date,m.emr_doctor_cmt,m.emr_nure_cmt,m.death_flag,m.is_scanning,
m.bed_number,ISNULL(s.numb, 0) numb,ISNULL(amf.num, 0) checkFlag
@ -818,8 +818,8 @@
</select>
<select id="selectByCmtCol" 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,f.name
dept_name,CONVERT(varchar(10),m.discharge_date_time, 120) discharge_date_time,m.ArchiveState,CONVERT(varchar(10),m.admission_date_time, 120) admission_date_time,d.name dept_admission_to
select m.id,m.patient_id,m.inp_no,m.visit_id,m.name,m.sex,ISNULL(f.name,m.dept_name) dept_name
,CONVERT(varchar(10),m.discharge_date_time, 120) discharge_date_time,m.ArchiveState,CONVERT(varchar(10),m.admission_date_time, 120) admission_date_time,ISNULL(d.name,m.dept_admission_to) 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,m.isscaned,m.is_scanning,
m.cmt_doctor,m.cmt_nurse,m.doctor_name,m.nurse_name,m.cmt_doctor_date,m.cmt_nurse_date,m.emr_doctor_cmt,m.emr_nure_cmt,m.death_flag,m.bed_number,ISNULL(s.numb, 0) numb
,ISNULL(sDoctor.numb, 0) faultDoctorNum,ISNULL(sNurse.numb, 0) faultNurseNum,ISNULL(printTable.num, 0) printNum
@ -1668,4 +1668,79 @@
AND death_flag = #{deathFlag}
</if>
</select>
<!--封存查询-->
<select id="selectStorageByCol" parameterType="com.emr.entity.Archive_Master_Vo" resultMap="BaseResultMap2">
select m.id ,m.inp_no,m.visit_id,m.name,ISNULL(f.name, m.dept_name) dept_name,m.discharge_date_time,m.ArchiveState,m.sex,m.ID_NO,
ISNULL(c.name, m.dept_admission_to) dept_admission_to
,m.admission_date_time,m.DISCHARGE_DISPOSITION,d.handle_time,d.handle_name,d.following_type
from(select * from Archive_Master where ArchiveState!='作废') m
LEFT JOIN(
select master_id ,handle_time ,handle_name,following_type from (
select ROW_NUMBER() over(partition by master_id order by handle_time desc) RowNum
,Archive_Master_Following.*
from Archive_Master_Following where 1=1 ) as t1 where 1=1 and RowNum = 1
) d
on m.id=d.master_id
LEFT JOIN (select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where
typeCode='dept_code' )) c
on m.dept_admission_to=c.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="id != null and id != ''">
and m.id = #{id,jdbcType=NVARCHAR}
</if>
<if test="inpNo != null and inpNo != ''">
and m.inp_no like '%'+#{inpNo,jdbcType=NCHAR}+'%'
</if>
<if test="visitId != null and visitId != ''">
and m.visit_id=#{visitId,jdbcType=NCHAR}
</if>
<if test="name != null and name != ''">
and m.name like '%'+#{name,jdbcType=NCHAR}+'%'
</if>
<if test="handleName != null and handleName != ''">
and d.handle_name like '%'+#{handleName,jdbcType=NCHAR}+'%'
</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="deptAdmissionTo != null and deptAdmissionTo!=''">
and m.dept_admission_to in
<foreach item="item" collection="deptAdmissionTo.split(',')" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="archivestate != null and archivestate != ''">
and m.ArchiveState=#{archivestate,jdbcType=NCHAR}
</if>
<choose>
<when test="startDate != null and startDate != '' and endDate != null and endDate != ''">
and m.discharge_date_time between CONVERT(VARCHAR(10),#{startDate,jdbcType=NCHAR},120) and
#{endDate,jdbcType=NCHAR}+ ' 23:59:59'
</when>
<when test="startDate != null and startDate != ''">
and m.discharge_date_time >= CONVERT(VARCHAR(10),#{startDate,jdbcType=NCHAR},120)
</when>
<when test="endDate != null and endDate != ''">
and m.discharge_date_time &lt;= #{endDate,jdbcType=NCHAR}+ ' 23:59:59'
</when>
</choose>
<choose>
<when test="startDateTo != null and startDateTo != '' and endDateTo != null and endDateTo != ''">
and d.handle_time between CONVERT(VARCHAR(10),#{startDateTo,jdbcType=NCHAR},120) and
#{endDateTo,jdbcType=NCHAR}+ ' 23:59:59'
</when>
<when test="startDateTo != null and startDateTo != ''">
and d.handle_time >= CONVERT(VARCHAR(10),#{startDateTo,jdbcType=NCHAR},120)
</when>
<when test="endDateTo != null and endDateTo != ''">
and d.handle_time &lt;= #{endDateTo,jdbcType=NCHAR}+ ' 23:59:59'
</when>
</choose>
</select>
</mapper>

@ -239,6 +239,18 @@
#{item}
</foreach>
</if>
<choose>
<when test="startDate != null and startDate != '' and endDate != null and endDate != ''">
and CONVERT(VARCHAR(100),m.discharge_date_time,23) between CONVERT(VARCHAR(100),#{startDate,jdbcType=NCHAR},23) and
CONVERT(VARCHAR(100),#{endDate,jdbcType=NCHAR},23)
</when>
<when test="startDate != null and startDate != ''">
and CONVERT(VARCHAR(100),m.discharge_date_time,23) >= CONVERT(VARCHAR(100),#{startDate,jdbcType=NCHAR},23)
</when>
<when test="endDate != null and endDate != ''">
and CONVERT(VARCHAR(100),m.discharge_date_time,23) &lt;=CONVERT(VARCHAR(100),#{endDate,jdbcType=NCHAR},23)
</when>
</choose>
</select>
<delete id="deleteById" parameterType="java.lang.Integer">
@ -513,9 +525,21 @@
<if test="updater != null">
and f.updater = #{updater,jdbcType=NVARCHAR}
</if>
<if test="updateTime != null">
<!--<if test="updateTime != null">
and f.update_time = #{updateTime,jdbcType=NCHAR}
</if>
</if>-->
<choose>
<when test="startDate != null and startDate != '' and endDate != null and endDate != ''">
and CONVERT(VARCHAR(100),f.update_time,23) between CONVERT(VARCHAR(100),#{startDate,jdbcType=NCHAR},23) and
#{endDate,jdbcType=NCHAR}
</when>
<when test="startDate != null and startDate != ''">
and CONVERT(VARCHAR(100),f.update_time,23) >= CONVERT(VARCHAR(100),#{startDate,jdbcType=NCHAR},23)
</when>
<when test="endDate != null and endDate != ''">
and CONVERT(VARCHAR(100),f.update_time,23) &lt;= #{endDate,jdbcType=NCHAR}
</when>
</choose>
<if test="inpNo != null and inpNo != ''">
and m.inp_no like '%'+#{inpNo,jdbcType=NCHAR}+'%'
</if>
@ -542,60 +566,63 @@
</if>
</select>
<select id="getQualityControlList" parameterType="com.emr.entity.Emr_Fault_Vo" resultMap="BaseResultMap2">
select m.inp_no,m.visit_id,g.Name dept_name,m.name,m.discharge_date_time,m.ArchiveState,m.score,t.price,
t.type_flag,t.type_name, e.content,e.back_content,m.DOCTOR_IN_CHARGE,e.creater,e.create_time
select m.inp_no,m.visit_id,m.name,m.discharge_date_time,m.ArchiveState,ISNULL(m.score, 100) score,m.content,m.back_content,m.DOCTOR_IN_CHARGE,m.creater,m.create_time,ISNULL(t.price, 0) price,t.type_flag,t.type_name,g.code dept_code,ISNULL(g.Name, m.dept_name) dept_name
from(
select m.id,m.inp_no,m.visit_id,m.name,m.discharge_date_time,m.dept_name,m.ArchiveState,m.score,e.assort_id,e.content,e.back_content,m.DOCTOR_IN_CHARGE,e.creater,e.create_time
from Archive_Master m
inner join emr_fault_detail e on e.archive_detail_id = m.id
inner join emr_fault_type t on e.assort_id = t.id
inner join (select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where typeCode='dept_code' )) g
right join (select archive_detail_id,assort_id,content,back_content,creater,create_time from emr_fault_detail where 1=1 and back_flag in(5,6)) e
on e.archive_detail_id = m.id
)m
LEFT join emr_fault_type t on m.assort_id = t.id
left join (select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where typeCode='dept_code' )) g
on m.dept_name=g.code
where 1=1 and e.back_flag in(5,6)
<if test="inpNo != null and inpNo != ''">
and m.inp_no like '%'+#{inpNo,jdbcType=NCHAR}+'%'
</if>
<if test="visitId != null and visitId != ''">
and m.visit_id=#{visitId,jdbcType=NCHAR}
</if>
<if test="name != null and name != ''">
and m.name like '%'+#{name,jdbcType=NCHAR}+'%'
</if>
<if test="archivestate != null and archivestate != ''">
and m.ArchiveState=#{archivestate,jdbcType=NCHAR}
</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 m.discharge_date_time = #{dischargeDateTime,jdbcType=NVARCHAR}
</if>
<if test="creater != null and creater != ''">
and e.creater like '%'+#{creater,jdbcType=NCHAR}+'%'
</if>
<if test="doctorInCharge != null and doctorInCharge != ''">
and m.DOCTOR_IN_CHARGE like '%'+#{doctorInCharge,jdbcType=NCHAR}+'%'
</if>
<choose>
<when test="startDate != null and startDate != '' and endDate != null and endDate != ''">
and m.discharge_date_time between CONVERT(VARCHAR(10),#{startDate,jdbcType=NCHAR},120) and
#{endDate,jdbcType=NCHAR}+ ' 23:59:59'
</when>
<when test="startDate != null and startDate != ''">
and m.discharge_date_time >= CONVERT(VARCHAR(10),#{startDate,jdbcType=NCHAR},120)
</when>
<when test="endDate != null and endDate != ''">
and m.discharge_date_time &lt;= #{endDate,jdbcType=NCHAR}+ ' 23:59:59'
</when>
</choose>
<if test="updater!= null and updater!= ''">
and t.id in
<foreach item="item" collection="updater.split(',')" open="(" separator="," close=")">
#{item}
</foreach>
</if>
order by e.create_time desc
<where> 1=1
<if test="inpNo != null and inpNo != ''">
and m.inp_no like '%'+#{inpNo,jdbcType=NCHAR}+'%'
</if>
<if test="visitId != null and visitId != ''">
and m.visit_id=#{visitId,jdbcType=NCHAR}
</if>
<if test="name != null and name != ''">
and m.name like '%'+#{name,jdbcType=NCHAR}+'%'
</if>
<if test="archivestate != null and archivestate != ''">
and m.ArchiveState=#{archivestate,jdbcType=NCHAR}
</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 m.discharge_date_time = #{dischargeDateTime,jdbcType=NVARCHAR}
</if>
<if test="creater != null and creater != ''">
and m.creater like '%'+#{creater,jdbcType=NCHAR}+'%'
</if>
<if test="doctorInCharge != null and doctorInCharge != ''">
and m.DOCTOR_IN_CHARGE like '%'+#{doctorInCharge,jdbcType=NCHAR}+'%'
</if>
<choose>
<when test="startDate != null and startDate != '' and endDate != null and endDate != ''">
and CONVERT(VARCHAR(100),m.discharge_date_time,23) between CONVERT(VARCHAR(100),#{startDate,jdbcType=NCHAR},23) and
CONVERT(VARCHAR(100),#{endDate,jdbcType=NCHAR},23)
</when>
<when test="startDate != null and startDate != ''">
and CONVERT(VARCHAR(100),m.discharge_date_time,23) >= CONVERT(VARCHAR(100),#{startDate,jdbcType=NCHAR},23)
</when>
<when test="endDate != null and endDate != ''">
and CONVERT(VARCHAR(100),m.discharge_date_time,23) &lt;=CONVERT(VARCHAR(100),#{endDate,jdbcType=NCHAR},23)
</when>
</choose>
<if test="updater!= null and updater!= ''">
and t.id in
<foreach item="item" collection="updater.split(',')" open="(" separator="," close=")">
#{item}
</foreach>
</if>
</where>
order by m.create_time desc
</select>
</mapper>

@ -64,54 +64,58 @@
</sql>
<select id="selectSignList" parameterType="Sign_List_Vo" resultMap="BaseResultMapNew">
select
DISTINCT m.id,f.name dept_name,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,d.name as deptAdmissionTo,m.isscaned,(select COUNT(*) from archive_other where archive_other.pid=s.pid)as num
from archive_other s
left join archive_master m
on s.masterID=m.id
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
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(*) from archive_other where archive_other.pid=s.pid)as num
from archive_other s
left join archive_master m
on s.masterID=m.id
where s.id in(
(select top 1 id from archive_other a where a.pid=s.pid and a.masterID=s.masterID ORDER BY createdtime desc)
)
<if test="id != null and id != ''"> and s.ID = #{id}</if>
<if test="pid != null and pid != ''"> and s.pid = #{pid}</if>
<choose>
<when test="startSignDate != null and startSignDate != '' and endSignDate != null and endSignDate != ''">
and s.createdtime between CONVERT(VARCHAR(10),#{startSignDate,jdbcType=NCHAR},120) and
#{endSignDate,jdbcType=NCHAR}+ ' 23:59:59'
</when>
<when test="startSignDate != null and startSignDate != ''">
and s.createdtime >= CONVERT(VARCHAR(10),#{startDate,jdbcType=NCHAR},120)
</when>
<when test="endSignDate != null and endSignDate != ''">
and s.createdtime &lt;= #{endSignDate,jdbcType=NCHAR}+ ' 23:59:59'
</when>
</choose>
<if test="otherInfo != null and otherInfo != ''"> and s.otherInfo = #{otherInfo}</if>
<if test="masterID != null and masterID != ''"> and s.masterID = #{masterID}</if>
<if test="detailID != null and detailID != ''"> and s.detailID = #{detailID}</if>
<if test="dTime != null and dTime != ''"> and s.dTime = #{dTime}</if>
<if test="c1 != null and c1 != ''"> and s.C1 = #{c1}</if>
<if test="c2 != null and c2 != ''"> and s.C2 = #{c2}</if>
<if test="c3 != null and c3 != ''"> and s.C3 = #{c3}</if>
<if test="c4 != null and c4 != ''"> and s.C4 = #{c4}</if>
<if test="c5 != null and c5 != ''"> and s.C5 = #{c5}</if>
<if test="n1 != null and n1 != '' "> and s.N1 = #{n1}</if>
<if test="n2 != null and n2 != ''"> and s.N2 = #{n2}</if>
<if test="n3 != null and n3 != ''"> and s.N3 = #{n3} </if>
<if test="t1 != null and t1 != ''"> and s.T1 = #{t1}</if>
<if test="t2 != null and t2 != ''"> and s.T2 = #{t2}</if>
<if test="t3 != null and t3 != ''"> and s.T3 = #{t3}</if>
<if test="isFullText != null and isFullText != ''"> and s.IsFullText = #{isFullText}</if>
<if test="inpNo != null and inpNo != ''"> and m.inp_no = #{inpNo}</if>
<if test="visitId != null and visitId != ''"> and m.visit_id = #{visitId}</if>
<if test="name != null and name != ''"> and m.name like '%'+#{name}+'%'</if>
and s.sysFlag ='1'
)s
LEFT JOIN emr_dictionary d
on m.dept_admission_to=d.code
on s.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 s.id in(
(select top 1 id from archive_other a where a.pid=s.pid and a.masterID=s.masterID ORDER BY createdtime desc)
)
<if test="id != null and id != ''"> and s.ID = #{id}</if>
<if test="pid != null and pid != ''"> and s.pid = #{pid}</if>
<choose>
<when test="startSignDate != null and startSignDate != '' and endSignDate != null and endSignDate != ''">
and s.createdtime between CONVERT(VARCHAR(10),#{startSignDate,jdbcType=NCHAR},120) and
#{endSignDate,jdbcType=NCHAR}+ ' 23:59:59'
</when>
<when test="startSignDate != null and startSignDate != ''">
and s.createdtime >= CONVERT(VARCHAR(10),#{startDate,jdbcType=NCHAR},120)
</when>
<when test="endSignDate != null and endSignDate != ''">
and s.createdtime &lt;= #{endSignDate,jdbcType=NCHAR}+ ' 23:59:59'
</when>
</choose>
<if test="otherInfo != null and otherInfo != ''"> and s.otherInfo = #{otherInfo}</if>
<if test="masterID != null and masterID != ''"> and s.masterID = #{masterID}</if>
<if test="detailID != null and detailID != ''"> and s.detailID = #{detailID}</if>
<if test="dTime != null and dTime != ''"> and s.dTime = #{dTime}</if>
<if test="c1 != null and c1 != ''"> and s.C1 = #{c1}</if>
<if test="c2 != null and c2 != ''"> and s.C2 = #{c2}</if>
<if test="c3 != null and c3 != ''"> and s.C3 = #{c3}</if>
<if test="c4 != null and c4 != ''"> and s.C4 = #{c4}</if>
<if test="c5 != null and c5 != ''"> and s.C5 = #{c5}</if>
<if test="n1 != null and n1 != '' "> and s.N1 = #{n1}</if>
<if test="n2 != null and n2 != ''"> and s.N2 = #{n2}</if>
<if test="n3 != null and n3 != ''"> and s.N3 = #{n3} </if>
<if test="t1 != null and t1 != ''"> and s.T1 = #{t1}</if>
<if test="t2 != null and t2 != ''"> and s.T2 = #{t2}</if>
<if test="t3 != null and t3 != ''"> and s.T3 = #{t3}</if>
<if test="isFullText != null and isFullText != ''"> and s.IsFullText = #{isFullText}</if>
<if test="inpNo != null and inpNo != ''"> and m.inp_no = #{inpNo}</if>
<if test="visitId != null and visitId != ''"> and m.visit_id = #{visitId}</if>
<if test="name != null and name != ''"> and m.name like '%'+#{name}+'%'</if>
and s.sysFlag ='1'
on s.dept_name=f.code
ORDER BY s.dTime desc
</select>

@ -53,20 +53,20 @@
and not (datepart(weekday,discharge_date_time)=1 or datepart(weekday,discharge_date_time)=7)
<choose>
<when test="startDate != null and startDate != '' and endDate != null and endDate != ''">
and discharge_date_time between CONVERT(VARCHAR(10),#{startDate,jdbcType=NCHAR},120) and
#{endDate,jdbcType=NCHAR}+ ' 23:59:59'
and CONVERT(VARCHAR(10),discharge_date_time,120) between CONVERT(VARCHAR(10),#{startDate,jdbcType=NCHAR},120) and
#{endDate,jdbcType=NCHAR}
</when>
<when test="startDate != null and startDate != ''">
and discharge_date_time >= CONVERT(VARCHAR(10),#{startDate,jdbcType=NCHAR},120)
and CONVERT(VARCHAR(10),discharge_date_time,120) >= CONVERT(VARCHAR(10),#{startDate,jdbcType=NCHAR},120)
</when>
<when test="endDate != null and endDate != ''">
and discharge_date_time &lt;= #{endDate,jdbcType=NCHAR}+ ' 23:59:59'
and CONVERT(VARCHAR(10),discharge_date_time,120) &lt;= #{endDate,jdbcType=NCHAR}
</when>
</choose>
group by dept_name) as t on c.dept_name= t.dept_name
left join (select dept_name,COUNT(*) AS isOutNum from archive_master as s where s.ArchiveState!='在院'
and not (datepart(weekday,discharge_date_time)=1 or datepart(weekday,discharge_date_time)=7)
<choose>
<!--<choose>
<when test="startDate != null and startDate != '' and endDate != null and endDate != ''">
and discharge_date_time between CONVERT(VARCHAR(10),#{startDate,jdbcType=NCHAR},120) and
#{endDate,jdbcType=NCHAR}+ ' 23:59:59'
@ -77,10 +77,21 @@
<when test="endDate != null and endDate != ''">
and discharge_date_time &lt;= #{endDate,jdbcType=NCHAR}+ ' 23:59:59'
</when>
</choose>
</choose>-->
<choose>
<when test="startDate != null and startDate != '' and endDate != null and endDate != ''">
and CONVERT(VARCHAR(10),discharge_date_time,120) between CONVERT(VARCHAR(10),#{startDate,jdbcType=NCHAR},120) and
#{endDate,jdbcType=NCHAR}
</when>
<when test="startDate != null and startDate != ''">
and CONVERT(VARCHAR(10),discharge_date_time,120) >= CONVERT(VARCHAR(10),#{startDate,jdbcType=NCHAR},120)
</when>
<when test="endDate != null and endDate != ''">
and CONVERT(VARCHAR(10),discharge_date_time,120) &lt;= #{endDate,jdbcType=NCHAR}
</when>
</choose>
group by dept_name) as t1 on c.dept_name= t1.dept_name
left join (
SELECT a.dept_name,ISNULL(timeOutNum, 0) timeOutNum FROM archive_master AS a LEFT JOIN (
select s.dept_name as dept_name,COUNT(*) AS timeOutNum from archive_master as s
@ -96,7 +107,7 @@
</if>
and not (datepart(weekday,discharge_date_time)=1 or datepart(weekday,discharge_date_time)=7) group by dept_name
) x ON a.dept_name = x.dept_name
<choose>
<!--<choose>
<when test="startDate != null and startDate != '' and endDate != null and endDate != ''">
and discharge_date_time between CONVERT(VARCHAR(10),#{startDate,jdbcType=NCHAR},120) and
#{endDate,jdbcType=NCHAR}+ ' 23:59:59'
@ -107,12 +118,24 @@
<when test="endDate != null and endDate != ''">
and discharge_date_time &lt;= #{endDate,jdbcType=NCHAR}+ ' 23:59:59'
</when>
</choose>
</choose>-->
<choose>
<when test="startDate != null and startDate != '' and endDate != null and endDate != ''">
and CONVERT(VARCHAR(10),discharge_date_time,120) between CONVERT(VARCHAR(10),#{startDate,jdbcType=NCHAR},120) and
#{endDate,jdbcType=NCHAR}
</when>
<when test="startDate != null and startDate != ''">
and CONVERT(VARCHAR(10),discharge_date_time,120) >= CONVERT(VARCHAR(10),#{startDate,jdbcType=NCHAR},120)
</when>
<when test="endDate != null and endDate != ''">
and CONVERT(VARCHAR(10),discharge_date_time,120) &lt;= #{endDate,jdbcType=NCHAR}
</when>
</choose>
) as n1 on c.dept_name= n1.dept_name
left join (select dept_name,COUNT(*) AS fileNum from archive_master as s where s.ArchiveState in('已归档','已认证')
and not (datepart(weekday,discharge_date_time)=1 or datepart(weekday,discharge_date_time)=7)
<choose>
<!-- <choose>
<when test="startDate != null and startDate != '' and endDate != null and endDate != ''">
and discharge_date_time between CONVERT(VARCHAR(10),#{startDate,jdbcType=NCHAR},120) and
#{endDate,jdbcType=NCHAR}+ ' 23:59:59'
@ -123,11 +146,23 @@
<when test="endDate != null and endDate != ''">
and discharge_date_time &lt;= #{endDate,jdbcType=NCHAR}+ ' 23:59:59'
</when>
</choose>
</choose>-->
<choose>
<when test="startDate != null and startDate != '' and endDate != null and endDate != ''">
and CONVERT(VARCHAR(10),discharge_date_time,120) between CONVERT(VARCHAR(10),#{startDate,jdbcType=NCHAR},120) and
#{endDate,jdbcType=NCHAR}
</when>
<when test="startDate != null and startDate != ''">
and CONVERT(VARCHAR(10),discharge_date_time,120) >= CONVERT(VARCHAR(10),#{startDate,jdbcType=NCHAR},120)
</when>
<when test="endDate != null and endDate != ''">
and CONVERT(VARCHAR(10),discharge_date_time,120) &lt;= #{endDate,jdbcType=NCHAR}
</when>
</choose>
group by dept_name) as t2 on c.dept_name= t2.dept_name
left join (select dept_name,COUNT(*) AS unfileNum from archive_master as s where s.ArchiveState not in('已归档','已认证')
and not (datepart(weekday,discharge_date_time)=1 or datepart(weekday,discharge_date_time)=7)
<choose>
<!-- <choose>
<when test="startDate != null and startDate != '' and endDate != null and endDate != ''">
and discharge_date_time between CONVERT(VARCHAR(10),#{startDate,jdbcType=NCHAR},120) and
#{endDate,jdbcType=NCHAR}+ ' 23:59:59'
@ -138,11 +173,23 @@
<when test="endDate != null and endDate != ''">
and discharge_date_time &lt;= #{endDate,jdbcType=NCHAR}+ ' 23:59:59'
</when>
</choose>
</choose>-->
<choose>
<when test="startDate != null and startDate != '' and endDate != null and endDate != ''">
and CONVERT(VARCHAR(10),discharge_date_time,120) between CONVERT(VARCHAR(10),#{startDate,jdbcType=NCHAR},120) and
#{endDate,jdbcType=NCHAR}
</when>
<when test="startDate != null and startDate != ''">
and CONVERT(VARCHAR(10),discharge_date_time,120) >= CONVERT(VARCHAR(10),#{startDate,jdbcType=NCHAR},120)
</when>
<when test="endDate != null and endDate != ''">
and CONVERT(VARCHAR(10),discharge_date_time,120) &lt;= #{endDate,jdbcType=NCHAR}
</when>
</choose>
group by dept_name) as t3 on c.dept_name= t3.dept_name
left join (select dept_name,COUNT(*) AS deathNum from archive_master as s where s.DISCHARGE_DISPOSITION=5
and not (datepart(weekday,discharge_date_time)=1 or datepart(weekday,discharge_date_time)=7)
<choose>
<!--<choose>
<when test="startDate != null and startDate != '' and endDate != null and endDate != ''">
and discharge_date_time between CONVERT(VARCHAR(10),#{startDate,jdbcType=NCHAR},120) and
#{endDate,jdbcType=NCHAR}+ ' 23:59:59'
@ -153,11 +200,23 @@
<when test="endDate != null and endDate != ''">
and discharge_date_time &lt;= #{endDate,jdbcType=NCHAR}+ ' 23:59:59'
</when>
</choose>
</choose>-->
<choose>
<when test="startDate != null and startDate != '' and endDate != null and endDate != ''">
and CONVERT(VARCHAR(10),discharge_date_time,120) between CONVERT(VARCHAR(10),#{startDate,jdbcType=NCHAR},120) and
#{endDate,jdbcType=NCHAR}
</when>
<when test="startDate != null and startDate != ''">
and CONVERT(VARCHAR(10),discharge_date_time,120) >= CONVERT(VARCHAR(10),#{startDate,jdbcType=NCHAR},120)
</when>
<when test="endDate != null and endDate != ''">
and CONVERT(VARCHAR(10),discharge_date_time,120) &lt;= #{endDate,jdbcType=NCHAR}
</when>
</choose>
group by dept_name) as t4 on c.dept_name= t4.dept_name
left join (select dept_name,COUNT(*) AS Num from archive_master as s where s.ArchiveState in('已归档','已认证') and datediff(d,discharge_date_time,getdate())&lt;=2
and not (datepart(weekday,discharge_date_time)=1 or datepart(weekday,discharge_date_time)=7)
<choose>
<!--<choose>
<when test="startDate != null and startDate != '' and endDate != null and endDate != ''">
and discharge_date_time between CONVERT(VARCHAR(10),#{startDate,jdbcType=NCHAR},120) and
#{endDate,jdbcType=NCHAR}+ ' 23:59:59'
@ -168,11 +227,23 @@
<when test="endDate != null and endDate != ''">
and discharge_date_time &lt;= #{endDate,jdbcType=NCHAR}+ ' 23:59:59'
</when>
</choose>
</choose>-->
<choose>
<when test="startDate != null and startDate != '' and endDate != null and endDate != ''">
and CONVERT(VARCHAR(10),discharge_date_time,120) between CONVERT(VARCHAR(10),#{startDate,jdbcType=NCHAR},120) and
#{endDate,jdbcType=NCHAR}
</when>
<when test="startDate != null and startDate != ''">
and CONVERT(VARCHAR(10),discharge_date_time,120) >= CONVERT(VARCHAR(10),#{startDate,jdbcType=NCHAR},120)
</when>
<when test="endDate != null and endDate != ''">
and CONVERT(VARCHAR(10),discharge_date_time,120) &lt;= #{endDate,jdbcType=NCHAR}
</when>
</choose>
group by dept_name) as t5 on c.dept_name= t5.dept_name
left join (select dept_name,COUNT(*) AS Num from archive_master as s where s.ArchiveState in('已归档','已认证') and datediff(d,discharge_date_time,getdate())&lt;=3
and not (datepart(weekday,discharge_date_time)=1 or datepart(weekday,discharge_date_time)=7)
<choose>
<!--<choose>
<when test="startDate != null and startDate != '' and endDate != null and endDate != ''">
and discharge_date_time between CONVERT(VARCHAR(10),#{startDate,jdbcType=NCHAR},120) and
#{endDate,jdbcType=NCHAR}+ ' 23:59:59'
@ -183,11 +254,23 @@
<when test="endDate != null and endDate != ''">
and discharge_date_time &lt;= #{endDate,jdbcType=NCHAR}+ ' 23:59:59'
</when>
</choose>
</choose>-->
<choose>
<when test="startDate != null and startDate != '' and endDate != null and endDate != ''">
and CONVERT(VARCHAR(10),discharge_date_time,120) between CONVERT(VARCHAR(10),#{startDate,jdbcType=NCHAR},120) and
#{endDate,jdbcType=NCHAR}
</when>
<when test="startDate != null and startDate != ''">
and CONVERT(VARCHAR(10),discharge_date_time,120) >= CONVERT(VARCHAR(10),#{startDate,jdbcType=NCHAR},120)
</when>
<when test="endDate != null and endDate != ''">
and CONVERT(VARCHAR(10),discharge_date_time,120) &lt;= #{endDate,jdbcType=NCHAR}
</when>
</choose>
group by dept_name) as t6 on c.dept_name= t6.dept_name
left join (select dept_name,COUNT(*) AS Num from archive_master as s where s.ArchiveState in('已归档','已认证') and datediff(d,discharge_date_time,getdate())&lt;=7
and not (datepart(weekday,discharge_date_time)=1 or datepart(weekday,discharge_date_time)=7)
<choose>
<!--<choose>
<when test="startDate != null and startDate != '' and endDate != null and endDate != ''">
and discharge_date_time between CONVERT(VARCHAR(10),#{startDate,jdbcType=NCHAR},120) and
#{endDate,jdbcType=NCHAR}+ ' 23:59:59'
@ -198,7 +281,19 @@
<when test="endDate != null and endDate != ''">
and discharge_date_time &lt;= #{endDate,jdbcType=NCHAR}+ ' 23:59:59'
</when>
</choose>
</choose>-->
<choose>
<when test="startDate != null and startDate != '' and endDate != null and endDate != ''">
and CONVERT(VARCHAR(10),discharge_date_time,120) between CONVERT(VARCHAR(10),#{startDate,jdbcType=NCHAR},120) and
#{endDate,jdbcType=NCHAR}
</when>
<when test="startDate != null and startDate != ''">
and CONVERT(VARCHAR(10),discharge_date_time,120) >= CONVERT(VARCHAR(10),#{startDate,jdbcType=NCHAR},120)
</when>
<when test="endDate != null and endDate != ''">
and CONVERT(VARCHAR(10),discharge_date_time,120) &lt;= #{endDate,jdbcType=NCHAR}
</when>
</choose>
group by dept_name) as t7 on c.dept_name= t7.dept_name
left join (SELECT code,Name FROM emr_dictionary ) as t8 on c.dept_name=t8.code
) v_count where 1=1

@ -1903,7 +1903,7 @@
//初始化类别
var selectStr = "";
var assortIdArr=[];
function getAssortFun() {
$.ajax({
url: "${path}/zdAssort/getAssort",
@ -1912,12 +1912,14 @@
async: true,
success: function (result) {
if (result.length > 0) {
assortIdArr=[];
if (result != null) {
selectStr = "<select class='selectB'>";
for (i = 0; i < result.length; i++) {
selectStr += "<option value='" + result[i].assortId + "' title='" + result[i].assortName + "'>" + result[i].assortName + "</option>";
$("#inpGl").append("<option value=" + result[i].assortId + ">" + result[i].assortName + "</option>");
$("#inpType").append("<option value=" + result[i].assortId + ">" + result[i].assortName + "</option>");
assortIdArr.push(result[i].assortId);
}
selectStr += " </select>";
}
@ -1997,9 +1999,10 @@
toastr.success("操作成功!");
//$('#addFile').attr("src", $("#outDateLab").val() + ".pdf");//.val($("#outDateLab").val()+".pdf");
//toastr.error("上传PDF失败!");
initTree($("#idLab").html());
//刷新
$('#table2').bootstrapTable('refresh');
initTree($("#idLab").html());
}
});
@ -2880,13 +2883,6 @@
$(function () {
//日期控件
$(".input-daterange").datepicker({
format: "yyyy-mm-dd",
language: "zh-CN"
});
var url = window.location.href;
var index = url.substring(url.lastIndexOf('?') + 1).replace("num=", "");
if (index != null && index != "" && index.indexOf("excel") != -1) {
@ -2989,6 +2985,16 @@
getDoctorInCharge();
});
//日期控件
$(".input-daterange").datepicker({
format: "yyyy-mm-dd",
language: "zh-CN"
});
var currDate=getCurrDate();
var currDate30=getCurrDay30();
$('#startDateTo').val(currDate30);
$('#endDateTo').val(currDate);
$("#imgsClearBtn2").click(function () {
//console.log("===清空删除页的图片===");
$(".img_div2").empty();
@ -4833,12 +4839,19 @@
return html;
}, events: {
'click .editInfo': function (e, value, row, index) {
//判断是否包含类型
var assortIDFlag=assortIdArr.indexOf(row.assortId);
//console.log(row);
if (row.pdfPath != null && row.pdfPath != "") {
//console.log("===:" + row.pdfPath.indexOf(row.assortId + ".pdf") != -1);
if (row.pdfPath.indexOf(row.assortId + ".pdf") != -1) {
$("#upPdfDiv").hide();
$("#inpType").attr("disabled", "true");
//判断该分段类是否存在,如果存在禁止修改,如果不存在则显示可修改项
if(assortIDFlag!=-1) {
$("#inpType").attr("disabled", "true");
}else{
toastr.warning("分段类不存在,需修改类!");
}
} else {
$("#upPdfDiv").show();
@ -4852,14 +4865,20 @@
$("#addFile").show();
} else {
$("#addFile").hide();
$("#inpType").attr("disabled", "true");
if(assortIDFlag!=-1) {
$("#inpType").attr("disabled", "true");
}else{
toastr.warning("分段类不存在,需修改类!");
}
}
//同步
$("#inpId").val(row.id);
$("#inpTitle").val(row.title);
$("#inpType").val(row.assortId);
if(row.assortId!=null && row.assortId!="" && assortIDFlag!=-1){
$("#inpType").val(row.assortId);
}
$("#inpSource").val(row.source);
$("#inpFlag").val(row.flag);
$("#pageNumber").val(row.pageNumber);
@ -5170,12 +5189,13 @@
},
callback: {
beforeClick: function (treeId, treeNode) {
$('#table2').bootstrapTable('uncheckAll');
$("#assortId").html(treeNode.id);
//查询之后重新从第一页算起
$('#table2').bootstrapTable('refreshOptions', {limit: 1, offset: 10});
//刷新
$('#table2').bootstrapTable('refresh');
// idArr = [];
idArr = [];
}
}
};
@ -5238,6 +5258,7 @@
data: {"id": id, flag: "1"},
success: function (result) {
if (result == 1) {
initTree($("#idLab").html());
//刷新
$('#table2').bootstrapTable('refresh');
toastr.success("批量作废成功!");
@ -5264,7 +5285,7 @@
data: {"id": id, flag: "0"},
success: function (result) {
if (result == 1) {
initTree($("#idLab").html());
//刷新
$('#table2').bootstrapTable('refresh');
toastr.success("批量使用成功!");
@ -5308,6 +5329,7 @@
data: {"id": id, flag: "1"},
success: function (result) {
if (result == 1) {
initTree($("#idLab").html());
//刷新
$('#table2').bootstrapTable('refresh');
toastr.success("作废成功!");

@ -1703,7 +1703,7 @@
//初始化类别
var selectStr = "";
var assortIdArr=[];
function getAssortFun() {
$.ajax({
url: "${path}/zdAssort/getAssort",
@ -1711,16 +1711,18 @@
//data: {patientId: $("#idLab").html()},
async: true,
success: function (result) {
if (result.length > 0) {
if (result != null) {
selectStr = "<select class='selectB'>";
for (i = 0; i < result.length; i++) {
selectStr += "<option value='" + result[i].assortId + "' title='"+result[i].assortName+"'>" + result[i].assortName + "</option>";
$("#inpGl").append("<option value=" + result[i].assortId + ">" + result[i].assortName + "</option>");
$("#inpType").append("<option value=" + result[i].assortId + ">" + result[i].assortName + "</option>");
}
selectStr += " </select>";
if (result != null && result.length > 0) {
assortIdArr=[];
selectStr = "<select class='selectB'>";
for (i = 0; i < result.length; i++) {
selectStr += "<option value='" + result[i].assortId + "' title='"+result[i].assortName+"'>" + result[i].assortName + "</option>";
$("#inpGl").append("<option value=" + result[i].assortId + ">" + result[i].assortName + "</option>");
$("#inpType").append("<option value=" + result[i].assortId + ">" + result[i].assortName + "</option>");
assortIdArr.push(result[i].assortId);
}
selectStr += " </select>";
}
}, error: function () {
// toastr.error("加载失败!");
@ -1787,18 +1789,20 @@
toastr.warning(result);
}
$('#assortModal').modal('hide'); //手动关闭
initTree($("#idLab").html());
//刷新
$('#table2').bootstrapTable('refresh');
initTree($("#idLab").html());
}, error: function (result) {
$('#assortModal').modal('hide'); //手动关闭
toastr.success("操作成功!");
//$('#addFile').attr("src", $("#outDateLab").val() + ".pdf");//.val($("#outDateLab").val()+".pdf");
//toastr.error("上传PDF失败!");
initTree($("#idLab").html());
//刷新
$('#table2').bootstrapTable('refresh');
initTree($("#idLab").html());
}
});
@ -2316,11 +2320,6 @@
});
$(function () {
//日期控件
$(".input-daterange").datepicker({
format: "yyyy-mm-dd",
language: "zh-CN"
});
var url = window.location.href;
var index = url.substring(url.lastIndexOf('?') + 1).replace("num=", "");
@ -2409,6 +2408,15 @@
}
getDept();
});
//日期控件
$(".input-daterange").datepicker({
format: "yyyy-mm-dd",
language: "zh-CN"
});
var currDate=getCurrDate();
var currDate30=getCurrDay30();
$('#startDateTo').val(currDate30);
$('#endDateTo').val(currDate);
$("#imgsClearBtn2").click(function () {
//console.log("===清空删除页的图片===");
@ -4162,12 +4170,12 @@
}
if (row.source != null && row.source != "") {
if (row.source.indexOf("后台") != -1) {
//if (row.source.indexOf("后台") != -1) {
if (index != null && index != "" && index.indexOf("delPage") != -1) {
//return '<button class="btn btn-danger btn-sm" onclick="selectFun(\'' + row + '\')">查看 </button>';
html = html + '<button type="button" class="btn btn-primary btn-sm delPdfPage" >删除页 </button>';// '<a href="javascript:;" class="delete">删除</a>';
}
}
//}
}
@ -4177,12 +4185,19 @@
return html;
}, events: {
'click .editInfo': function (e, value, row, index) {
//判断是否包含类型
var assortIDFlag=assortIdArr.indexOf(row.assortId);
//console.log(row);
if (row.pdfPath != null && row.pdfPath != "") {
//console.log("===:" + row.pdfPath.indexOf(row.assortId + ".pdf") != -1);
if (row.pdfPath.indexOf(row.assortId + ".pdf") != -1) {
$("#upPdfDiv").hide();
$("#inpType").attr("disabled", "true");
//判断该分段类是否存在,如果存在禁止修改,如果不存在则显示可修改项
if(assortIDFlag!=-1) {
$("#inpType").attr("disabled", "true");
}else{
toastr.warning("分段类不存在,需修改类!");
}
} else {
$("#upPdfDiv").show();
@ -4196,14 +4211,20 @@
$("#addFile").show();
} else {
$("#addFile").hide();
$("#inpType").attr("disabled", "true");
if(assortIDFlag!=-1) {
$("#inpType").attr("disabled", "true");
}else{
toastr.warning("分段类不存在,需修改类!");
}
}
//同步
$("#inpId").val(row.id);
$("#inpTitle").val(row.title);
$("#inpType").val(row.assortId);
if(row.assortId!=null && row.assortId!="" && assortIDFlag!=-1){
$("#inpType").val(row.assortId);
}
$("#inpSource").val(row.source);
$("#inpFlag").val(row.flag);
$("#pageNumber").val(row.pageNumber);
@ -4934,6 +4955,41 @@
var zNodes = [];
var nodeList = [];
var setting = {
view: {
addHoverDom: false,
removeHoverDom: false,
selectedMulti: false,
autoCancelSelected: false
},
check: {
enable: true
},
data: {
simpleData: {
enable: true,
idKey: "id",
pIdKey: "pId",
rootPId: "0"
}
},
edit: {
enable: false
},
callback: {
beforeClick: function (treeId, treeNode) {
$('#table2').bootstrapTable('uncheckAll');
$("#assortId").html(treeNode.id);
//查询之后重新从第一页算起
$('#table2').bootstrapTable('refreshOptions', {limit: 1, offset: 10});
//刷新
//$('#table2').bootstrapTable('refresh');
idArr = [];
}
}
};
function initTree(patientId) {
var target = document.getElementById('foo');
spinner.spin(target);//给id为foo的div 中绑上spinner
@ -4983,40 +5039,6 @@
}
var setting = {
view: {
addHoverDom: false,
removeHoverDom: false,
selectedMulti: false,
autoCancelSelected: false
},
check: {
enable: true
},
data: {
simpleData: {
enable: true,
idKey: "id",
pIdKey: "pId",
rootPId: "0"
}
},
edit: {
enable: false
},
callback: {
beforeClick: function (treeId, treeNode) {
$("#assortId").html(treeNode.id);
//查询之后重新从第一页算起
$('#table2').bootstrapTable('refreshOptions', {limit: 1, offset: 10});
//刷新
$('#table2').bootstrapTable('refresh');
//idArr = [];
}
}
};
function searchNode() {
var zTree = $.fn.zTree.getZTreeObj("ztree");
var value = $("#key").val();
@ -5087,6 +5109,7 @@
data: {"id": id, flag: "1"},
success: function (result) {
if (result == 1) {
initTree($("#idLab").html());
//刷新
$('#table2').bootstrapTable('refresh');
toastr.success("批量作废成功!");
@ -5113,6 +5136,7 @@
data: {"id": id, flag: "0"},
success: function (result) {
if (result == 1) {
initTree($("#idLab").html());
//刷新
$('#table2').bootstrapTable('refresh');
toastr.success("批量使用成功!");
@ -5156,6 +5180,7 @@
data: {"id": id, flag: "1"},
success: function (result) {
if (result == 1) {
initTree($("#idLab").html());
//刷新
$('#table2').bootstrapTable('refresh');
toastr.success("作废成功!");

@ -272,7 +272,7 @@
}
getFaultType();
var pageVal=0;
function initTable() {
if(tipLoad==1){
$("#table").bootstrapTable({ // 对应table标签的id
@ -422,6 +422,9 @@
field: 'deptName',
align: 'left',
valign: 'middle',
formatter: function (value, row, index) {
return value;
}
},
{
title: '出院日期',
@ -592,6 +595,7 @@
//查询之后重新从第一页算起
if (tipLoad == 0) {
$("#table").bootstrapTable("refreshOptions", {pageNumber: 1}); //刷新
//$('#table').bootstrapTable('refresh');
} else {
toastr.warning("正在查询,请稍等...");
}
@ -621,16 +625,9 @@
})
}
getUserList()
getUserList();
$(function () {
//日期控件
$(".input-daterange").datepicker({
format:"yyyy-mm-dd",
language:"zh-CN"
});
var url = window.location.href;
var index = url.substring(url.lastIndexOf('?') + 1).replace("num=", "");
if (index != null && index != "" && index.indexOf("excel") != -1) {
@ -694,6 +691,15 @@
// });
});
//日期控件
$(".input-daterange").datepicker({
format:"yyyy-mm-dd",
language:"zh-CN"
});
var currDate=getCurrDate();
var currDate30=getCurrDay30();
$('#startDate').val(currDate30);
$('#endDate').val(currDate);
initTable();
@ -717,7 +723,7 @@
var startDate = "" + $("#startDate").val();
var endDate = "" + $("#endDate").val();
var archivestate = "" + $("#archivestate").val();
var url = window.location.href;
/*var url = window.location.href;
var deptName = url.substring(url.lastIndexOf('&') + 1).replace("depts=", "");
var len = ($("#deptName").val()).length;
@ -726,6 +732,13 @@
if (deptNameT.indexOf("") == -1) {
deptName = $("#deptName").val().toString();
}
}*/
var deptName = $("#deptName").val();
if (deptName.indexOf("") != -1) {
deptName = "";
} else {
deptName = $("#deptName").val().toString();
}
//主管医生、创建人、缺陷选项

@ -1107,12 +1107,13 @@
},
callback: {
beforeClick: function (treeId, treeNode) {
$('#table2').bootstrapTable('uncheckAll');
$("#assortId").html(treeNode.id);
//查询之后重新从第一页算起
$('#table2').bootstrapTable('refreshOptions', {limit: 1, offset: 10});
//刷新
$('#table2').bootstrapTable('refresh');
//idArr = [];
//$('#table2').bootstrapTable('refresh');
idArr = [];
}
}
@ -1284,6 +1285,10 @@
format: "yyyy-mm-dd",
language: "zh-CN"
});
var currDate=getCurrDate();
var currDate30=getCurrDay30();
$('#startDateTo').val(currDate30);
$('#endDateTo').val(currDate);
var url = window.location.href;
var index = url.substring(url.lastIndexOf('?') + 1).replace("num=", "");
@ -1469,7 +1474,7 @@
function closeShadeImg() {
// $(".shadeImg").fadeOut(500);
}
var assortIdArr=[];
function getAssortFun() {
$.ajax({
url: "${path}/zdAssort/getAssort",
@ -1477,17 +1482,17 @@
//data: {patientId: $("#idLab").html()},
async: true,
success: function (result) {
if (result.length > 0) {
if (result != null) {
selectStr = "<select class='selectB'>";
for (i = 0; i < result.length; i++) {
selectStr += "<option value='" + result[i].assortId + "' title='"+result[i].assortName+"'>" + result[i].assortName + "</option>";
$("#inpGl").append("<option value='" + result[i].assortId + "' title='"+result[i].assortName+"'>" + result[i].assortName + "</option>");
//下拉类别
$("#inpType").append("<option value='" + result[i].assortId + "' title='"+result[i].assortName+"'>" + result[i].assortName + "</option>");
}
selectStr += " </select>";
if (result != null && result.length > 0) {
assortIdArr=[];
selectStr = "<select class='selectB'>";
for (i = 0; i < result.length; i++) {
selectStr += "<option value='" + result[i].assortId + "' title='"+result[i].assortName+"'>" + result[i].assortName + "</option>";
$("#inpGl").append("<option value='" + result[i].assortId + "' title='"+result[i].assortName+"'>" + result[i].assortName + "</option>");
//下拉类别
$("#inpType").append("<option value='" + result[i].assortId + "' title='"+result[i].assortName+"'>" + result[i].assortName + "</option>");
assortIdArr.push(result[i].assortId);
}
selectStr += " </select>";
}
}, error: function () {
// toastr.error("加载失败!");
@ -1555,18 +1560,20 @@
toastr.warning(result);
}
$('#assortModal').modal('hide'); //手动关闭
initTree($("#idLab").html());
//刷新
$('#table2').bootstrapTable('refresh');
initTree($("#idLab").html());
}, error: function (result) {
$('#assortModal').modal('hide'); //手动关闭
toastr.success("操作成功!");
//$('#addFile').attr("src", $("#outDateLab").val() + ".pdf");//.val($("#outDateLab").val()+".pdf");
//toastr.error("上传PDF失败!");
initTree($("#idLab").html());
//刷新
$('#table2').bootstrapTable('refresh');
initTree($("#idLab").html());
}
});
@ -2892,12 +2899,18 @@
return html;
}, events: {
'click .editInfo': function (e, value, row, index) {
//判断是否包含类型
var assortIDFlag=assortIdArr.indexOf(row.assortId);
if (row.pdfPath != null && row.pdfPath != "") {
//console.log("===:" + row.pdfPath.indexOf(row.assortId + ".pdf") != -1);
if (row.pdfPath.indexOf(row.assortId + ".pdf") != -1) {
$("#upPdfDiv").hide();
$("#inpType").attr("disabled", "true");
//判断该分段类是否存在,如果存在禁止修改,如果不存在则显示可修改项
if(assortIDFlag!=-1) {
$("#inpType").attr("disabled", "true");
}else{
toastr.warning("分段类不存在,需修改类!");
}
} else {
$("#upPdfDiv").show();
@ -2911,7 +2924,11 @@
$("#addFile").show();
} else {
$("#addFile").hide();
$("#inpType").attr("disabled", "true");
if(assortIDFlag!=-1) {
$("#inpType").attr("disabled", "true");
}else{
toastr.warning("分段类不存在,需修改类!");
}
}
@ -2919,7 +2936,9 @@
//同步
$("#inpId").val(row.id);
$("#inpTitle").val(row.title);
$("#inpType").val(row.assortId);
if(row.assortId!=null && row.assortId!="" && assortIDFlag!=-1){
$("#inpType").val(row.assortId);
}
$("#inpSource").val(row.source);
$("#inpFlag").val(row.flag);
// console.log(row);
@ -3314,6 +3333,7 @@
data: {"id": id, flag: "1"},
success: function (result) {
if (result == 1) {
initTree($("#idLab").html());
//刷新
$('#table2').bootstrapTable('refresh');
toastr.success("批量作废成功!");
@ -3342,6 +3362,7 @@
data: {"id": id, flag: "0"},
success: function (result) {
if (result == 1) {
initTree($("#idLab").html());
//刷新
$('#table2').bootstrapTable('refresh');
toastr.success("批量使用成功!");
@ -3364,6 +3385,7 @@
data: {"id": id, flag: "1"},
success: function (result) {
if (result == 1) {
initTree($("#idLab").html());
//刷新
$('#table2').bootstrapTable('refresh');
toastr.success("作废成功!");

@ -493,22 +493,22 @@
<option value="0">否</option>
</select>
</div>
<div class="form-group divCss8" style="margin-top: 10px">
<label>是否签收:</label>
<select class="selectpicker bla bla bli" data-live-search="true" name="isSign" id="isSign" title="是否签收">
<option value="">全部</option>
<option value="1">是</option>
<option value="0">否</option>
</select>
</div>
<div class="form-group divCss8" style="margin-top: 10px" title="是否打印">
<label>是否打印:</label>
<select class="selectpicker bla bla bli" id="printNum">
<option value="">全部</option>
<option value="1">已打印</option>
<option value="0">未打印</option>
</select>
</div>
<div class="form-group divCss8" style="margin-top: 10px">
<label>是否签收:</label>
<select class="selectpicker bla bla bli" data-live-search="true" name="isSign" id="isSign" title="是否签收">
<option value="">全部</option>
<option value="1">是</option>
<option value="0">否</option>
</select>
</div>
<div class="form-group divCss8" style="margin-top: 10px" title="是否打印">
<label>是否打印:</label>
<select class="selectpicker bla bla bli" id="printNum">
<option value="">全部</option>
<option value="1">已打印</option>
<option value="0">未打印</option>
</select>
</div>
<%--<div class="form-group divCss2">--%>
<%--<label for="archivestate">归档状态:</label>--%>
<%--<select class="input-sm form-control" id="archivestate">--%>
@ -771,7 +771,7 @@
<button type="button" class="btn btn-default btn-sm" id="uploadBtn">上传文件</button>
<button type="button" class="btn btn-info btn-sm" id="pdfBtn">查看分段PDF</button>
<button type="button" class="btn btn-success btn-sm" id="pdfBtn2">查看PDF</button>
<%-- <button type="button" class="btn btn-info btn-sm" id="pdfBtn3">查看扫描PDF</button>--%>
<%-- <button type="button" class="btn btn-info btn-sm" id="pdfBtn3">查看扫描PDF</button>--%>
<%--<button type="button" class="btn btn-primary btn-sm" id="addBtn">添加清单</button>--%>
<button type="button" class="btn btn-warning btn-sm" id="updateStateBtn">选中作废
</button>
@ -1765,11 +1765,11 @@
//通过图片名判断图片在数组中的位置然后删除
// console.log(fileList[j].name + "111");
if(fileList[j].name!=undefined)
if (fileList[j].name == filename) {
fileList.splice(j, 1);
id--;
break;
}
if (fileList[j].name == filename) {
fileList.splice(j, 1);
id--;
break;
}
}
files = fileList;
var id = $(r).parent().attr('id');
@ -1813,12 +1813,12 @@
for (var j = 0; j < fileList.length; j++) {
//通过图片名判断图片在数组中的位置然后删除
if(fileList[j].name!=undefined)
if (fileList[j].name == filename) {
fileList.splice(j, 1);
id--;
files = fileList;
break;
}
if (fileList[j].name == filename) {
fileList.splice(j, 1);
id--;
files = fileList;
break;
}
}
}
@ -1853,7 +1853,7 @@
//初始化类别
var selectStr = "";
var assortIdArr=[];
function getAssortFun() {
$.ajax({
url: "${path}/zdAssort/getAssort",
@ -1861,16 +1861,16 @@
//data: {patientId: $("#idLab").html()},
async: true,
success: function (result) {
if (result.length > 0) {
if (result != null) {
selectStr = "<select class='selectB'>";
for (i = 0; i < result.length; i++) {
selectStr += "<option value='" + result[i].assortId + "' title='"+result[i].assortName+"'>" + result[i].assortName + "</option>";
$("#inpGl").append("<option value=" + result[i].assortId + ">" + result[i].assortName + "</option>");
$("#inpType").append("<option value=" + result[i].assortId + ">" + result[i].assortName + "</option>");
}
selectStr += " </select>";
if (result != null && result.length > 0) {
assortIdArr=[];
selectStr = "<select class='selectB'>";
for (i = 0; i < result.length; i++) {
selectStr += "<option value='" + result[i].assortId + "' title='"+result[i].assortName+"'>" + result[i].assortName + "</option>";
$("#inpGl").append("<option value=" + result[i].assortId + ">" + result[i].assortName + "</option>");
$("#inpType").append("<option value=" + result[i].assortId + ">" + result[i].assortName + "</option>");
assortIdArr.push(result[i].assortId);
}
selectStr += " </select>";
}
}, error: function () {
// toastr.error("加载失败!");
@ -1937,18 +1937,20 @@
toastr.warning(result);
}
$('#assortModal').modal('hide'); //手动关闭
initTree($("#idLab").html());
//刷新
$('#table2').bootstrapTable('refresh');
initTree($("#idLab").html());
}, error: function (result) {
$('#assortModal').modal('hide'); //手动关闭
toastr.success("操作成功!");
//$('#addFile').attr("src", $("#outDateLab").val() + ".pdf");//.val($("#outDateLab").val()+".pdf");
//toastr.error("上传PDF失败!");
initTree($("#idLab").html());
//刷新
$('#table2').bootstrapTable('refresh');
initTree($("#idLab").html());
}
});
@ -2418,17 +2420,17 @@
$("#verifyBtn").on('click', function () {
var isscaned=""+$("#isScaned2").val();
var isSign=""+$("#isSign2").val();
if(((isscaned=="1") && (isSign=="1"))||(isscaned=="0")){
//无纸质 或 有纸质且已签收
verinfyFun();
}else{
//弹窗是否强制提交
$('#verinfyQZModal').modal({
backdrop: 'static',//backdrop 为 static 时,点击模态对话框的外部区域不会将其关闭。
keyboard: false,//keyboard 为 false 时,按下 Esc 键不会关闭 Modal。
show: true//弹出对话框
});
}
if(((isscaned=="1") && (isSign=="1"))||(isscaned=="0")){
//无纸质 或 有纸质且已签收
verinfyFun();
}else{
//弹窗是否强制提交
$('#verinfyQZModal').modal({
backdrop: 'static',//backdrop 为 static 时,点击模态对话框的外部区域不会将其关闭。
keyboard: false,//keyboard 为 false 时,按下 Esc 键不会关闭 Modal。
show: true//弹出对话框
});
}
});
$("#verinfyQZBtn").on('click', function () {
//有纸质且未签收,强制提交
@ -2437,11 +2439,6 @@
});
$(function () {
//日期控件
$(".input-daterange").datepicker({
format: "yyyy-mm-dd",
language: "zh-CN"
});
var url = window.location.href;
var index = url.substring(url.lastIndexOf('?') + 1).replace("num=", "");
@ -2498,6 +2495,18 @@
});
//日期控件
$(".input-daterange").datepicker({
format: "yyyy-mm-dd",
language: "zh-CN"
});
var currDate=getCurrDate();
var currDate30=getCurrDay30();
$('#startDateTo').val(currDate30);
$('#endDateTo').val(currDate);
$('#startDateTo2').val(currDate30);
$('#endDateTo2').val(currDate);
function getDept() {
//获取科室列表
$.ajax({
@ -3809,12 +3818,12 @@
}
}
if (index.indexOf("signFlg") != -1) {
if(row.isSign==0 && row.isscaned==1){
//签收显示取消签收
html += '<button type="button" class="btn btn-sm btn-warning signInfo" style="visibility: hidden;">签收</button>';
if(row.isSign==0 && row.isscaned==1){
//签收显示取消签收
html += '<button type="button" class="btn btn-sm btn-warning signInfo" style="visibility: hidden;">签收</button>';
}else if(row.isSign==1 && row.isscaned==1){
html += '<button type="button" class="btn btn-sm btn-warning signCancelInfo" style="visibility: hidden;">取消签收</button>';
}
html += '<button type="button" class="btn btn-sm btn-warning signCancelInfo" style="visibility: hidden;">取消签收</button>';
}
}
return html;
@ -3926,7 +3935,7 @@
var visitId=row.visitId;
var isSign=1;
if(inpNo!=null && inpNo!="" && inpNo!=undefined && inpNo!="undefined"
&& visitId!=null && visitId!="" && inpNo!=undefined && visitId!="undefined"){
&& visitId!=null && visitId!="" && inpNo!=undefined && visitId!="undefined"){
updateSignStateFun(inpNo,visitId,isSign);
}else{
toastr.warning("签收值格式应为:住院号-住院次数!");
@ -4353,14 +4362,19 @@
return html;
}, events: {
'click .editInfo': function (e, value, row, index) {
//判断是否包含类型
var assortIDFlag=assortIdArr.indexOf(row.assortId);
//console.log(row);
if (row.pdfPath != null && row.pdfPath != "") {
//console.log("===:" + row.pdfPath.indexOf(row.assortId + ".pdf") != -1);
if (row.pdfPath.indexOf(row.assortId + ".pdf") != -1) {
$("#upPdfDiv").hide();
$("#inpType").attr("disabled", "true");
//判断该分段类是否存在,如果存在禁止修改,如果不存在则显示可修改项
if(assortIDFlag!=-1) {
$("#inpType").attr("disabled", "true");
}else{
toastr.warning("分段类不存在,需修改类!");
}
} else {
$("#upPdfDiv").show();
$("#inpType").removeAttr("disabled");
@ -4373,14 +4387,19 @@
$("#addFile").show();
} else {
$("#addFile").hide();
$("#inpType").attr("disabled", "true");
if(assortIDFlag!=-1) {
$("#inpType").attr("disabled", "true");
}else{
toastr.warning("分段类不存在,需修改类!");
}
}
//同步
$("#inpId").val(row.id);
$("#inpTitle").val(row.title);
$("#inpType").val(row.assortId);
if(row.assortId!=null && row.assortId!="" && assortIDFlag!=-1){
$("#inpType").val(row.assortId);
}
$("#inpSource").val(row.source);
$("#inpFlag").val(row.flag);
$("#pageNumber").val(row.pageNumber);
@ -4888,13 +4907,14 @@
},
callback: {
beforeClick: function (treeId, treeNode) {
$('#table2').bootstrapTable('uncheckAll');
$("#assortId").html(treeNode.id);
$("#source").html("");
//查询之后重新从第一页算起
$('#table2').bootstrapTable('refreshOptions', {limit: 1, offset: 10});
//刷新
$('#table2').bootstrapTable('refresh');
//idArr = [];
//$('#table2').bootstrapTable('refresh');
idArr = [];
}
}
@ -4957,7 +4977,9 @@
type: "POST",
data: {"id": id, flag: "1"},
success: function (result) {
//console.log(result);
if (result == 1) {
initTree($("#idLab").html());
//刷新
$('#table2').bootstrapTable('refresh');
toastr.success("批量作废成功!");
@ -4984,6 +5006,7 @@
data: {"id": id, flag: "0"},
success: function (result) {
if (result == 1) {
initTree($("#idLab").html());
//刷新
$('#table2').bootstrapTable('refresh');
toastr.success("批量使用成功!");
@ -5027,6 +5050,7 @@
data: {"id": id, flag: "1"},
success: function (result) {
if (result == 1) {
initTree($("#idLab").html());
//刷新
$('#table2').bootstrapTable('refresh');
toastr.success("作废成功!");

@ -369,7 +369,7 @@
</div>
<div class="form-group divCss">
<label>处理时间:</label>
<div class="input-daterange input-group">
<div class="input-daterange input-group" id="datepicker">
<input type="text" class="input-sm form-control" name="start" id="startHandleTime"/>
<span class="input-group-addon">-</span>
<input type="text" class="input-sm form-control" name="end" id="endHandleTime"/>
@ -1737,11 +1737,6 @@
}
});
$(function () {
//日期控件
$(".input-daterange").datepicker({
format: "yyyy-mm-dd",
language: "zh-CN"
});
var url = window.location.href;
var index = url.substring(url.lastIndexOf('?') + 1).replace("num=", "");
@ -1792,7 +1787,15 @@
// }
});
//日期控件
$(".input-daterange").datepicker({
format: "yyyy-mm-dd",
language: "zh-CN"
});
var currDate=getCurrDate();
var currDate30=getCurrDay30();
$('#startHandleTime').val(currDate30);
$('#endHandleTime').val(currDate);
function getDept() {
//获取科室列表

@ -274,7 +274,7 @@
</div>
<div class="form-group divCss8">
<label>初审日期:</label>
<div class="input-daterange input-group">
<div class="input-daterange input-group" id="datepicker">
<input type="text" class="input-sm form-control" name="start" id="createTimeStart"/>
<span class="input-group-addon">-</span>
<input type="text" class="input-sm form-control" name="end" id="createTimeEnd"/>
@ -1611,12 +1611,6 @@
}
});
$(function () {
//日期控件
$(".input-daterange").datepicker({
format: "yyyy-mm-dd",
language: "zh-CN"
});
var url = window.location.href;
var index = url.substring(url.lastIndexOf('?') + 1).replace("num=", "");
@ -1667,6 +1661,15 @@
});
//日期控件
$(".input-daterange").datepicker({
format: "yyyy-mm-dd",
language: "zh-CN"
});
var currDate=getCurrDate();
var currDate30=getCurrDay30();
$('#startDate').val(currDate30);
$('#endDate').val(currDate);
function getDept() {
//获取科室列表

@ -139,12 +139,6 @@
$(function () {
//日期控件
$(".input-daterange").datepicker({
format: "yyyy-mm-dd",
language: "zh-CN"
});
var url = window.location.href;
var index = url.substring(url.lastIndexOf('?') + 1).replace("num=", "");
if (index != null && index != "" && index.indexOf("excel") != -1) {
@ -155,7 +149,15 @@
$(".columns-right").hide();
}
});
//日期控件
$(".input-daterange").datepicker({
format: "yyyy-mm-dd",
language: "zh-CN"
});
var currDate=getCurrDate();
var currDate30=getCurrDay30();
$('#startDate').val(currDate30);
$('#endDate').val(currDate);
//处理导出内容,这个方法可以自定义某一行、某一列、甚至某个单元格的内容,也就是将其值设置为自己想要的内容
function DoOnCellHtmlData(cell, row, col, data) {

@ -103,6 +103,7 @@
<option value="已归档">已归档</option>
</select>
</div>
<div class="form-group divCss8" id="deptDiv" style="height: 18px;margin-top: -7px;">
<label>入院科室 :</label>
<%--<select class="input-sm form-control" id="deptName">--%>
@ -127,6 +128,14 @@
<option value="未召回">未召回</option>
</select>
</div>
<div class="form-group divCss8">
<label>出院日期:</label>
<div class="input-daterange input-group" id="datepicker">
<input type="text" class="input-sm form-control" name="start" id="startDate"/>
<span class="input-group-addon">-</span>
<input type="text" class="input-sm form-control" name="end" id="endDate"/>
</div>
</div>
<button type="button" class="btn btn-primary btn-sm divCss"id="searchBtn">查询</button>
<button type="button" class="btn btn-info btn-sm divCss" id="excelBtn">条件导出</button>
</div>
@ -282,11 +291,7 @@
var tipLoad = 1;
$(function () {
//日期控件
$(".input-daterange").datepicker({
format: "yyyy-mm-dd",
language: "zh-CN"
});
var url = window.location.href;
var index = url.substring(url.lastIndexOf('?') + 1).replace("num=", "");
@ -340,8 +345,15 @@
getDept();
});
//日期控件
$(".input-daterange").datepicker({
format: "yyyy-mm-dd",
language: "zh-CN"
});
var currDate=getCurrDate();
var currDate30=getCurrDay30();
$('#startDate').val(currDate30);
$('#endDate').val(currDate);
//处理导出内容,这个方法可以自定义某一行、某一列、甚至某个单元格的内容,也就是将其值设置为自己想要的内容
function DoOnCellHtmlData(cell, row, col, data) {
@ -444,6 +456,8 @@
name:""+$("#name").val(),
archivestate: "" + $("#archivestate").val(),
state:"" + $("#state").val(),
startDate: $("#startDate").val(),
endDate: $("#endDate").val(),
deptName: $("#deptName").val().toString()
};
return temp;

@ -1,4 +1,4 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<c:set value="${pageContext.request.contextPath}" var="path" scope="page"/>
<html>
@ -92,7 +92,14 @@
<label for="name">姓名:</label>
<input type="text" class="input-sm form-control" id="name" placeholder="请输入姓名">
</div>
<div class="form-group divCss8">
<label>封存日期:</label>
<div class="input-daterange input-group" id="datepicker">
<input type="text" class="input-sm form-control" name="start" id="startDateTo" />
<span class="input-group-addon">-</span>
<input type="text" class="input-sm form-control" name="end" id="endDateTo"/>
</div>
</div>
<div class="form-group divCss8">
<label for="archivestate">归档状态 :</label>
<select class="input-sm form-control" id="archivestate">
@ -215,11 +222,7 @@
var tipLoad = 1;
$(function () {
//日期控件
$(".input-daterange").datepicker({
format: "yyyy-mm-dd",
language: "zh-CN"
});
var url = window.location.href;
var index = url.substring(url.lastIndexOf('?') + 1).replace("num=", "");
@ -269,7 +272,23 @@
}
getDept();
//console.log("======1111============"+startDateV);
});
//日期控件
$(".input-daterange").datepicker({
format: "yyyy-mm-dd",
language: "zh-CN"
});
var currDate=getCurrDate();
var currDate30=getCurrDay30();
$('#startDateTo').val(currDate30);
$('#endDateTo').val(currDate);
//处理导出内容,这个方法可以自定义某一行、某一列、甚至某个单元格的内容,也就是将其值设置为自己想要的内容
@ -292,265 +311,272 @@
}
function initTable() {
if (tipLoad == 1) {
$("#table").bootstrapTable({ // 对应table标签的id
//method: 'POST',
url: "${path}/storage/StorageList", // 获取表格数据的url
contentType: "application/x-www-form-urlencoded",//一种编码。好像在post请求的时候需要用到。这里用的get请求注释掉这句话也能拿到数据
//dataField: "data",//这是返回的json数组的key.默认是"rows".这里只有前后端约定好就行
cache: false, // 设置为 false 禁用 AJAX 数据缓存, 默认为true
striped: true, //表格显示条纹默认为false
pagination: true, // 在表格底部显示分页组件默认false
paginationShowPageGo: true,
pageList: [10, 20, 50, 100], // 如果设置了分页设置可供选择的页面数据条数。设置为All 则显示所有记录。
smartDisplay: false,
pageSize: 2, // 页面数据条数
pageNumber: 1, // 初始化加载第一页,默认第一页
sidePagination: 'server', // 设置为服务器端分页 客户端client
search: false,
showColumns: true,
// sortable: true,
// sortOrder: "asc",
toolbar: '#toolbar',//指定工具栏
searchOnEnterKey: true, //设置为 true时按回车触发搜索方法否则自动触发搜索方法
undefinedText: '---', //当数据为 undefined 时显示的字符
singleSelect: false,//设置True 将禁止多选
clickToSelect: true,//设置true 将在点击行时自动选择rediobox 和 checkbox
//height: 560, //定义表格的高度。
searchTimeOut: 500,// 默认500 设置搜索超时时间。
toolbarAlign: 'right',// 指定 toolbar 水平方向的位置。'left' 或 'right'
paginationDetailHAlign: 'left',//指定 分页详细信息 在水平方向的位置。'left' 或 'right'。
showHeader: true,//是否显示列头。
trimOnSearch: true,//设置为 true 将自动去掉搜索字符的前后空格。
//是否显示导出按钮
showExport: true,
//导出表格方式默认basic只导出当前页的表格数据all导出所有数据selected导出选中的数据
exportDataType: "basic",
//导出文件类型
exportTypes: ['json', 'xml', 'csv', 'txt', 'sql', 'excel'],
exportOptions: {
fileName: document.title
},
queryParams: function (params) {
var currPageSize = this.pageSize;
if (currPageSize == 2) {
currPageSize = 10;
$("#table").bootstrapTable({ // 对应table标签的id
//method: 'POST',
url: "${path}/storage/StorageList", // 获取表格数据的url
contentType: "application/x-www-form-urlencoded",//一种编码。好像在post请求的时候需要用到。这里用的get请求注释掉这句话也能拿到数据
//dataField: "data",//这是返回的json数组的key.默认是"rows".这里只有前后端约定好就行
cache: false, // 设置为 false 禁用 AJAX 数据缓存, 默认为true
striped: true, //表格显示条纹默认为false
pagination: true, // 在表格底部显示分页组件默认false
paginationShowPageGo: true,
pageList: [10, 20, 50, 100], // 如果设置了分页设置可供选择的页面数据条数。设置为All 则显示所有记录。
smartDisplay: false,
pageSize: 2, // 页面数据条数
pageNumber: 1, // 初始化加载第一页,默认第一页
sidePagination: 'server', // 设置为服务器端分页 客户端client
search: false,
showColumns: true,
// sortable: true,
// sortOrder: "asc",
toolbar: '#toolbar',//指定工具栏
searchOnEnterKey: true, //设置为 true时按回车触发搜索方法否则自动触发搜索方法
undefinedText: '---', //当数据为 undefined 时显示的字符
singleSelect: false,//设置True 将禁止多选
clickToSelect: true,//设置true 将在点击行时自动选择rediobox 和 checkbox
//height: 560, //定义表格的高度。
searchTimeOut: 500,// 默认500 设置搜索超时时间。
toolbarAlign: 'right',// 指定 toolbar 水平方向的位置。'left' 或 'right'
paginationDetailHAlign: 'left',//指定 分页详细信息 在水平方向的位置。'left' 或 'right'。
showHeader: true,//是否显示列头。
trimOnSearch: true,//设置为 true 将自动去掉搜索字符的前后空格。
//是否显示导出按钮
showExport: true,
//导出表格方式默认basic只导出当前页的表格数据all导出所有数据selected导出选中的数据
exportDataType: "basic",
//导出文件类型
exportTypes: ['json', 'xml', 'csv', 'txt', 'sql', 'excel'],
exportOptions: {
fileName: document.title
},
queryParams: function (params) {
var currPageSize = this.pageSize;
if (currPageSize == 2) {
currPageSize = 10;
}
var limit = null;
var offset = params.offset;
//判断是否导出全部all
if ($("#sel_exportoption").val() == "all") {
offset = 0;
limit = this.totalRows;
this.pageSize = limit;
} else {
limit = currPageSize;
this.pageSize = currPageSize;
}
console.log("-=======startDate===="+$("#startDateTo").val());
var temp = {
limit: limit, //页面大小
offset: offset, //页码
order: params.order, //排位命令descasc
idNo: $("#idNo").val(),
inpNo: "" + $("#inpNo").val(),
visitId: "" + $("#visitId").val(),
name: "" + $("#name").val(),
archivestate: "" + $("#archivestate").val(),
// state:"" + $("#state").val(),
startDateTo:$("#startDateTo").val().toString(),
endDateTo: "" +$("#endDateTo").val(),
deptName: "" +$("#deptName").val()
};
return temp;
},
sortName: 'id', // 要排序的字段
sortOrder: 'desc', // 排序规则
columns: [{
title: '全选',
field: 'select', //复选框
checkbox: true,
width: 25,
align: 'center',
valign: 'middle',
},
{
title: '序号',
field: 'id',
align: 'center',
valign: 'middle',
//sortable: true,
visible: false,
formatter: function (value, row, index) {
return index + 1;
}
var limit = null;
var offset = params.offset;
//判断是否导出全部all
if ($("#sel_exportoption").val() == "all") {
offset = 0;
limit = this.totalRows;
this.pageSize = limit;
} else {
limit = currPageSize;
this.pageSize = currPageSize;
},
{
title: '病案清单id',
field: 'id',
align: 'left',
valign: 'left',
visible: false
},
{
title: '住院号',
field: 'inpNo',
align: 'left',
valign: 'middle',
},
{
title: '住院次数',
field: 'visitId',
align: 'center',
valign: 'middle',
},
{
title: '姓名',
field: 'name',
align: 'left',
valign: 'middle',
},
{
title: '性别',
field: 'sex',
align: 'center',
valign: 'middle',
},
{
title: '身份证号',
field: 'idNo',
align: 'left',
valign: 'middle',
visible: false
},
{
title: '入院科室',
field: 'deptAdmissionTo',
align: 'center',
valign: 'left',
},
{
title: '入院日期',
field: 'admissionDateTime',
align: 'center',
},
{
title: '出院科室',
field: 'deptName',
align: 'center',
valign: 'middle',
},
{
title: '出院日期',
field: 'dischargeDateTime',
align: 'center',
valign: 'middle',
formatter: function (value, row, index) {
return value.substring(0, 10);
}
//var url = window.location.href;
//var deptName = '';
//var deptName = url.substring(url.lastIndexOf('&') + 1).replace("depts=", "");
// var len = ($("#deptName").val()).length;
// if (len > 0) {
// var deptNameT = $("#deptName").val();
// if (deptNameT.indexOf("") == -1) {
// deptName = $("#deptName").val().toString();
// }
// formatter: function (value, row, index) {
// return value
// }
// var url = window.location.href;
// var deptName = url.substring(url.lastIndexOf('&') + 1).replace("depts=", "");
/* var len = value.length;
if (len > 0) {
if (value.indexOf("") == -1) {
deptName = value.toString();
},
/*{
title: '上次封存状态',
field: 'state',
align: 'center',
valign: 'middle',
formatter: function (value, row, index) {
//在院 未归档 归档中 初审 已归档 已认证
var a = '';
if (value == "已封存") {
a = '<span style="color:red"><i class="fa fa-check-circle-o" aria-hidden="true"></i>'+ value +'</span>';
} else {
a = '<span style="color:#ccc;"><i class="fa fa-times-circle-o" aria-hidden="true"></i>'+ value +'</span>';
}
}*/
var deptNameA = $("#deptName").val().toString();
if (deptNameA.indexOf("") != -1 && deptNameA.length<=0) {
deptNameA = "";
return a;
}
},*/
{
title: '归档状态',
field: 'archivestate',
align: 'center',
valign: 'middle',
formatter: function (value, row, index) {
if (value == "未归档") {
a = '<span style="color:#c12e2a;"><i class="fa fa-times-circle-o" aria-hidden="true"></i>' + value + '</span>';
} else if (value == "已归档") {
a = '<span style="color:#030378"><i class="fa fa-check-circle-o" aria-hidden="true"></i>' + value + '</span>';
} else if (value == "在院") {
a = '<span style="color:#bfa200"><i class="fa fa-check-circle-o" aria-hidden="true"></i>' + value + '</span>';
} else if (value == "归档中") {
a = '<span style="color:#698B69"><i class="fa fa-check-circle-o" aria-hidden="true"></i>' + value + '</span>';
} else if (value == "初审") {
a = '<span style="color:#8FBC8F"><i class="fa fa-check-circle-o" aria-hidden="true"></i>' + value + '</span>';
} else if (value == "已封存") {
a = '<span style="color:#FF7F24"><i class="fa fa-check-circle-o" aria-hidden="true"></i>' + value + '</span>';
} else if (value == "复审退回") {
a = '<span style="color:#db0ead"><i class="fa fa-check-circle-o" aria-hidden="true"></i>' + value + '</span>';
} else if (value == "提交") {
a = '<span style="color:blue"><i class="fa fa-check-circle-o" aria-hidden="true"></i>' + value + '</span>';
} else if (value == "主任退回") {
a = '<span style="color:#0000FF"><i class="fa fa-check-circle-o" aria-hidden="true"></i>' + value + '</span>';
}
return a;
}
var temp = {
limit: limit, //页面大小
offset: offset, //页码
order: params.order, //排位命令descasc
idNo: $("#idNo").val(),
inpNo: "" + $("#inpNo").val(),
visitId: "" + $("#visitId").val(),
name: "" + $("#name").val(),
archivestate: "" + $("#archivestate").val(),
// state:"" + $("#state").val(),
deptName: deptNameA
};
return temp;
},
sortName: 'id', // 要排序的字段
sortOrder: 'desc', // 排序规则
columns: [{
title: '全选',
field: 'select', //复选框
checkbox: true,
width: 25,
{
title: '封存人',
field: 'handleName',
align: 'center',
valign: 'left',
},
{
title: '封存时间',
field: 'handleTime',
align: 'center',
valign: 'middle',
},
{
title: '序号',
field: 'id',
align: 'center',
valign: 'middle',
//sortable: true,
visible: false,
formatter: function (value, row, index) {
return index + 1;
}
},
{
title: '病案清单id',
field: 'archiveDetailId',
align: 'left',
valign: 'middle',
visible: false
},
{
title: '住院号',
field: 'inpNo',
align: 'center',
valign: 'middle',
},
{
title: '住院次数',
field: 'visitId',
align: 'center',
valign: 'middle',
},
{
title: '姓名',
field: 'name',
align: 'center',
valign: 'middle',
},
{
title: '性别',
field: 'sex',
align: 'center',
valign: 'middle',
},
{
title: '身份证号',
field: 'idNo',
align: 'left',
valign: 'middle',
visible: false
},
{
title: '入院科室',
field: 'deptAdmissionTo',
align: 'center',
valign: 'middle',
},
{
title: '入院日期',
field: 'admissionDateTime',
align: 'center',
},
{
title: '出院科室',
field: 'deptName',
align: 'center',
valign: 'middle',
},
{
title: '出院日期',
field: 'dischargeDateTime',
align: 'center',
valign: 'middle',
formatter: function (value, row, index) {
return value.substring(0, 10);
}
// formatter: function (value, row, index) {
// return value
// }
},
/*{
title: '上次封存状态',
field: 'state',
align: 'center',
valign: 'middle',
formatter: function (value, row, index) {
//在院 未归档 归档中 初审 已归档 已认证
var a = '';
if (value == "已封存") {
a = '<span style="color:red"><i class="fa fa-check-circle-o" aria-hidden="true"></i>'+ value +'</span>';
} else {
a = '<span style="color:#ccc;"><i class="fa fa-times-circle-o" aria-hidden="true"></i>'+ value +'</span>';
}
return a;
}
},*/
{
title: '归档状态',
field: 'archivestate',
align: 'center',
valign: 'middle',
formatter: function (value, row, index) {
//在院 未归档 归档中 初审 已归档 已认证
//在院 未归档 归档中 初审 已归档 已认证 复审退回
var a = '';
if (value == "已封存") {
a = '<span style="color:#00CC00;"><i class="fa fa-times-circle-o" aria-hidden="true"></i>' + value + '</span>';
} else if (value == "已归档") {
a = '<span style="color:#030378"><i class="fa fa-check-circle-o" aria-hidden="true"></i>' + value + '</span>';
}
return a;
}
},
{
title: "操作",
align: 'left',
valign: 'middle',
width: 80, // 定义列的宽度单位为像素px
formatter: function (value, row, index) {
var url = window.location.href;
var index = url.substring(url.lastIndexOf('?') + 1).replace("num=", "");
if (index != null && index != "" && index.indexOf("recall") != -1) {
if (row.archivestate == "已封存" || row.archivestate == "已归档") {
if (row.archivestate == "已封存") {
return '<button class="btn btn-success btn-sm" onclick="recallFun(\'' + row.id + '\',\'' + row.archiveDetailId + '\')">取消封存 </button>';
//return '<button class="btn btn-warning btn-sm" onclick="recallFun(\'' + row.id + '\',\'' + row.archiveDetailId + '\')">已封存 </button>' + '<button class="btn btn-danger btn-sm" onclick="logFun(\'' + row.id + '\',\'' + row.archiveDetailId + '\',\'' + row.recallReason + '\')">日志</button>';
} else {
return '<button class="btn btn-warning btn-sm" onclick="recallFun1(\'' + row.id + '\',\'' + row.archiveDetailId + '\')">封存 </button>';
}
{
title: "操作",
align: 'left',
valign: 'middle',
width: 80, // 定义列的宽度单位为像素px
formatter: function (value, row, index) {
/*console.log(row);
var url = window.location.href;
var index = url.substring(url.lastIndexOf('?') + 1).replace("num=", "");
if (index != null && index != "" && index.indexOf("recall") != -1) {
if (row.archivestate == "已封存" || row.archivestate == "已归档") {
if (row.archivestate == "已封存") {
return '<button class="btn btn-success btn-sm" onclick="recallFun(\'' + row.id + '\',\'' + row.archiveDetailId + '\')">取消封存 </button>';
//return '<button class="btn btn-warning btn-sm" onclick="recallFun(\'' + row.id + '\',\'' + row.archiveDetailId + '\')">已封存 </button>' + '<button class="btn btn-danger btn-sm" onclick="logFun(\'' + row.id + '\',\'' + row.archiveDetailId + '\',\'' + row.recallReason + '\')">日志</button>';
} else {
return '';
return '<button class="btn btn-warning btn-sm" onclick="recallFun1(\'' + row.id + '\',\'' + row.archiveDetailId + '\')">封存 </button>';
}
} else {
return '';
}
}*/
//已封存
if (row.followingType+"" == "11") {
return '<button class="btn btn-success btn-sm" onclick="recallFun(\'' + row.id + '\',\'' + row.id + '\')">取消封存 </button>';
//return '<button class="btn btn-warning btn-sm" onclick="recallFun(\'' + row.id + '\',\'' + row.archiveDetailId + '\')">已封存 </button>' + '<button class="btn btn-danger btn-sm" onclick="logFun(\'' + row.id + '\',\'' + row.archiveDetailId + '\',\'' + row.recallReason + '\')">日志</button>';
} else {
return '<button class="btn btn-warning btn-sm" onclick="recallFun1(\'' + row.id + '\',\'' + row.id + '\')">封存 </button>';
}
},
cellStyle: function (value, row, index) {
return {classes: 'success'}
}
},
cellStyle: function (value, row, index) {
return {classes: 'success'}
}
],
onLoadSuccess: function (result) { //加载成功时执行
//console.info("加载成功");
tipLoad = 0;
},
onLoadError: function () { //加载失败时执行
//console.info("加载数据失败");
tipLoad = 0;
}
],
onLoadSuccess: function (result) { //加载成功时执行
//console.info("加载成功");
tipLoad = 0;
},
onLoadError: function () { //加载失败时执行
//console.info("加载数据失败");
tipLoad = 0;
}
});
}
});
}
function recallFun(id, archiveDetailId) {
@ -584,7 +610,7 @@
$("#table").bootstrapTable("refreshOptions", {pageNumber: 1});
} else {
toastr.warning("正在查询,请稍等...");
}
}
});
//获取table的高度
@ -613,12 +639,13 @@
var idNo = "" + $("#idNo").val();
var state = "" + $("#state").val();
var archivestate = "" + $("#archivestate").val();
var deptNameA = $("#deptName").val().toString();
if (deptNameA.indexOf("") != -1 && deptNameA.length<=0) {
deptNameA = "";
}
window.location.href = "${path}/medicalRecall/exportExcel?inpNo=" + inpNo + "&visitId=" + visitId +
"&name=" + name + "&state=" + state + "&idNo=" + idNo + "&archivestate=" + archivestate + "&deptName=" + deptNameA;
var deptNameA = "" + $("#deptName").val();
var endDateTo = "" + $("#endDateTo").val();
var startDateTo = "" + $("#startDateTo").val();
window.location.href = "${path}/storage/exportExcelStorageList?inpNo=" + inpNo + "&visitId=" + visitId +
"&name=" + name + "&state=" + state + "&idNo=" + idNo + "&archivestate=" + archivestate + "&deptName=" + deptNameA
+ "&endDateTo=" + endDateTo+ "&startDateTo=" + startDateTo;
});
$("#stateBtn").click(function () {

@ -119,11 +119,7 @@
$(function () {
//日期控件
$(".input-daterange").datepicker({
format: "yyyy-mm-dd",
language: "zh-CN"
});
var url = window.location.href;
var index = url.substring(url.lastIndexOf('?') + 1).replace("num=", "");
@ -136,6 +132,15 @@
}
});
//日期控件
$(".input-daterange").datepicker({
format: "yyyy-mm-dd",
language: "zh-CN"
});
var currDate=getCurrDate();
var currDate30=getCurrDay30();
$('#startDate').val(currDate30);
$('#endDate').val(currDate);
//处理导出内容,这个方法可以自定义某一行、某一列、甚至某个单元格的内容,也就是将其值设置为自己想要的内容
function DoOnCellHtmlData(cell, row, col, data) {

@ -1,14 +1,11 @@

<%@ page contentType="text/html;charset=UTF-8" language="java" import="java.util.*" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" import="java.util.*" import="java.util.ResourceBundle"%>
<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
<c:set value="${pageContext.request.contextPath}" var="path" scope="page"/>
<%
ResourceBundle res = ResourceBundle.getBundle("config.jdbc");
%>
<html>
<head>
<title>病案室终审</title>
<%ResourceBundle res = ResourceBundle.getBundle("config.jdbc"); %>
<meta http-equiv="Content-Type" content="text/html;charset=utf-8">
<meta name="referrer" content="never">
<!-- 解决部分兼容性问题如果安装了GCF则使用GCF来渲染页面如果未安装GCF则使用最高版本的IE内核进行渲染。 -->
@ -445,7 +442,7 @@
<%--</div>--%>
<div class="form-group divCss8">
<label for="name">签收人:</label>
<label for="signer">签收人:</label>
<input type="text" class="input-sm form-control" id="signer" placeholder="请输入签收人">
</div>
<div class="form-group divCss8" >
@ -2184,7 +2181,7 @@
$('#table').bootstrapTable('refresh');
document.getElementById('archiveIdSign').select();
toastr.success(result);
$("#signModal").hide();
$("#signModal").modal('hide');
}, error: function () {
toastr.error("操作失败!");
}
@ -2214,12 +2211,6 @@
});
$(function () {
//日期控件
$(".input-daterange").datepicker({
format: "yyyy-mm-dd",
language: "zh-CN"
});
var url = window.location.href;
var index = url.substring(url.lastIndexOf('?') + 1).replace("num=", "");
if (index != null && index != "" && index.indexOf("excel") != -1) {
@ -2275,8 +2266,15 @@
});
//日期控件
$(".input-daterange").datepicker({
format: "yyyy-mm-dd",
language: "zh-CN"
});
var currDate=getCurrDate();
var currDate30=getCurrDay30();
$('#startSignDate').val(currDate30);
$('#endSignDate').val(currDate);
function getFaultType() {
$("#faultTypeDiv").empty();
@ -2916,6 +2914,7 @@
});
}
var scollPostion1 = null;
var editSelRow=[];
var isscanedVal="";
@ -3961,7 +3960,7 @@
$("#signBtn").click(function () {
//生成表单token,防止表单重复提交
setFormToken();
//setFormToken();
//签收
$('#signModal').modal({
backdrop: 'static',//backdrop 为 static 时,点击模态对话框的外部区域不会将其关闭。
@ -3978,6 +3977,7 @@
success: function (result) {
if (result.indexOf("成功")!=-1) {
$('#archiveIdSign').val('');
setFormToken();
//刷新
$('#table').bootstrapTable('refresh');
toastr.success(result);
@ -4069,7 +4069,53 @@
//查询
$('#searchBtn').click(function () {
if (tipLoad == 0) {
var startDate=$('#startSignDate').val();
var endDate=$('#endSignDate').val();
//所有其它条件都为空
if(""+$("#inpNo").val().length<=0 && ""+$("#visitId").val().length<=0 &&""+ $("#signer").val().length<=0 ) {
//单位
var dateType = "月";
//上限
var upperLimit = 1;
if ('<%=res.getString("dateType")%>'.trim() != "" && '<%=res.getString("dateType")%>' != null && '<%=res.getString("upperLimit")%>'.trim() != "" && '<%=res.getString("upperLimit")%>' != null) {
//单位
dateType = '<%=res.getString("dateType")%>';
//上限
upperLimit = parseInt('<%=res.getString("upperLimit")%>');
//console.log(dateType+"==单位=="+"==上限="+upperLimit);
if (endDate == null || endDate == "") {
var myDate = new Date();
var nowY = myDate.getFullYear();
var nowM = myDate.getMonth() + 1;
var nowD = myDate.getDate();
endDate = nowY + "-" + (nowM < 10 ? "0" + nowM : nowM) + "-" + (nowD < 10 ? "0" + nowD : nowD);//当前日期
}
if (startDate != null && startDate != "" && endDate != null && endDate != "") {
if (dateType == "year") {
var year = YearsBetw(startDate, endDate);
if (year > upperLimit) {
toastr.warning("出院日期按年算(总年数)不得超过" + upperLimit + "年!");
return;
}
} else if (dateType == "month") {
var month = MonthsBetw(startDate, endDate);
if (month > upperLimit) {
toastr.warning("出院日期按月算(总月数)不得超过" + upperLimit + "月!");
return;
}
} else {
//天
var day = DateDiff(startDate, endDate);
if (day > upperLimit) {
toastr.warning("出院日期按天算(总天数)不得超过" + upperLimit + "天!");
return;
}
}
}
}
}
$("#table").bootstrapTable("refreshOptions", {pageNumber: 1});
} else {
toastr.warning("正在查询,请稍等...");
}

@ -1723,7 +1723,7 @@
//初始化类别
var selectStr = "";
var assortIdArr=[];
function getAssortFun() {
$.ajax({
url: "${path}/zdAssort/getAssort",
@ -1731,16 +1731,16 @@
//data: {patientId: $("#idLab").html()},
async: true,
success: function (result) {
if (result.length > 0) {
if (result != null) {
selectStr = "<select class='selectB'>";
for (i = 0; i < result.length; i++) {
selectStr += "<option value='" + result[i].assortId + "' title='"+result[i].assortName+"'>" + result[i].assortName + "</option>";
$("#inpGl").append("<option value=" + result[i].assortId + ">" + result[i].assortName + "</option>");
$("#inpType").append("<option value=" + result[i].assortId + ">" + result[i].assortName + "</option>");
}
selectStr += " </select>";
if (result != null && result.length > 0) {
assortIdArr=[];
selectStr = "<select class='selectB'>";
for (i = 0; i < result.length; i++) {
selectStr += "<option value='" + result[i].assortId + "' title='"+result[i].assortName+"'>" + result[i].assortName + "</option>";
$("#inpGl").append("<option value=" + result[i].assortId + ">" + result[i].assortName + "</option>");
$("#inpType").append("<option value=" + result[i].assortId + ">" + result[i].assortName + "</option>");
assortIdArr.push(result[i].assortId);
}
selectStr += " </select>";
}
}, error: function () {
//toastr.error("加载失败!");
@ -1807,18 +1807,19 @@
toastr.warning(result);
}
$('#assortModal').modal('hide'); //手动关闭
initTree($("#idLab").html());
//刷新
$('#table2').bootstrapTable('refresh');
initTree($("#idLab").html());
}, error: function (result) {
$('#assortModal').modal('hide'); //手动关闭
toastr.success("操作成功!");
//$('#addFile').attr("src", $("#outDateLab").val() + ".pdf");//.val($("#outDateLab").val()+".pdf");
//toastr.error("上传PDF失败!");
initTree($("#idLab").html());
//刷新
$('#table2').bootstrapTable('refresh');
initTree($("#idLab").html());
}
});
}
@ -2122,11 +2123,6 @@
}
});
$(function () {
//日期控件
$(".input-daterange").datepicker({
format: "yyyy-mm-dd",
language: "zh-CN"
});
var url = window.location.href;
var index = url.substring(url.lastIndexOf('?') + 1).replace("num=", "");
@ -2177,7 +2173,15 @@
// }
});
//日期控件
$(".input-daterange").datepicker({
format: "yyyy-mm-dd",
language: "zh-CN"
});
var currDate=getCurrDate();
var currDate30=getCurrDay30();
$('#startDate').val(currDate30);
$('#endDate').val(currDate);
function getDept() {
//获取科室列表
@ -3803,13 +3807,19 @@
return html;
}, events: {
'click .editInfo': function (e, value, row, index) {
//判断是否包含类型
var assortIDFlag=assortIdArr.indexOf(row.assortId);
//console.log(row);
if (row.pdfPath != null && row.pdfPath != "") {
//console.log("===:" + row.pdfPath.indexOf(row.assortId + ".pdf") != -1);
if (row.pdfPath.indexOf(row.assortId + ".pdf") != -1) {
$("#upPdfDiv").hide();
$("#inpType").attr("disabled", "true");
//判断该分段类是否存在,如果存在禁止修改,如果不存在则显示可修改项
if(assortIDFlag!=-1) {
$("#inpType").attr("disabled", "true");
}else{
toastr.warning("分段类不存在,需修改类!");
}
} else {
$("#upPdfDiv").show();
$("#inpType").removeAttr("disabled");
@ -3822,14 +3832,20 @@
$("#addFile").show();
} else {
$("#addFile").hide();
$("#inpType").attr("disabled", "true");
if(assortIDFlag!=-1) {
$("#inpType").attr("disabled", "true");
}else{
toastr.warning("分段类不存在,需修改类!");
}
}
//同步
$("#inpId").val(row.id);
$("#inpTitle").val(row.title);
$("#inpType").val(row.assortId);
if(row.assortId!=null && row.assortId!="" && assortIDFlag!=-1){
$("#inpType").val(row.assortId);
}
$("#inpSource").val(row.source);
$("#inpFlag").val(row.flag);
$("#pageNumber").val(row.pageNumber);
@ -4143,12 +4159,13 @@
},
callback: {
beforeClick: function (treeId, treeNode) {
$('#table2').bootstrapTable('uncheckAll');
$("#assortId").html(treeNode.id);
//查询之后重新从第一页算起
$('#table2').bootstrapTable('refreshOptions', {limit: 1, offset: 10});
//刷新
$('#table2').bootstrapTable('refresh');
//idArr = [];
//$('#table2').bootstrapTable('refresh');
idArr = [];
}
}
@ -4212,6 +4229,7 @@
data: {"id": id, flag: "1"},
success: function (result) {
if (result == 1) {
initTree($("#idLab").html());
//刷新
$('#table2').bootstrapTable('refresh');
toastr.success("批量作废成功!");
@ -4238,6 +4256,7 @@
data: {"id": id, flag: "0"},
success: function (result) {
if (result == 1) {
initTree($("#idLab").html());
//刷新
$('#table2').bootstrapTable('refresh');
toastr.success("批量使用成功!");
@ -4260,6 +4279,7 @@
data: {"id": id, flag: "1"},
success: function (result) {
if (result == 1) {
initTree($("#idLab").html());
//刷新
$('#table2').bootstrapTable('refresh');
toastr.success("作废成功!");

@ -1,15 +1,17 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" import="java.util.ResourceBundle"%>
<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<c:set value="${pageContext.request.contextPath}" var="path" scope="page"/>
<html>
<head>
<title>科室统计</title>
<meta charset="utf-8">
<%ResourceBundle res = ResourceBundle.getBundle("config.jdbc"); %>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<!-- 解决部分兼容性问题如果安装了GCF则使用GCF来渲染页面如果未安装GCF则使用最高版本的IE内核进行渲染。 -->
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<!-- 页面按原比例显示 -->
<meta name="viewport" content="width=device-width, initial-scale=1">
<script type="text/javascript" src="${path}/static/js/echarts.min.js"></script>
<%@include file="../../jspf/comm.jspf" %>
<style>
@ -90,15 +92,15 @@
<option value="">全部</option>
</select>
</div>
<div class="form-group divCss">
<div class="form-group divCss8">
<label>出院日期:</label>
<div class="input-daterange input-group" id="datepicker">
<input type="text" class="input-sm form-control" name="start" id="startDate"/>
<input type="text" class="input-sm form-control" name="start" id="startDate" />
<span class="input-group-addon">-</span>
<input type="text" class="input-sm form-control" name="end" id="endDate"/>
</div>
</div>
<div class="form-group divCss8">
<div class="form-group divCss">
<label>迟交天数为:</label>
<input type="text" class="input-sm form-control" id="overdueDays" placeholder="请输入迟交天数">
<label>天</label>
@ -169,6 +171,10 @@
format: "yyyy-mm-dd",
language: "zh-CN"
});
var currDate=getCurrDate();
var currDate30=getCurrDay30();
$('#startDate').val(currDate30);
$('#endDate').val(currDate);
var url = window.location.href;
var index = url.substring(url.lastIndexOf('?') + 1).replace("num=", "");
@ -980,8 +986,60 @@
}
//查询
$('#searchBtn').click(function () {
//判断开始和结束日期的是否超过上限
var startDate =$("#startDate").val();
var endDate =$("#endDate").val();
//所有其它条件都为空
if($("#overdueDays").val().length<=0 && $("#deptName").val().length<=0){
//单位
var dateType="月";
//上限
var upperLimit=1;
if('<%=res.getString("dateType")%>'.trim()!=""&&'<%=res.getString("dateType")%>'!=null && '<%=res.getString("upperLimit")%>'.trim()!="" &&'<%=res.getString("upperLimit")%>'!=null){
//单位
dateType='<%=res.getString("dateType")%>';
//上限
upperLimit=parseInt('<%=res.getString("upperLimit")%>');
//console.log(dateType+"==单位=="+"==上限="+upperLimit);
if(endDate==null || endDate==""){
var myDate = new Date();
var nowY = myDate.getFullYear();
var nowM = myDate.getMonth() + 1;
var nowD = myDate.getDate();
endDate = nowY + "-" + (nowM < 10 ? "0" + nowM : nowM) + "-" + (nowD < 10 ? "0" + nowD : nowD);//当前日期
}
if(startDate!=null && startDate!="" && endDate!=null && endDate!="") {
if (dateType=="year") {
var year = YearsBetw(startDate,endDate);
if(year>upperLimit){
toastr.warning("出院日期按年算(总年数)不得超过"+upperLimit+"年!");
return;
}
} else if (dateType=="month") {
var month=MonthsBetw(startDate,endDate);
if(month>upperLimit){
toastr.warning("出院日期按月算(总月数)不得超过"+upperLimit+"月!");
return;
}
} else {
//天
var day=DateDiff(startDate,endDate);
if(day>upperLimit){
toastr.warning("出院日期按天算(总天数)不得超过"+upperLimit+"天!");
return;
}
}
}
}
}
/*else{
toastr.warning("统计列表未配置日期单位及上限!");
}*/
//查询之后重新从第一页算起
if (tipLoad == 0) {
$("#table").bootstrapTable("refreshOptions", {pageNumber: 1});
@ -993,6 +1051,7 @@
//$('#table').bootstrapTable('refreshOptions', {limit: 1, offset: 10});
//刷新
//$('#table').bootstrapTable('refresh');
});
//获取table的高度

@ -13,7 +13,7 @@ function setFormToken(){
}
})
}
jQuery(function ($) {
jQuery(function ($) {
//解决模态框背景色越来越深的问题
$(document).on('show.bs.modal', '.modal', function (event) {
$(this).appendTo($('body'));
@ -87,6 +87,69 @@ jQuery(function ($) {
}
////要拖动的div背景
//$('#showErr').modal({backdrop: 'static'});
});
//设计出院日期的上限 年(年数差) 、月(月数差) 、日(天数差)
//返回两个日期相差的年数
function YearsBetw(date1, date2) { //date1和date2是2019-3-12格式
//用-分成数组
date1 = date1.split("-");
date2 = date2.split("-");
var year1 = parseInt(date1[0]),
year2 = parseInt(date2[0]),
year = (year2 - year1) ;
return year;
}
//返回两个日期相差的月数
function MonthsBetw(date1, date2) { //date1和date2是2019-3-12格式
//用-分成数组
date1 = date1.split("-");
date2 = date2.split("-");
//获取年,月数
var year1 = parseInt(date1[0]),
month1 = parseInt(date1[1]),
year2 = parseInt(date2[0]),
month2 = parseInt(date2[1]),
//通过年,月差计算月份差
months = (year2 - year1) * 12 + (month2 - month1) + 1;
return months;
}
//计算天数差的函数,通用
function DateDiff(sDate1, sDate2) { //sDate1和sDate2是2019-3-12格式
var aDate, oDate1, oDate2, iDays
aDate = sDate1.split("-")
oDate1 = new Date(aDate[1] + '-' + aDate[2] + '-' + aDate[0]) //转换为9-25-2017格式
aDate = sDate2.split("-")
oDate2 = new Date(aDate[1] + '-' + aDate[2] + '-' + aDate[0])
iDays = parseInt(Math.abs(oDate1 - oDate2) / 1000 / 60 / 60 / 24) //把相差的毫秒数转换为天数
return iDays
}
//当前日期
function getCurrDate() {
var myDate = new Date();
var nowY = myDate.getFullYear();
var nowM = myDate.getMonth() + 1;
var nowD = myDate.getDate();
var startDateV = nowY + "-" + (nowM < 10 ? "0" + nowM : nowM) + "-" + (nowD < 10 ? "0" + nowD : nowD);
return startDateV;
}
//获取三十天前日期
function getCurrDay30() {
var myDate = new Date();
var lw = new Date(myDate - 1000 * 60 * 60 * 24 * 30);//最后一个数字30可改30天的意思
var lastY = lw.getFullYear();
var lastM = lw.getMonth() + 1;
var lastD = lw.getDate();
var startdate30 = lastY + "-" + (lastM < 10 ? "0" + lastM : lastM) + "-" + (lastD < 10 ? "0" + lastD : lastD);
return startdate30;
}

Loading…
Cancel
Save