diff --git a/src/main/java/com/emr/controller/FontController.java b/src/main/java/com/emr/controller/FontController.java
index 9999f506..15a4869a 100644
--- a/src/main/java/com/emr/controller/FontController.java
+++ b/src/main/java/com/emr/controller/FontController.java
@@ -284,7 +284,7 @@ public class FontController {
                 tree.setId(id);
                 tree.setParentId(0);
                 tree.setName("全部影像资料");
-                tree.setChecked("true");
+//                tree.setChecked("true");
                 treeList.add(tree);
                 oneParentId = id;
                 id++;
@@ -313,7 +313,10 @@ public class FontController {
                                     tree2.setParentId(twoParentId);
                                     tree2.setName(detailTemp.getTitle());
                                     tree2.setSelfId(detailTemp.getId());
-                                    tree2.setChecked("true");
+                                    if (tree2.getName().contains("病案首页")){
+                                        tree2.setChecked("true");
+                                    }
+//                                    tree2.setChecked("true");
                                     treeList.add(tree2);
                                     id++;
                                     flag = true;
@@ -329,7 +332,10 @@ public class FontController {
                                     tree2.setParentId(twoParentId);
                                     tree2.setName(nurseDetailVoTemp.getTitle());
                                     tree2.setSelfId(nurseDetailVoTemp.getId());
-                                    tree2.setChecked("true");
+//                                    tree2.setChecked("true");
+                                    if (tree2.getName().contains("病案首页")){
+                                        tree2.setChecked("true");
+                                    }
                                     treeList.add(tree2);
                                     id++;
                                     nurseflag = true;
@@ -343,14 +349,19 @@ public class FontController {
                                 tree2.setParentId(twoParentId);
                                 tree2.setName(detail.getTitle());
                                 tree2.setSelfId(detail.getId());
-                                tree2.setChecked("true");
+//                                tree2.setChecked("true");
+                                if (tree2.getName().contains("病案首页")){
+                                    tree2.setChecked("true");
+                                }
                                 treeList.add(tree2);
                                 id++;
                             }
                         }
                     }
                     tree1.setName(assortName + "("+count+")");
-                    tree1.setChecked("true");
+                    if (tree1.getName().contains("病案首页")){
+                        tree1.setChecked("true");
+                    }
                     treeList.add(tree1);
                 }
                 TBasicBrowseHistory tBasicBrowseHistory = new TBasicBrowseHistory();
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 11062634..4ac9bffb 100644
--- a/src/main/java/com/emr/entity/Archive_Master_Vo.java
+++ b/src/main/java/com/emr/entity/Archive_Master_Vo.java
@@ -67,6 +67,16 @@ public class Archive_Master_Vo {
 
     private String doctorInCharge;
 
+    private String doctorInCharge2;
+
+    public String getDoctorInCharge2() {
+        return doctorInCharge2;
+    }
+
+    public void setDoctorInCharge2(String doctorInCharge2) {
+        this.doctorInCharge2 = doctorInCharge2;
+    }
+
     private String idNo;
 
     private String dischargeDisposition;
diff --git a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java
index 89b15bf8..ab102891 100644
--- a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java
+++ b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java
@@ -193,6 +193,36 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
         List<Archive_Master_Vo> list = archiveMasterMapper.selectByColumn(archiveMasterVo);
         //设置医生、护士名称和打印标识、科室、是否退回医生、是否退回护士
         setNameAndPrintFlag(archiveMasterVo, list);
+        if(list!=null && list.size()>0) {
+            JSONArray powerUsers = powerUserService.getPowerUserList("1");
+            List<JSONObject> powerUserList = JSONArray.parseArray(powerUsers.toJSONString(), JSONObject.class);
+            if (powerUserList != null){
+                Map<String,JSONObject> mappedMovies = Maps.uniqueIndex(powerUserList, new Function<JSONObject,String>() {
+                    @Override
+                    public String apply(JSONObject temp) {
+                        return temp.getString("userName");
+                    }});
+
+                for (Archive_Master_Vo emr_fault_vo : list) {
+                    //  emr_fault_vo.setBackFee(priceVal);
+                    //主管医生
+                    JSONObject userInfo = mappedMovies.get(emr_fault_vo.getDoctorInCharge());
+                    if (userInfo == null) {
+                        emr_fault_vo.setDoctorInCharge(emr_fault_vo.getDoctorInCharge());
+                    } else {
+                        emr_fault_vo.setDoctorInCharge(userInfo.getString("name"));
+                    }
+                    //退回人
+                    userInfo = mappedMovies.get(emr_fault_vo.getCreater());
+                    if (userInfo == null) {
+                        emr_fault_vo.setCreater(emr_fault_vo.getCreater());
+                    } else {
+                        emr_fault_vo.setCreater(userInfo.getString("name"));
+                    }
+                }
+
+            }
+        }
         return list;
     }
 
