diff --git a/src/main/java/com/emr/controller/commitController.java b/src/main/java/com/emr/controller/commitController.java index c0358ab..008f826 100644 --- a/src/main/java/com/emr/controller/commitController.java +++ b/src/main/java/com/emr/controller/commitController.java @@ -50,7 +50,7 @@ public class commitController { @RequestMapping(value = "/commList") public String faults(Model model) { - //return "beHospitaledDir/beHospListTest"; +// return "beHospitaledDir/beHospListTest"; return "commitDir/commitList"; } diff --git a/src/main/java/com/emr/entity/Archive_Master.java b/src/main/java/com/emr/entity/Archive_Master.java index dd288ac..ad4c021 100644 --- a/src/main/java/com/emr/entity/Archive_Master.java +++ b/src/main/java/com/emr/entity/Archive_Master.java @@ -69,6 +69,8 @@ public class Archive_Master { //2020-1-13 新增扫描字段 private String isScanning; + //2021-1-18 新增床号 + private String bedNumber; public String getId() { return id; @@ -333,4 +335,12 @@ public class Archive_Master { public void setIsScanning(String isScanning) { this.isScanning = isScanning; } + + public String getBedNumber() { + return bedNumber; + } + + public void setBedNumber(String bedNumber) { + this.bedNumber = bedNumber; + } } \ No newline at end of file diff --git a/src/main/java/com/emr/entity/Archive_Master_Vo.java b/src/main/java/com/emr/entity/Archive_Master_Vo.java index 05a372d..537819b 100644 --- a/src/main/java/com/emr/entity/Archive_Master_Vo.java +++ b/src/main/java/com/emr/entity/Archive_Master_Vo.java @@ -72,9 +72,22 @@ public class Archive_Master_Vo { // 科室是否纸质提交 private String isscaned; - //2020-1-13 新增扫描字段 + //2021-1-13 新增扫描字段 private String isScanning; + //2021-1-18 新增床号 + private String bedNumber; + + private String deathFlag; + + public String getDeathFlag() { + return deathFlag; + } + + public void setDeathFlag(String deathFlag) { + this.deathFlag = deathFlag == null ? null : deathFlag.trim(); + } + public String getId() { return id; @@ -327,6 +340,14 @@ public class Archive_Master_Vo { public void setIsScanning(String isScanning) { this.isScanning = isScanning; } + + public String getBedNumber() { + return bedNumber; + } + + public void setBedNumber(String bedNumber) { + this.bedNumber = bedNumber; + } } diff --git a/src/main/resources/mapper/Archive_MasterMapper.xml b/src/main/resources/mapper/Archive_MasterMapper.xml index 95e35a8..17b7f65 100644 --- a/src/main/resources/mapper/Archive_MasterMapper.xml +++ b/src/main/resources/mapper/Archive_MasterMapper.xml @@ -24,7 +24,7 @@ - + @@ -69,7 +69,7 @@ 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, transfer_dept, checked_datetime, LockInfo, DOCTOR_IN_CHARGE, ID_NO, DISCHARGE_DISPOSITION, dept_code_lend,isscaned,is_scanning, - cmt_doctor,cmt_nurse,doctor_name,nurse_name,cmt_doctor_date,cmt_nurse_date,emr_doctor_cmt,emr_nure_cmt,death_flag + cmt_doctor,cmt_nurse,doctor_name,nurse_name,cmt_doctor_date,cmt_nurse_date,emr_doctor_cmt,emr_nure_cmt,death_flag,bed_number 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,m.is_scanning + ,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,bed_number from archive_master m LEFT JOIN (select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where typeCode='dept_code' )) d @@ -107,6 +107,11 @@ and m.inp_no like '%'+#{inpNo,jdbcType=NCHAR}+'%' + + + and m.bed_number like '%'+#{bedNumber,jdbcType=NVARCHAR}+'%' + + and m.visit_id=#{visitId,jdbcType=NCHAR} @@ -182,7 +187,7 @@ 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 ,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.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 from archive_master m LEFT JOIN (select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where typeCode='dept_code' )) d @@ -205,6 +210,9 @@ and m.inp_no like '%'+#{inpNo,jdbcType=NCHAR}+'%' + + and m.bed_number like '%'+#{bedNumber,jdbcType=NVARCHAR}+'%' + and m.visit_id=#{visitId,jdbcType=NCHAR} @@ -287,7 +295,7 @@ 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 ,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.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,bed_number from archive_master m LEFT JOIN (select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where typeCode='dept_code' )) d @@ -302,6 +310,9 @@ and m.inp_no like '%'+#{inpNo,jdbcType=NCHAR}+'%' + + and m.bed_number like '%'+#{bedNumber,jdbcType=NVARCHAR}+'%' + and m.visit_id=#{visitId,jdbcType=NCHAR} @@ -391,7 +402,7 @@ 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 ,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.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,bed_number from archive_master m LEFT JOIN (select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where typeCode='dept_code' )) d @@ -407,6 +418,9 @@ and m.inp_no like '%'+#{inpNo,jdbcType=NCHAR}+'%' + + and m.bed_number like '%'+#{bedNumber,jdbcType=NVARCHAR}+'%' + and m.visit_id=#{visitId,jdbcType=NCHAR} @@ -495,6 +509,9 @@ and m.is_scanning = #{isScanning,jdbcType=NVARCHAR} + + and m.death_flag = #{deathFlag,jdbcType=NVARCHAR} + ORDER BY m.discharge_date_time desc @@ -505,7 +522,7 @@ 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 ,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.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,bed_number from archive_master m LEFT JOIN (select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where typeCode='dept_code' )) d @@ -520,6 +537,9 @@ and m.inp_no like '%'+#{inpNo,jdbcType=NCHAR}+'%' + + and m.bed_number like '%'+#{bedNumber,jdbcType=NVARCHAR}+'%' + and m.visit_id=#{visitId,jdbcType=NCHAR} @@ -650,7 +670,7 @@ diff --git a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp index 1200ada..1b09b6f 100644 --- a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp +++ b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp @@ -1,4 +1,4 @@ -<%@ page contentType="text/html;charset=UTF-8" language="java" import="java.util.*" %> +<%@ page contentType="text/html;charset=UTF-8" language="java" import="java.util.*" %> <%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <% @@ -15,6 +15,8 @@ <%@include file="../../jspf/comm.jspf" %> <%@ include file="../../jspf/ztreeCommom.jsp" %> + <%----%> + <%----%>