diff --git a/src/main/java/com/emr/util/Jpg2PdfUtil.java b/src/main/java/com/emr/util/Jpg2PdfUtil.java index b19fb2f..bb48c60 100644 --- a/src/main/java/com/emr/util/Jpg2PdfUtil.java +++ b/src/main/java/com/emr/util/Jpg2PdfUtil.java @@ -102,7 +102,7 @@ public class Jpg2PdfUtil { reader.close(); } }catch (Exception e){ - e.printStackTrace(); + //e.printStackTrace(); }finally { if(null != copy){ copy.close(); @@ -111,7 +111,7 @@ public class Jpg2PdfUtil { bos.flush(); bos.close(); }catch (Exception e){ - e.printStackTrace(); + //e.printStackTrace(); } if(null != document){ document.close(); diff --git a/src/main/resources/mapper/Archive_MasterMapper.xml b/src/main/resources/mapper/Archive_MasterMapper.xml index ffce137..fc5def7 100644 --- a/src/main/resources/mapper/Archive_MasterMapper.xml +++ b/src/main/resources/mapper/Archive_MasterMapper.xml @@ -1,60 +1,60 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - + @@ -77,573 +77,615 @@ - - + + id, patient_id, inp_no, visit_id, name, sex, dept_name, discharge_date_time, ArchiveState, admission_date_time, dept_admission_to, check_doctor, check_datetime, checked_doctor, checked_datetime, LockInfo, DOCTOR_IN_CHARGE, ID_NO, DISCHARGE_DISPOSITION, dept_code_lend - + + + + - select m.id,m.patient_id,m.inp_no,m.visit_id,m.name,m.sex,f.name - dept_name,m.discharge_date_time,'在院' as ArchiveState,m.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 - from archive_master m - LEFT JOIN (select code,name from emr_dictionary where parent_id='dept_code') d - on m.dept_admission_to=d.code - LEFT JOIN (select code,name from emr_dictionary where parent_id='dept_code') f - on m.dept_name=f.code - where 1=1 and YEAR(m.discharge_date_time) = '1801' - - and m.dept_name in - - #{item} - - - - and m.id = #{id,jdbcType=NVARCHAR} - - - and m.inp_no like '%'+#{inpNo,jdbcType=NCHAR}+'%' - - - and m.visit_id=#{visitId,jdbcType=NCHAR} - - - and m.name like '%'+#{name,jdbcType=NCHAR}+'%' - - - and m.ID_NO like '%'+#{idNo,jdbcType=NCHAR}+'%' - - - and m.sex = #{sex,jdbcType=NVARCHAR} - - - and m.dept_name in - - #{item} - - - - and m.discharge_date_time = #{dischargeDateTime,jdbcType=NVARCHAR} - + + + and m.admission_date_time between CONVERT(VARCHAR(10),#{startDateTo,jdbcType=NCHAR},120) and + #{endDateTo,jdbcType=NCHAR}+ ' 23:59:59' + + + and m.admission_date_time >= CONVERT(VARCHAR(10),#{startDateTo,jdbcType=NCHAR},120) + + + and m.admission_date_time <= #{endDateTo,jdbcType=NCHAR}+ ' 23:59:59' + + - - - and m.admission_date_time between CONVERT(VARCHAR(10),#{startDateTo,jdbcType=NCHAR},120) and - #{endDateTo,jdbcType=NCHAR}+ ' 23:59:59' - - - and m.admission_date_time >= CONVERT(VARCHAR(10),#{startDateTo,jdbcType=NCHAR},120) - - - and m.admission_date_time <= #{endDateTo,jdbcType=NCHAR}+ ' 23:59:59' - - + + and m.check_doctor = #{checkDoctor,jdbcType=NVARCHAR} + + + and checked_doctor = #{checkedDoctor,jdbcType=NVARCHAR} + + + and m.check_datetime = #{checkDatetime,jdbcType=NVARCHAR} + + + and m.checked_datetime = #{checkedDatetime,jdbcType=NVARCHAR} + + + and m.LockInfo = #{lockinfo,jdbcType=NVARCHAR} + + + and m.DOCTOR_IN_CHARGE LIKE '%'+#{doctorInCharge,jdbcType=NVARCHAR}+'%' + + + and m.DISCHARGE_DISPOSITION = #{dischargeDisposition,jdbcType=NVARCHAR} + + + and m.dept_code_lend = #{deptCodeLend,jdbcType=NVARCHAR} + + ORDER BY m.admission_date_time desc + - - and m.check_doctor = #{checkDoctor,jdbcType=NVARCHAR} - - - and checked_doctor = #{checkedDoctor,jdbcType=NVARCHAR} - - - and m.check_datetime = #{checkDatetime,jdbcType=NVARCHAR} - - - and m.checked_datetime = #{checkedDatetime,jdbcType=NVARCHAR} - - - and m.LockInfo = #{lockinfo,jdbcType=NVARCHAR} - - - and m.DOCTOR_IN_CHARGE LIKE '%'+#{doctorInCharge,jdbcType=NVARCHAR}+'%' - - - and m.DISCHARGE_DISPOSITION = #{dischargeDisposition,jdbcType=NVARCHAR} - - - and m.dept_code_lend = #{deptCodeLend,jdbcType=NVARCHAR} - - ORDER BY m.admission_date_time desc - + + + and ArchiveState != '1024' and ArchiveState != '128' and YEAR(discharge_date_time) != '1801' + + and m.inp_no like '%'+#{inpNo,jdbcType=NCHAR}+'%' + + + and m.visit_id=#{visitId,jdbcType=NCHAR} + + + and m.name like '%'+#{name,jdbcType=NCHAR}+'%' + + + and m.dept_name in + + #{item} + + + + + and m.discharge_date_time between CONVERT(VARCHAR(10),#{startDateTo,jdbcType=NCHAR},120) and + #{endDateTo,jdbcType=NCHAR}+ ' 23:59:59' + + + and m.discharge_date_time >= CONVERT(VARCHAR(10),#{startDateTo,jdbcType=NCHAR},120) + + + and m.discharge_date_time <= #{endDateTo,jdbcType=NCHAR}+ ' 23:59:59' + + + + and m.DOCTOR_IN_CHARGE LIKE '%'+#{doctorInCharge,jdbcType=NVARCHAR}+'%' + + - - + select * from (select m.id,m.inp_no,m.visit_id,m.name,m.sex,f.name + dept_name,m.discharge_date_time,m.ArchiveState,m.admission_date_time,d.name + dept_admission_to,m.LockInfo,m.DOCTOR_IN_CHARGE, + datediff(day,m.discharge_date_time,getdate()) - + (select COUNT(1) from emr_holiday_set where date between convert(varchar(10),m.discharge_date_time,120) + and getdate() and flag = 2)-(select CASE + WHEN m.DISCHARGE_DISPOSITION = 5 THEN + dead_days + ELSE + days + END from emr_overtime_set where id = 1) days + from archive_master m + LEFT JOIN (select code,name from emr_dictionary where parent_id='dept_code') d + on m.dept_admission_to=d.code + LEFT JOIN (select code,name from emr_dictionary where parent_id='dept_code') f + on m.dept_name=f.code + /**带完整性查询*/ + + INNER JOIN () temp + ON m.id = temp.id + + /**带状态查询*/ + + /**待审批*/ + + inner join + (select archive_flow_info.master_id from archive_flow_info + inner join + (select MAX(createtime) createtime,master_id from archive_flow_info group by master_id) temp + on archive_flow_info.master_id = temp.master_id and archive_flow_info.createtime = temp.createtime and + archive_flow_info.target_step_id in (${status})) archive_flow_info + on archive_flow_info.master_id = m.id + /**护士长*/ + + inner join + (select master_id from archive_flow_info where target_step_id in (${status}) group by master_id + having COUNT(master_id) = + 2) temp1 + on archive_flow_info.master_id = temp1.master_id + + + /**已审批*/ + + INNER JOIN + ( + SELECT + archive_flow_info.master_id + FROM archive_flow_info - INNER JOIN ( + INNER JOIN ( SELECT - MAX(createtime) createtime, - master_id + MAX(createtime) createtime, + master_id FROM - archive_flow_info + archive_flow_info GROUP BY - master_id - ) temp ON archive_flow_info.master_id = temp.master_id + master_id + ) temp ON archive_flow_info.master_id = temp.master_id AND archive_flow_info.createtime = temp.createtime AND archive_flow_info.target_step_id != #{status} INNER JOIN ( - SELECT - master_id - FROM - archive_flow_info - WHERE - start_step_id = #{status} - ) temp1 ON archive_flow_info.master_id = temp1.master_id) archive_flow_info - on archive_flow_info.master_id = m.id - - - where 1=1 and ArchiveState != '1024' and ArchiveState != '128' and YEAR(discharge_date_time) != '1801' - - and m.inp_no like '%'+#{inpNo,jdbcType=NCHAR}+'%' - - - and m.visit_id=#{visitId,jdbcType=NCHAR} - - - and m.name like '%'+#{name,jdbcType=NCHAR}+'%' - - - and m.dept_name in - - #{item} - - - - - and m.discharge_date_time between CONVERT(VARCHAR(10),#{startDateTo,jdbcType=NCHAR},120) and - #{endDateTo,jdbcType=NCHAR}+ ' 23:59:59' - - - and m.discharge_date_time >= CONVERT(VARCHAR(10),#{startDateTo,jdbcType=NCHAR},120) - - - and m.discharge_date_time <= #{endDateTo,jdbcType=NCHAR}+ ' 23:59:59' - - - - and m.DOCTOR_IN_CHARGE LIKE '%'+#{doctorInCharge,jdbcType=NVARCHAR}+'%' - - - UNION ALL - select m.id,m.inp_no,m.visit_id,m.name,m.sex,f.name dept_name,m.discharge_date_time,m.ArchiveState,m.admission_date_time,d.name dept_admission_to,m.LockInfo,m.DOCTOR_IN_CHARGE, - datediff(day,m.discharge_date_time,getdate()) - - (select COUNT(1) from emr_holiday_set where date between convert(varchar(10),m.discharge_date_time,120) - and getdate() and flag = 2)-(select CASE - WHEN m.DISCHARGE_DISPOSITION = 5 THEN - dead_days - ELSE - days - END from emr_overtime_set where id = 1) days - from archive_master m - LEFT JOIN (select code,name from emr_dictionary where parent_id='dept_code') d - on m.dept_admission_to=d.code - LEFT JOIN (select code,name from emr_dictionary where parent_id='dept_code') f - on m.dept_name=f.code - /**带状态查询*/ - left join (select master_id from archive_flow_info where start_step_id in(${status}) group by master_id) archive_flow_info - on m.id = archive_flow_info.master_id - where 1=1 and archive_flow_info.master_id is null and m.ArchiveState != '1024' and m.ArchiveState != '128' and YEAR(m.discharge_date_time) != '1801' - - and m.inp_no like '%'+#{inpNo,jdbcType=NCHAR}+'%' - - - and m.visit_id=#{visitId,jdbcType=NCHAR} - - - and m.name like '%'+#{name,jdbcType=NCHAR}+'%' - - - and m.dept_name in - - #{item} - - - - - and m.discharge_date_time between CONVERT(VARCHAR(10),#{startDateTo,jdbcType=NCHAR},120) and - #{endDateTo,jdbcType=NCHAR}+ ' 23:59:59' - - - and m.discharge_date_time >= CONVERT(VARCHAR(10),#{startDateTo,jdbcType=NCHAR},120) - - - and m.discharge_date_time <= #{endDateTo,jdbcType=NCHAR}+ ' 23:59:59' - - - - and m.DOCTOR_IN_CHARGE LIKE '%'+#{doctorInCharge,jdbcType=NVARCHAR}+'%' - - - ) m - ORDER BY m.discharge_date_time desc - + SELECT + master_id + FROM + archive_flow_info + WHERE + start_step_id = #{status} + ) temp1 ON archive_flow_info.master_id = temp1.master_id) archive_flow_info + on archive_flow_info.master_id = m.id + + + where 1=1 + + + UNION ALL + select m.id,m.inp_no,m.visit_id,m.name,m.sex,f.name + dept_name,m.discharge_date_time,m.ArchiveState,m.admission_date_time,d.name + dept_admission_to,m.LockInfo,m.DOCTOR_IN_CHARGE, + datediff(day,m.discharge_date_time,getdate()) - + (select COUNT(1) from emr_holiday_set where date between convert(varchar(10),m.discharge_date_time,120) + and getdate() and flag = 2)-(select CASE + WHEN m.DISCHARGE_DISPOSITION = 5 THEN + dead_days + ELSE + days + END from emr_overtime_set where id = 1) days + from archive_master m + LEFT JOIN (select code,name from emr_dictionary where parent_id='dept_code') d + on m.dept_admission_to=d.code + LEFT JOIN (select code,name from emr_dictionary where parent_id='dept_code') f + on m.dept_name=f.code + /**带状态查询*/ + left join (select master_id from archive_flow_info where start_step_id in(${status}) group by master_id) + archive_flow_info + on m.id = archive_flow_info.master_id + where 1=1 and archive_flow_info.master_id is null + + + ) m + ORDER BY m.discharge_date_time desc + - - + select m.id,m.patient_id,m.inp_no,m.visit_id,m.name,m.sex,f.name + dept_name,m.discharge_date_time,m.ArchiveState,m.admission_date_time,d.name dept_admission_to + ,m.check_doctor,m.check_datetime,m.checked_doctor,m.checked_datetime,m.LockInfo,m.DOCTOR_IN_CHARGE,m.ID_NO,m.DISCHARGE_DISPOSITION,m.dept_code_lend, + datediff(day,m.discharge_date_time,getdate()) - + (select COUNT(1) from emr_holiday_set where date between convert(varchar(10),m.discharge_date_time,120) + and getdate() and flag = 2)-(select CASE + WHEN m.DISCHARGE_DISPOSITION = 5 THEN + dead_days + ELSE + days + END from emr_overtime_set where id = 1) days + from archive_master m + LEFT JOIN (select code,name from emr_dictionary where parent_id='dept_code') d + on m.dept_admission_to=d.code + LEFT JOIN (select code,name from emr_dictionary where parent_id='dept_code') f + on m.dept_name=f.code + where 1=1 and (ArchiveState = '64' or ArchiveState = '1024') + + and m.id = #{id,jdbcType=NVARCHAR} + + + and m.inp_no like '%'+#{inpNo,jdbcType=NCHAR}+'%' + + + and m.visit_id=#{visitId,jdbcType=NCHAR} + + + and m.name like '%'+#{name,jdbcType=NCHAR}+'%' + + + and m.ArchiveState in(#{archivestate,jdbcType=NVARCHAR}) + + + and m.ID_NO like '%'+#{idNo,jdbcType=NCHAR}+'%' + + + and m.sex = #{sex,jdbcType=NVARCHAR} + + + and m.dept_name in + + #{item} + + + + and m.dept_admission_to = #{deptAdmissionTo,jdbcType=NVARCHAR} + + + and m.discharge_date_time = #{dischargeDateTime,jdbcType=NVARCHAR} + + + + and m.discharge_date_time between CONVERT(VARCHAR(10),#{startDateTo,jdbcType=NCHAR},120) and + #{endDateTo,jdbcType=NCHAR}+ ' 23:59:59' + + + and m.discharge_date_time >= CONVERT(VARCHAR(10),#{startDateTo,jdbcType=NCHAR},120) + + + and m.discharge_date_time <= #{endDateTo,jdbcType=NCHAR}+ ' 23:59:59' + + + + + and m.admission_date_time between CONVERT(VARCHAR(10),#{startDate,jdbcType=NCHAR},120) and + #{endDate,jdbcType=NCHAR}+ ' 23:59:59' + + + and m.admission_date_time >= CONVERT(VARCHAR(10),#{startDate,jdbcType=NCHAR},120) + + + and m.admission_date_time <= #{endDate,jdbcType=NCHAR}+ ' 23:59:59' + + - - and m.check_doctor = #{checkDoctor,jdbcType=NVARCHAR} - - - and m.check_datetime = #{checkDatetime,jdbcType=NVARCHAR} - - - and m.checked_doctor = #{checkedDoctor,jdbcType=NVARCHAR} - - - and m.checked_datetime = #{checkedDatetime,jdbcType=NVARCHAR} - - - and m.LockInfo = #{lockinfo,jdbcType=NVARCHAR} - - - and m.DOCTOR_IN_CHARGE LIKE '%'+#{doctorInCharge,jdbcType=NVARCHAR}+'%' - - - and m.DISCHARGE_DISPOSITION = #{dischargeDisposition,jdbcType=NVARCHAR} - - - and m.dept_code_lend = #{deptCodeLend,jdbcType=NVARCHAR} - - ORDER BY m.discharge_date_time desc - - - + + and m.check_doctor = #{checkDoctor,jdbcType=NVARCHAR} + + + and m.check_datetime = #{checkDatetime,jdbcType=NVARCHAR} + + + and m.checked_doctor = #{checkedDoctor,jdbcType=NVARCHAR} + + + and m.checked_datetime = #{checkedDatetime,jdbcType=NVARCHAR} + + + and m.LockInfo = #{lockinfo,jdbcType=NVARCHAR} + + + and m.DOCTOR_IN_CHARGE LIKE '%'+#{doctorInCharge,jdbcType=NVARCHAR}+'%' + + + and m.DISCHARGE_DISPOSITION = #{dischargeDisposition,jdbcType=NVARCHAR} + + + and m.dept_code_lend = #{deptCodeLend,jdbcType=NVARCHAR} + + ORDER BY m.discharge_date_time desc + + + - - + select m.id,m.patient_id,m.inp_no,m.visit_id,m.name,m.sex,f.name + dept_name,m.discharge_date_time,m.ArchiveState,m.admission_date_time,d.name dept_admission_to + ,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, + datediff(day,m.discharge_date_time,getdate()) - + (select COUNT(1) from emr_holiday_set where date between convert(varchar(10),m.discharge_date_time,120) + and getdate() and flag = 2)-(select CASE + WHEN m.DISCHARGE_DISPOSITION = 5 THEN + dead_days + ELSE + days + END from emr_overtime_set where id = 1) days + from archive_master m + LEFT JOIN (select code,name from emr_dictionary where parent_id='dept_code') d + on m.dept_admission_to=d.code + LEFT JOIN (select code,name from emr_dictionary where parent_id='dept_code') f + on m.dept_name=f.code + where 1=1 + and m.ArchiveState != '128' + + and m.id = #{id,jdbcType=NVARCHAR} + + + and m.inp_no like '%'+#{inpNo,jdbcType=NCHAR}+'%' + + + and m.visit_id=#{visitId,jdbcType=NCHAR} + + + and m.name like '%'+#{name,jdbcType=NCHAR}+'%' + + + /**archivestate = 0 在院 archivestate = 1非在院*/ + + + and YEAR(discharge_date_time) = '1801' + + + and YEAR(discharge_date_time) != '1801' + + + + + and m.ID_NO like '%'+#{idNo,jdbcType=NCHAR}+'%' + + + and m.sex = #{sex,jdbcType=NVARCHAR} + + + and m.dept_name in + + #{item} + + + + and m.dept_admission_to in + + #{item} + + + + + + + and m.discharge_date_time = #{dischargeDateTime,jdbcType=NVARCHAR} + + + + and m.discharge_date_time between CONVERT(VARCHAR(10),#{startDateTo,jdbcType=NCHAR},120) and + #{endDateTo,jdbcType=NCHAR}+ ' 23:59:59' + + + and m.discharge_date_time >= CONVERT(VARCHAR(10),#{startDateTo,jdbcType=NCHAR},120) + + + and m.discharge_date_time <= #{endDateTo,jdbcType=NCHAR}+ ' 23:59:59' + + + + + and m.admission_date_time between CONVERT(VARCHAR(10),#{startDate,jdbcType=NCHAR},120) and + #{endDate,jdbcType=NCHAR}+ ' 23:59:59' + + + and m.admission_date_time >= CONVERT(VARCHAR(10),#{startDate,jdbcType=NCHAR},120) + + + and m.admission_date_time <= #{endDate,jdbcType=NCHAR}+ ' 23:59:59' + + - - and m.check_doctor = #{checkDoctor,jdbcType=NVARCHAR} - - - and m.checked_doctor = #{checkedDoctor,jdbcType=NVARCHAR} - - - and m.check_datetime = #{checkDatetime,jdbcType=NVARCHAR} - - - and m.checked_datetime = #{checkedDatetime,jdbcType=NVARCHAR} - - - and m.LockInfo = #{lockinfo,jdbcType=NVARCHAR} - - - and m.DOCTOR_IN_CHARGE LIKE '%'+#{doctorInCharge,jdbcType=NVARCHAR}+'%' - - - and m.DISCHARGE_DISPOSITION = #{dischargeDisposition,jdbcType=NVARCHAR} - - - and m.dept_code_lend = #{deptCodeLend,jdbcType=NVARCHAR} - - ORDER BY m.discharge_date_time DESC - + + and m.check_doctor = #{checkDoctor,jdbcType=NVARCHAR} + + + and m.checked_doctor = #{checkedDoctor,jdbcType=NVARCHAR} + + + and m.check_datetime = #{checkDatetime,jdbcType=NVARCHAR} + + + and m.checked_datetime = #{checkedDatetime,jdbcType=NVARCHAR} + + + and m.LockInfo = #{lockinfo,jdbcType=NVARCHAR} + + + and m.DOCTOR_IN_CHARGE LIKE '%'+#{doctorInCharge,jdbcType=NVARCHAR}+'%' + + + and m.DISCHARGE_DISPOSITION = #{dischargeDisposition,jdbcType=NVARCHAR} + + + and m.dept_code_lend = #{deptCodeLend,jdbcType=NVARCHAR} + + ORDER BY m.discharge_date_time DESC + - + delete from archive_master where id = #{id,jdbcType=NVARCHAR} - + insert into archive_master (id, patient_id, inp_no, visit_id, name, sex, dept_name, discharge_date_time, ArchiveState, @@ -659,206 +701,206 @@ #{lockinfo,jdbcType=NVARCHAR}, #{doctorInCharge,jdbcType=NVARCHAR}, #{idNo,jdbcType=NVARCHAR}, #{dischargeDisposition,jdbcType=NVARCHAR}, #{deptCodeLend,jdbcType=NVARCHAR}) - - insert into archive_master - - - id, - - - patient_id, - - - inp_no, - - - visit_id, - - - name, - - - sex, - - - dept_name, - - - discharge_date_time, - - - ArchiveState, - - - admission_date_time, - - - dept_admission_to, - - - check_doctor, - - - check_datetime, - - - checked_doctor, - - - checked_datetime, - - - LockInfo, - - - DOCTOR_IN_CHARGE, - - - ID_NO, - - - DISCHARGE_DISPOSITION, - - - dept_code_lend, - - - - - #{id,jdbcType=NVARCHAR}, - - - #{patientId,jdbcType=NVARCHAR}, - - - #{inpNo,jdbcType=NVARCHAR}, - - - #{visitId,jdbcType=NVARCHAR}, - - - #{name,jdbcType=NVARCHAR}, - - - #{sex,jdbcType=NVARCHAR}, - - - #{deptName,jdbcType=NVARCHAR}, - - - #{dischargeDateTime,jdbcType=NVARCHAR}, - - - #{archivestate,jdbcType=NVARCHAR}, - - - #{admissionDateTime,jdbcType=NVARCHAR}, - - - #{deptAdmissionTo,jdbcType=NVARCHAR}, - - - #{checkDoctor,jdbcType=NVARCHAR}, - - - #{checkDatetime,jdbcType=NVARCHAR}, - - - #{checkedDoctor,jdbcType=NVARCHAR}, - - - #{checkedDatetime,jdbcType=NVARCHAR}, - - - #{lockinfo,jdbcType=NVARCHAR}, - - - #{doctorInCharge,jdbcType=NVARCHAR}, - - - #{idNo,jdbcType=NVARCHAR}, - - - #{dischargeDisposition,jdbcType=NVARCHAR}, - - - #{deptCodeLend,jdbcType=NVARCHAR}, - - - - - update archive_master - - - patient_id = #{patientId,jdbcType=NVARCHAR}, - - - inp_no = #{inpNo,jdbcType=NVARCHAR}, - - - visit_id = #{visitId,jdbcType=NVARCHAR}, - - - name = #{name,jdbcType=NVARCHAR}, - - - sex = #{sex,jdbcType=NVARCHAR}, - - - dept_name = #{deptName,jdbcType=NVARCHAR}, - - - discharge_date_time = #{dischargeDateTime,jdbcType=NVARCHAR}, - - - ArchiveState = #{archivestate,jdbcType=NVARCHAR}, - - - admission_date_time = #{admissionDateTime,jdbcType=NVARCHAR}, - - - dept_admission_to = #{deptAdmissionTo,jdbcType=NVARCHAR}, - - - check_doctor = #{checkDoctor,jdbcType=NVARCHAR}, - - - check_datetime = #{checkDatetime,jdbcType=NVARCHAR}, - - - checked_doctor = #{checkedDoctor,jdbcType=NVARCHAR}, - - - checked_datetime = #{checkedDatetime,jdbcType=NVARCHAR}, - - - LockInfo = #{lockinfo,jdbcType=NVARCHAR}, - - - DOCTOR_IN_CHARGE = #{doctorInCharge,jdbcType=NVARCHAR}, - - - ID_NO = #{idNo,jdbcType=NVARCHAR}, - - - DISCHARGE_DISPOSITION = #{dischargeDisposition,jdbcType=NVARCHAR}, - - - dept_code_lend = #{deptCodeLend,jdbcType=NVARCHAR}, - - - returnto_role = #{returntoRole,jdbcType=NVARCHAR}, - - - return_oper_username = #{returnOperUsername,jdbcType=NVARCHAR}, - - - change_reason = #{changeReason,jdbcType=NVARCHAR}, - - - where id = #{id,jdbcType=NVARCHAR} - - + + insert into archive_master + + + id, + + + patient_id, + + + inp_no, + + + visit_id, + + + name, + + + sex, + + + dept_name, + + + discharge_date_time, + + + ArchiveState, + + + admission_date_time, + + + dept_admission_to, + + + check_doctor, + + + check_datetime, + + + checked_doctor, + + + checked_datetime, + + + LockInfo, + + + DOCTOR_IN_CHARGE, + + + ID_NO, + + + DISCHARGE_DISPOSITION, + + + dept_code_lend, + + + + + #{id,jdbcType=NVARCHAR}, + + + #{patientId,jdbcType=NVARCHAR}, + + + #{inpNo,jdbcType=NVARCHAR}, + + + #{visitId,jdbcType=NVARCHAR}, + + + #{name,jdbcType=NVARCHAR}, + + + #{sex,jdbcType=NVARCHAR}, + + + #{deptName,jdbcType=NVARCHAR}, + + + #{dischargeDateTime,jdbcType=NVARCHAR}, + + + #{archivestate,jdbcType=NVARCHAR}, + + + #{admissionDateTime,jdbcType=NVARCHAR}, + + + #{deptAdmissionTo,jdbcType=NVARCHAR}, + + + #{checkDoctor,jdbcType=NVARCHAR}, + + + #{checkDatetime,jdbcType=NVARCHAR}, + + + #{checkedDoctor,jdbcType=NVARCHAR}, + + + #{checkedDatetime,jdbcType=NVARCHAR}, + + + #{lockinfo,jdbcType=NVARCHAR}, + + + #{doctorInCharge,jdbcType=NVARCHAR}, + + + #{idNo,jdbcType=NVARCHAR}, + + + #{dischargeDisposition,jdbcType=NVARCHAR}, + + + #{deptCodeLend,jdbcType=NVARCHAR}, + + + + + update archive_master + + + patient_id = #{patientId,jdbcType=NVARCHAR}, + + + inp_no = #{inpNo,jdbcType=NVARCHAR}, + + + visit_id = #{visitId,jdbcType=NVARCHAR}, + + + name = #{name,jdbcType=NVARCHAR}, + + + sex = #{sex,jdbcType=NVARCHAR}, + + + dept_name = #{deptName,jdbcType=NVARCHAR}, + + + discharge_date_time = #{dischargeDateTime,jdbcType=NVARCHAR}, + + + ArchiveState = #{archivestate,jdbcType=NVARCHAR}, + + + admission_date_time = #{admissionDateTime,jdbcType=NVARCHAR}, + + + dept_admission_to = #{deptAdmissionTo,jdbcType=NVARCHAR}, + + + check_doctor = #{checkDoctor,jdbcType=NVARCHAR}, + + + check_datetime = #{checkDatetime,jdbcType=NVARCHAR}, + + + checked_doctor = #{checkedDoctor,jdbcType=NVARCHAR}, + + + checked_datetime = #{checkedDatetime,jdbcType=NVARCHAR}, + + + LockInfo = #{lockinfo,jdbcType=NVARCHAR}, + + + DOCTOR_IN_CHARGE = #{doctorInCharge,jdbcType=NVARCHAR}, + + + ID_NO = #{idNo,jdbcType=NVARCHAR}, + + + DISCHARGE_DISPOSITION = #{dischargeDisposition,jdbcType=NVARCHAR}, + + + dept_code_lend = #{deptCodeLend,jdbcType=NVARCHAR}, + + + returnto_role = #{returntoRole,jdbcType=NVARCHAR}, + + + return_oper_username = #{returnOperUsername,jdbcType=NVARCHAR}, + + + change_reason = #{changeReason,jdbcType=NVARCHAR}, + + + where id = #{id,jdbcType=NVARCHAR} + + update archive_master set patient_id = #{patientId,jdbcType=NVARCHAR}, inp_no = #{inpNo,jdbcType=NVARCHAR}, @@ -882,9 +924,9 @@ where id = #{id,jdbcType=NVARCHAR} - - + select t.Name deptName, DOCTOR_IN_CHARGE doctor, DATEDIFF(day,admission_date_time,discharge_date_time) admissDays, @@ -896,29 +938,30 @@ (select COUNT(1) from emr_holiday_set where date between discharge_date_time and check_datetime and flag = 2) - (select days from emr_overtime_set where id = 1)) else 0 end) overDays - from archive_master - left join (select code,name from emr_dictionary where parent_id = 'dept_code') t on archive_master.dept_name = t.code - where ArchiveState = '128' and inp_no not like '%B' and inp_no not like '%C' and inp_no not like '%D' - - AND archive_master.dept_name in (${deptCode}) - - - AND archive_master.DOCTOR_IN_CHARGE LIKE '%'+#{doctor}+'%' - - - AND archive_master.discharge_date_time between '${startTime} 00:00:00' and '${endTime} 23:59:59' - - order by t.code,DOCTOR_IN_CHARGE - - - + from archive_master + left join (select code,name from emr_dictionary where parent_id = 'dept_code') t on archive_master.dept_name = + t.code + where ArchiveState = '128' and inp_no not like '%B' and inp_no not like '%C' and inp_no not like '%D' + + AND archive_master.dept_name in (${deptCode}) + + + AND archive_master.DOCTOR_IN_CHARGE LIKE '%'+#{doctor}+'%' + + + AND archive_master.discharge_date_time between '${startTime} 00:00:00' and '${endTime} 23:59:59' + + order by t.code,DOCTOR_IN_CHARGE + + + UPDATE archive_master SET LockInfo = #{lockinfo} diff --git a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp index a6b9e46..2db1f58 100644 --- a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp +++ b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp @@ -237,6 +237,14 @@ +
+ + +
@@ -708,7 +716,7 @@ - + \ No newline at end of file diff --git a/src/main/webapp/static/js/beHospList/beHospList.js b/src/main/webapp/static/js/beHospList/beHospList.js index ee863c9..f83a148 100644 --- a/src/main/webapp/static/js/beHospList/beHospList.js +++ b/src/main/webapp/static/js/beHospList/beHospList.js @@ -66,7 +66,8 @@ function initTable() { doctorInCharge:$("#doctorInCharge").val(), isSearch:$("#isSearch").val(), status:$("#currentRoleIds").val(), - role:$("#currentRole").val() + role:$("#currentRole").val(), + isSuccess:$("#isSuccessSearch").val() }; return temp; }, diff --git a/src/main/webapp/static/pdfjs/web/viewer.html b/src/main/webapp/static/pdfjs/web/viewer.html index 1a984ff..d8f7ccd 100644 --- a/src/main/webapp/static/pdfjs/web/viewer.html +++ b/src/main/webapp/static/pdfjs/web/viewer.html @@ -33,7 +33,7 @@ http://sourceforge.net/adobe/cmap/wiki/License/ - + @@ -42,7 +42,7 @@ http://sourceforge.net/adobe/cmap/wiki/License/ - +