diff --git a/src/main/java/com/emr/service/ipml/Emr_Fault_DetailServiceImpl.java b/src/main/java/com/emr/service/ipml/Emr_Fault_DetailServiceImpl.java
index 164727cc..d4a21fea 100644
--- a/src/main/java/com/emr/service/ipml/Emr_Fault_DetailServiceImpl.java
+++ b/src/main/java/com/emr/service/ipml/Emr_Fault_DetailServiceImpl.java
@@ -350,7 +350,6 @@ public class Emr_Fault_DetailServiceImpl implements Emr_Fault_DetailService {
                     }});
 
                 for (Emr_Fault_Vo emr_fault_vo : list) {
-                    //  emr_fault_vo.setBackFee(priceVal);
                     //主管医生
                     JSONObject userInfo = mappedMovies.get(emr_fault_vo.getDoctorInCharge());
                     if (userInfo == null) {
diff --git a/src/main/resources/mapper/Archive_MasterMapper.xml b/src/main/resources/mapper/Archive_MasterMapper.xml
index 1a3afdce..ee1b6ae4 100644
--- a/src/main/resources/mapper/Archive_MasterMapper.xml
+++ b/src/main/resources/mapper/Archive_MasterMapper.xml
@@ -386,9 +386,14 @@
         <if test="lockinfo != null">
             and m.LockInfo = #{lockinfo,jdbcType=NVARCHAR}
         </if>
-        <!--<if test="doctorInCharge != null">-->
-        <!--and m.DOCTOR_IN_CHARGE = #{doctorInCharge,jdbcType=NVARCHAR}-->
-        <!--</if>-->
+
+        <if test="doctorInCharge2!= null and doctorInCharge2!= ''">
+            and m.DOCTOR_IN_CHARGE in
+            <foreach item="item" collection="doctorInCharge2.split(',')" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+
         <if test="doctorInCharge!= null and doctorInCharge!= ''">
             and m.DOCTOR_IN_CHARGE in
             <foreach item="item" collection="doctorInCharge.split(',')" open="(" separator="," close=")">
@@ -1423,7 +1428,7 @@
         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 f.following_type in(8,9)
+        where 1=1 and f.following_type in(8,9) and  m.ArchiveState!='已封存'
         <if test="id != null and id != ''">
             and m.id = #{id,jdbcType=NVARCHAR}
         </if>
@@ -1531,6 +1536,9 @@
             <if test="name != null and name != ''">
                 and m.name like '%'+#{name,jdbcType=NCHAR}+'%'
             </if>
+            <if test="deathFlag != null and deathFlag != ''">
+                and m.death_flag=#{deathFlag,jdbcType=NCHAR}
+            </if>
             <if test="deptName!= null and deptName!= ''">
                 and m.dept_name in
                 <foreach item="item" collection="deptName.split(',')" open="(" separator="," close=")">
@@ -1649,6 +1657,9 @@
             <if test="name != null and name != ''">
                 and m.name like '%'+#{name,jdbcType=NCHAR}+'%'
             </if>
+            <if test="deathFlag != null and deathFlag != ''">
+                and m.death_flag=#{deathFlag,jdbcType=NCHAR}
+            </if>
             <if test="deptName!= null and deptName!= ''">
                 and m.dept_name in
                 <foreach item="item" collection="deptName.split(',')" open="(" separator="," close=")">
diff --git a/src/main/resources/mapper/Emr_Fault_DetailMapper.xml b/src/main/resources/mapper/Emr_Fault_DetailMapper.xml
index 79ea1a75..3026061d 100644
--- a/src/main/resources/mapper/Emr_Fault_DetailMapper.xml
+++ b/src/main/resources/mapper/Emr_Fault_DetailMapper.xml
@@ -109,9 +109,6 @@
             <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="archivestate!= null and archivestate!= ''">
                 and m.ArchiveState in
                 <foreach item="item" collection="archivestate.split(',')" open="(" separator="," close=")">
@@ -166,9 +163,6 @@
             <if test="recallReason != null and recallReason != ''">
                 and f.recall_reason = #{recallReason,jdbcType=VARCHAR}
             </if>
-            <!--<if test="creater != null and creater != ''">
-              and f.creater = #{creater,jdbcType=NVARCHAR}
-            </if>-->
             <if test="creater!= null and creater!= ''">
                 and f.creater in
                 <foreach item="item" collection="creater.split(',')" open="(" separator="," close=")">
@@ -1062,7 +1056,7 @@
   </select>
   <!--退回总次数、总费用和总评分-->
   <select id="masterTotalList" parameterType="com.emr.entity.Emr_Fault_Vo" resultMap="BaseResultMap2">
-    select DISTINCT m.id archive_detail_id,m.inp_no,m.visit_id,m.name,convert(varchar,m.discharge_date_time,120) discharge_date_time,a.total_back_fee,a.total_back_num,#{backFee,jdbcType=NCHAR} back_fee,
+    select DISTINCT m.id archive_detail_id,e.creater,m.inp_no,m.visit_id,m.name,convert(varchar,m.discharge_date_time,120) discharge_date_time,a.total_back_fee,a.total_back_num,#{backFee,jdbcType=NCHAR} back_fee,
     m.dept_name dept_admission_to,d.name as deptName,m.ArchiveState,isnull(m.score,0) score,m.DOCTOR_IN_CHARGE
     from(
     select  DISTINCT master_id,count(*) total_back_num,count(*)* #{backFee,jdbcType=NCHAR} total_back_fee from Archive_Master_Following where following_type=9 group by master_id
@@ -1073,6 +1067,8 @@
     on m.dept_name=d.code
     LEFT JOIN Archive_Master_Following f
     on m.id=f.master_id
+    LEFT JOIN emr_fault_detail e
+    on e.archive_detail_id=m.id
     <where>  1=1 and m.ArchiveState  not in('作废','已封存','') and m.ArchiveState is not null  and  m.Is_Valid!=1 and total_back_num>0 and f.following_type=9
       <if test="inpNo != null and inpNo != ''">
         and m.inp_no like '%'+#{inpNo,jdbcType=NCHAR}+'%'
@@ -1098,14 +1094,20 @@
           #{item}
         </foreach>
       </if>
+      <if test="doctorInCharge!= null and doctorInCharge!= ''">
+            and m.DOCTOR_IN_CHARGE in
+            <foreach item="item" collection="doctorInCharge.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 test="creater!= null and creater!= ''">
+            and e.creater in
+            <foreach item="item" collection="creater.split(',')" open="(" separator="," close=")">
+                #{item}
+        </foreach>
       </if>
       <choose>
         <when test="startDate != null and startDate != '' and endDate != null and endDate != ''">
diff --git a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp
index fb6e84be..df3e3eb5 100644
--- a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp
+++ b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp
@@ -519,14 +519,12 @@
                     <option value="">全部</option>
                 </select>
             </div>
-            <%--<div class="form-group divCss8">
-                <label>主管医生:</label>
-                <select class="selectpicker bla bla bli" multiple data-live-search="true" name="doctorInCharge"
-                        id="doctorInCharge" title="请输入主管医生" data-actions-box="true" data-deselect-all-text="取消全选"
-                        data-select-all-text="全选">
-                    <option value="">全部</option>
+            <div class="form-group divCss8">
+                <label for="name">主管医生:</label>
+                <select class="selectpicker bla bla bli" multiple data-live-search="true" name="doctorInCharge" id="doctorInCharge" title="请输入主管医生"
+                        data-actions-box="true" data-deselect-all-text="取消全选" data-select-all-text="全选" data-none-results-text="没找到相应记录{0}">
                 </select>
-            </div>--%>
+            </div>
             <div class="form-group divCss8">
                 <label>出院日期:</label>
                 <div class="input-daterange input-group" id="datepicker">
@@ -3786,15 +3784,6 @@
                     }
                     var url = window.location.href;
                     var deptName = url.substring(url.lastIndexOf('&') + 1).replace("depts=", "");
-                    // if (deptName != null && deptName != "") {
-                    //     //$("#deptName").hide();
-                    //     deptName += "," + $("#deptName").val();
-                    // } else {
-                    //     deptName = $("#deptName").val();
-                    // }
-                    // if ($("#deptName").val() != null && $("#deptName").val() != "") {
-                    //     deptName = $("#deptName").val();
-                    // }
                     var len = ($("#deptName").val()).length;
                     if (len > 0) {
                         var deptNameT = $("#deptName").val();
@@ -3802,8 +3791,16 @@
                             deptName = $("#deptName").val().toString();
                         }
                     }
+                    var doctorInCharge = url.substring(url.lastIndexOf('&') + 1).replace("depts=", "");
+                    var len = ($("#doctorInCharge").val()).length;
+                    if (len > 0) {
+                        var doctorInChargeT = $("#doctorInCharge").val();
+                        if (doctorInChargeT.indexOf("") == -1) {
+                            doctorInCharge = $("#doctorInCharge").val().toString();
+                        }
+                    }
 
-                    //var doctorInCharge = $("#doctorInCharge").val().toString();
+                    // var doctorInCharge = $("#doctorInCharge").val().toString();
                     var temp = {
                         limit: limit,     //页面大小
                         offset: offset,   //页码
@@ -3818,10 +3815,11 @@
                         startDateTo: $("#startDateTo").val(),
                         endDateTo: $("#endDateTo").val(),
                         deptName: deptName.toString(),
-                        //doctorInCharge: doctorInCharge,
+                        // doctorInCharge: doctorInCharge.toString(),
                         emrCmit: $("#emrCmit").val(),
                         bedNumber: $("#bedNumber").val(),
-                        printNum:$("#printNum").val()
+                        printNum:$("#printNum").val(),
+                        doctorInCharge2:doctorInCharge.toString()
                     };
                     return temp;
                 },
