增加跨科查阅

src/main/java/com/emr/controller/beHospitaledController.java

@@ -110,14 +110,14 @@ public class beHospitaledController {
 
     @ResponseBody
     @RequestMapping(value = "/beHospList")
-    public OffsetLimitPage beHospList(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit,Integer isSearch){
+    public OffsetLimitPage beHospList(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit,Integer isSearch,HttpServletRequest request){
         //判断是否是初始化查询，是初始化查询把开始结束时间置空
         if(isSearch == 0){
             archiveMasterVo.setStartDateTo(null);
             archiveMasterVo.setEndDateTo(null);
         }
         try {
-            return archiveMasterService.selectByColumn(archiveMasterVo, offset, limit);
+            return archiveMasterService.selectByColumn(archiveMasterVo, offset, limit,request);
         } catch (Exception e) {
             ExceptionPrintUtil.printException(e);
             e.printStackTrace();
@@ -127,7 +127,7 @@ public class beHospitaledController {
 
     @ResponseBody
     @RequestMapping(value = "/exportExcel")
-    public void exportExcel(HttpServletResponse response, Archive_Master_Vo archiveMasterVo,Integer isSearch){
+    public void exportExcel(HttpServletResponse response, HttpServletRequest request,Archive_Master_Vo archiveMasterVo,Integer isSearch){
         String tableThNames = "住院号,住院次数,名字,性别,出院科室,出院日期,主管医生,状态";
         String fieldCns = "inpNo,visitId,name,sex,deptName,dischargeDateTime,doctorInCharge,status";
         //构造excel的数据
@@ -136,7 +136,7 @@ public class beHospitaledController {
             archiveMasterVo.setEndDateTo(null);
         }
         try {
-            List<Archive_Master_Vo> list = archiveMasterService.selectByColumn(archiveMasterVo);
+            List<Archive_Master_Vo> list = archiveMasterService.selectByColumn(archiveMasterVo,request);
             //文件名
             String fileName = "出院浏览" + new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + ".xls";
             //ExportExcelUtil

src/main/java/com/emr/entity/Archive_Master_Vo.java

@@ -53,6 +53,8 @@ public class Archive_Master_Vo extends Archive_Master{
     private Integer overtimeDays;//超期天数
 
     private String doctorInChargeCode;//主管医生工号
+
+    private String userName;//登录用户
 }
  
 

src/main/java/com/emr/service/Archive_MasterService.java

@@ -36,7 +36,7 @@ public interface Archive_MasterService {
      * @param archiveMasterVo
      * @return
      */
-    List<Archive_Master_Vo> selectByColumn(Archive_Master_Vo archiveMasterVo);
+    List<Archive_Master_Vo> selectByColumn(Archive_Master_Vo archiveMasterVo,HttpServletRequest request);
 
 
     //验证字符串是否是数字
@@ -55,7 +55,7 @@ public interface Archive_MasterService {
      * @param archiveMasterVo
      * @return
      */
-    OffsetLimitPage selectByColumn(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit);
+    OffsetLimitPage selectByColumn(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit,HttpServletRequest request);
 
 
     /**

src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java

@@ -69,10 +69,10 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
      * 出院列表
      * */
     @Override
-    public OffsetLimitPage selectByColumn(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit) {
+    public OffsetLimitPage selectByColumn(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit,HttpServletRequest request) {
         PageHelper.offsetPage(offset, limit);
         //查询出院集合
-        List<Archive_Master_Vo> list = selectByColumn(archiveMasterVo);
+        List<Archive_Master_Vo> list = selectByColumn(archiveMasterVo,request);
         //组织完整性字段
         //list集合的分组分类集合
         if(!CollectionUtils.isEmpty(list)){
@@ -309,8 +309,13 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
     }
 
     @Override
-    public List<Archive_Master_Vo> selectByColumn(Archive_Master_Vo archiveMasterVo) {
+    public List<Archive_Master_Vo> selectByColumn(Archive_Master_Vo archiveMasterVo,HttpServletRequest request) {
         setMaxRoleId(archiveMasterVo);
+        //设置登录用户
+        Power_User user = (Power_User)request.getSession().getAttribute("CURRENT_USER");
+        if(user.getRoleId() == 1 && user.getRoleId() != -100){
+            archiveMasterVo.setUserName(user.getUserName());
+        }
         List<Archive_Master_Vo> list = archiveMasterMapper.selectByColumn(archiveMasterVo);
         //转换科室与赋值超期天数
         selectByColumnChange(list);

src/main/resources/mapper/Archive_MasterMapper.xml

@@ -178,7 +178,7 @@
         ORDER BY m.admission_date_time desc
     </select>
 
-    <!--出院浏览公共查询条件-->
+    <!--带科室出院浏览公共查询条件-->
     <sql id="beHospitalSeach">
         and ArchiveState != '1024' and ArchiveState != '128' and YEAR(discharge_date_time) != '1801'
         <if test="inpNo != null and inpNo != ''">
@@ -212,6 +212,34 @@
             and m.DOCTOR_IN_CHARGE in (${doctorInCharge})
         </if>
     </sql>
+    <!--不带科室的出院条件查询-->
+    <sql id="beHospitalSeach1">
+        and ArchiveState != '1024' and ArchiveState != '128' and YEAR(discharge_date_time) != '1801'
+        <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>
+        <choose>
+            <when test="startDateTo != null and startDateTo != '' and endDateTo != null and endDateTo != ''">
+                and m.discharge_date_time between CONVERT(VARCHAR(10),#{startDateTo,jdbcType=NCHAR},120) and
+                #{endDateTo,jdbcType=NCHAR}+ ' 23:59:59'
+            </when>
+            <when test="startDateTo != null and startDateTo != ''">
+                and m.discharge_date_time >= CONVERT(VARCHAR(10),#{startDateTo,jdbcType=NCHAR},120)
+            </when>
+            <when test="endDateTo != null and endDateTo != ''">
+                and m.discharge_date_time &lt;= #{endDateTo,jdbcType=NCHAR}+ ' 23:59:59'
+            </when>
+        </choose>
+        <if test="doctorInCharge != null and doctorInCharge != ''">
+            and m.DOCTOR_IN_CHARGE in (${doctorInCharge})
+        </if>
+    </sql>
 
     <!--查询是否完整的masterId集合-->
     <sql id="searchSuccessForMasterIdList">
@@ -429,9 +457,17 @@
             and archive_flow_info.master_id is null
             <include refid="beHospitalSeach"></include>
         </if>
+        <if test="userName != null and userName != ''">
+        union all
+            select <include refid="selectColumms"></include> from archive_transfer_dept_user
+            inner join
+            archive_master m
+            on m.id = archive_transfer_dept_user.master_id
+            where user_name = #{userName}
+            <include refid="beHospitalSeach1"></include>
+        </if>
         ) m
         ORDER BY m.discharge_date_time desc
-
     </select>
 
     <!--终审-->

src/main/webapp/static/js/beHospList/beHospList.js

@@ -852,6 +852,7 @@ var opts = {
 var spinner = new Spinner(opts);
 //获取所有分段列表
 function initTree2(deptName,masterId) {
+    zNodes = []
     $.ajax({
         url: path+"/transferDeptUser/selectTranferDeptUserTree",
         type: "POST",