@@ -4257,6 +4255,12 @@
                             return a;
                         }
                     },
+                    {
+                        title: '主管医生',
+                        field: 'doctorInCharge',
+                        align: 'center',
+                        valign: 'middle',
+                    },
                     {
                         title: '出院日期',
                         field: 'dischargeDateTime',
@@ -4618,6 +4622,29 @@
         }
     }
 
+
+    function getUserList() {
+        //获取role为病案室、病案室管理的用户
+        $.ajax({
+            url:"${path}/getPowerUserList",
+            type:"GET",
+            data:{"type":1},
+            success:function (data) {
+                if (data != null) {
+                    for (var i = 0; i < data.length; i++) {
+                        $("#doctorInCharge").append("<option value=" + data[i].userName + ">" + data[i].name + "</option>");
+                        $("#creater").append("<option value=" + data[i].userName + ">" + data[i].name + "</option>");
+                        //$("#backer").append("<option value=" + data[i].userName + ">" + data[i].name + "</option>");
+
+                    }
+                }
+                $(".selectpicker").selectpicker('refresh');
+            }
+        })
+    }
+
+    getUserList();
+
     function getSourceFun() {
         //console.log("获取来源下拉框：sourceSearch");
         var patientId = $("#idLab").html();
@@ -5118,7 +5145,7 @@
                 deptName = $("#deptName").val().toString();
             }
         }
-        //var doctorInCharge = $("#doctorInCharge").val().toString();
+        // var doctorInCharge = $("#doctorInCharge").val().toString();
         var inpNo = "" + $("#inpNo").val();
         var visitId = "" + $("#visitId").val();
         var name = "" + $("#name").val();
diff --git a/src/main/webapp/WEB-INF/views/faultDir/faultList.jsp b/src/main/webapp/WEB-INF/views/faultDir/faultList.jsp
index 19c98359..4d5ec82d 100644
--- a/src/main/webapp/WEB-INF/views/faultDir/faultList.jsp
+++ b/src/main/webapp/WEB-INF/views/faultDir/faultList.jsp
@@ -123,9 +123,7 @@
                 <label for="name">创建人:</label>
                 <select class="selectpicker bla bla bli" multiple data-live-search="true" name="creater" id="creater" title="请输入创建人"
                         data-actions-box="true" data-deselect-all-text="取消全选" data-select-all-text="全选" data-none-results-text="没找到相应记录{0}">
-                    <%--<option value="">全部</option>--%>
                 </select>
-                <%--<input type="text" class="input-sm form-control" id="creater" placeholder="请输入创建人">--%>
             </div>
             <div class="form-group divCss8">
                 <label for="archivestate">归档状态 :</label>
@@ -295,6 +293,7 @@
         doctorInCharge2=$("#doctorInCharge").val();
         archivestate2=$("#archivestate").val();
         deptName2=$("#deptName").val();
+        creater2=$("#creater").val();
     }
     function initTable() {
         if(tipLoad==1){
@@ -382,9 +381,9 @@
                         visitId:""+$("#visitId").val(),
                         name:""+$("#name").val(),
                         doctorInCharge:""+$("#doctorInCharge").val(),
-                        //creater:""+$("#creater").val(),
                         archivestate:"" + $("#archivestate").val(),
-                        deptName: deptName
+                        creater:"" + $("#creater").val(),
+                        deptName: deptName,
                     };
 
                     return temp;
@@ -533,24 +532,22 @@
                             return value;
                             //return changeDateFormat(value)
                         }
-                    }
-                    /*{
-                        field: 'createTime',
-                        title: '创建时间',
-                        valign: 'middle',
-                        formatter: function (value, row, index) {
-                            return value;
-                            //return changeDateFormat(value)
-                        }
                     },
                     {
                         field: 'creater',
                         title: '创建人',
                         valign: 'middle',
+                        }
+                    /*{
+                        field: 'createTime',
+                        title: '创建时间',
+                        valign: 'middle',
                         formatter: function (value, row, index) {
                             return value;
                             //return changeDateFormat(value)
                         }
+                    },
+
                     },*/
                     // {
                     //     field: 'updater',
@@ -823,7 +820,6 @@
                             order: params.order,      //排位命令（desc，asc）
                             archiveDetailId: archiveDetailId,
                             startDateTo: startDateTo,
-                            creater:""+$("#creater").val(),
                             endDateTo: endDateTo,
                             backFlag:"5,6",
                             assortId:""+typeFlag
@@ -944,6 +940,10 @@
             inpNo2="" + $("#inpNo").val();
             flag=1;
         }
+        if(creater2!=$("#creater").val() && flag==0){
+            creater2="" + $("#creater").val();
+            flag=1;
+        }
         //console.log("===flag2==="+flag );
         if(visitId2!=$("#visitId").val() && flag==0){
             visitId2=""+$("#visitId").val();
@@ -990,12 +990,12 @@
             faultFlag=1;
         }
         //console.log("===faultFlag9==="+faultFlag);
-        if(creater2==$("#creater").val() && faultFlag==0){
-            faultFlag=0;
-        }else{
-            creater2=""+$("#creater").val();
-            faultFlag=1;
-        }
+        // if(creater2==$("#creater").val() && faultFlag==0){
+        //     faultFlag=0;
+        // }else{
+        //     creater2=""+$("#creater").val();
+        //     faultFlag=1;
+        // }
         //console.log("===faultFlag10==="+faultFlag);
         return faultFlag;
     }
diff --git a/src/main/webapp/WEB-INF/views/medicalOverdueDir/medicalOverdueList.jsp b/src/main/webapp/WEB-INF/views/medicalOverdueDir/medicalOverdueList.jsp
index 0569946f..e0e1acfd 100644
--- a/src/main/webapp/WEB-INF/views/medicalOverdueDir/medicalOverdueList.jsp
+++ b/src/main/webapp/WEB-INF/views/medicalOverdueDir/medicalOverdueList.jsp
@@ -150,6 +150,14 @@
                                 <option value="1">是</option>
                             </select>
                         </div>--%>
+                        <div class="form-group divCss8">
+                            <label>是否死亡:</label>
+                            <select class="input-sm form-control" id="deathFlag">
+                                <option value="">全部</option>
+                                <option value="0">否</option>
+                                <option value="1">是</option>
+                            </select>
+                        </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>
@@ -242,6 +250,14 @@
                                 <option value="1">是</option>
                             </select>
                         </div>--%>
+                        <div class="form-group divCss8">
+                            <label>是否死亡:</label>
+                            <select class="input-sm form-control" id="deathFlag2">
+                                <option value="">全部</option>
+                                <option value="0">否</option>
+                                <option value="1">是</option>
+                            </select>
+                        </div>
                         <button type="button" class="btn btn-primary btn-sm divCss" id="searchBtn2">查询</button>
                         <button type="button" class="btn btn-info btn-sm divCss" id="excelBtn2">条件导出</button>
                     </div>
diff --git a/src/main/webapp/WEB-INF/views/scientificResearch/scientificTemplate.jsp b/src/main/webapp/WEB-INF/views/scientificResearch/scientificTemplate.jsp
index c3d18218..17ea888f 100644
--- a/src/main/webapp/WEB-INF/views/scientificResearch/scientificTemplate.jsp
+++ b/src/main/webapp/WEB-INF/views/scientificResearch/scientificTemplate.jsp
@@ -102,6 +102,7 @@
                 <input type="text" class="input-sm form-control" id="creater1" placeholder="请输入相关科室">
             </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="increaseBtn1" >导出图像</button>
             <button type="button" class="btn btn-info btn-sm divCss" onclick="add()" id="increaseBtn" >新增模板</button>
         </div>
     </form>