diff --git a/src/main/java/com/emr/controller/MedicalRecallController.java b/src/main/java/com/emr/controller/MedicalRecallController.java
index 6bde0552..2580b594 100644
--- a/src/main/java/com/emr/controller/MedicalRecallController.java
+++ b/src/main/java/com/emr/controller/MedicalRecallController.java
@@ -66,8 +66,8 @@ public class MedicalRecallController {
     @RequestMapping(value = "/exportExcel")
     public void exportExcel(HttpServletResponse response, Emr_Fault_Vo emrFaultVo) throws Exception {
         response.setContentType("application/vnd.ms-excel;charset=UTF-8");
-        String[] header = {"ID","病历清单id","住院号","住院次数","名字","性别","身份证","入院科室","入院日期","出院科室","出院日期","状态","归档状态"};
-        String[] fileNames = {"id","archiveDetailId","inpNo","visitId","name","sex","idNo","deptAdmissionTo","admissionDateTime","deptName","dischargeDateTime","state","archivestate"};
+        String[] header = {"病历清单id","住院号","住院次数","名字","性别","身份证","入院科室","入院日期","出院科室","出院日期","状态","归档状态"};
+        String[] fileNames = {"archiveDetailId","inpNo","visitId","name","sex","idNo","deptAdmissionTo","admissionDateTime","deptName","dischargeDateTime","state","archivestate"};
         //文件名
         String fileName = "召回信息数据" + new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + ".xls";
         //构造excel的数据
diff --git a/src/main/resources/mapper/Emr_Fault_DetailMapper.xml b/src/main/resources/mapper/Emr_Fault_DetailMapper.xml
index d6566338..9785ca87 100644
--- a/src/main/resources/mapper/Emr_Fault_DetailMapper.xml
+++ b/src/main/resources/mapper/Emr_Fault_DetailMapper.xml
@@ -300,12 +300,12 @@
   </select>
 
   <select id="selectByCol" parameterType="com.emr.entity.Emr_Fault_Vo" resultMap="BaseResultMap2">
-    select m.id as archive_detail_id,ISNULL(f.state, '未召回') state,f.recall_reason,m.inp_no,m.visit_id,m.name,m.dept_name,m.discharge_date_time,m.ArchiveState,m.sex,m.ID_NO,m.dept_admission_to,m.admission_date_time,m.DISCHARGE_DISPOSITION
-    from archive_master m
-    left join(select * from emr_fault_detail t where id = (select top 1 id from emr_fault_detail where archive_detail_id = t.archive_detail_id order by create_time desc )
-    and state in('已召回','未召回')) f
-    ON f.archive_detail_id=m.id
-    where m.ArchiveState in('已归档','已认证','初审')
+      select m.id as archive_detail_id,ISNULL(f.state, '未召回') state,f.recall_reason,m.inp_no,m.visit_id,m.name,m.dept_name,CONVERT(VARCHAR(20),m.discharge_date_time,120) discharge_date_time,m.ArchiveState,m.sex,m.ID_NO,m.dept_admission_to,CONVERT(VARCHAR(20),m.admission_date_time,120) admission_date_time,m.DISCHARGE_DISPOSITION
+      from archive_master m
+      left join(select * from emr_fault_detail t where id = (select top 1 id from emr_fault_detail where archive_detail_id = t.archive_detail_id order by create_time desc )
+      and state in('已召回','未召回')) f
+      ON f.archive_detail_id=m.id
+      where 1=1 and  m.Is_Valid!=1
     <if test="archiveDetailId != null">
       and f.archive_detail_id = #{archiveDetailId,jdbcType=NVARCHAR}
     </if>
@@ -348,12 +348,20 @@
     <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="state != null and state != ''">
-      and f.state=#{state,jdbcType=NCHAR}
+    <if test="archivestate!= null and archivestate!= ''">
+      and m.ArchiveState in
+      <foreach item="item" collection="archivestate.split(',')" open="(" separator="," close=")">
+         #{item}
+      </foreach>
     </if>
+    <choose>
+       <when test="state=='已召回'">
+          and f.state=#{state,jdbcType=NCHAR}
+       </when>
+       <when test="state=='未召回'">
+           AND (f.state='未召回' or f.state is null)
+       </when>
+    </choose>
     <if test="idNo != null and idNo != ''">
       and m.ID_NO like '%'+#{idNo,jdbcType=NCHAR}+'%'
     </if>
@@ -377,7 +385,7 @@
     </choose>
   </select>
 
-    <delete id="deleteById" parameterType="java.lang.Integer">
+  <delete id="deleteById" parameterType="java.lang.Integer">
     delete from emr_fault_detail
     where id = #{id,jdbcType=INTEGER}
   </delete>
diff --git a/src/main/webapp/WEB-INF/views/medicalRecallDir/medicalRecallList.jsp b/src/main/webapp/WEB-INF/views/medicalRecallDir/medicalRecallList.jsp
index 4ce7ccbb..dc0716d1 100644
--- a/src/main/webapp/WEB-INF/views/medicalRecallDir/medicalRecallList.jsp
+++ b/src/main/webapp/WEB-INF/views/medicalRecallDir/medicalRecallList.jsp
@@ -119,7 +119,7 @@
                 <%--</select>--%>
                 <select class="selectpicker bla bla bli" multiple data-live-search="true"   data-actions-box="true" data-deselect-all-text="取消全选" data-select-all-text="全选"
                         data-none-results-text="没找到相应记录{0}" name="deptName" id="deptName" title="请输入科室">
-                    <option value="">全部</option>
+                   <%-- <option value="">全部</option>--%>
                 </select>
             </div>
             <div class="form-group divCss8">
@@ -132,17 +132,19 @@
             </div>
             <div class="form-group divCss8">
                 <label for="archivestate">归档状态 :</label>
-                <select class="input-sm form-control" id="archivestate">
-                    <option value="">全部</option>
-                    <option value="初审">初审</option>
-                    <%--<option value="已认证">已认证</option>--%>
-                    <option value="已归档">已归档</option>
+                <select class="selectpicker bla bla bli" multiple data-live-search="true"   data-actions-box="true" data-deselect-all-text="取消全选" data-select-all-text="全选"
+                        data-none-results-text="没找到相应记录{0}" name="archivestate" id="archivestate" title="请输入归档状态">
+                    <%-- <option value="">全部</option>--%>
+                        <option value="初审">初审</option>
+                        <option value="已归档">已归档</option>
+                        <option value="已认证">已认证</option>
                 </select>
             </div>
             <div class="form-group divCss">
                 <label for="state">召回状态 :</label>
-                <select class="input-sm form-control" id="state">
-                    <option value="">全部</option>
+                <select class="selectpicker bla bla bli" multiple data-live-search="true"   data-actions-box="true" data-deselect-all-text="取消全选" data-select-all-text="全选"
+                        data-none-results-text="没找到相应记录{0}" name="state" id="state" title="请输入召回状态">
+                    <%-- <option value="">全部</option>--%>
                     <option value="已召回">已召回</option>
                     <option value="未召回">未召回</option>
                 </select>
@@ -456,7 +458,12 @@
                     //         deptName = $("#deptName").val().toString();
                     //     }
                     // }
-
+                    var archivestate="";
+                    if($("#archivestate").val()!=null && $("#archivestate").val()!=""){
+                        archivestate="" + $("#archivestate").val();
+                    }else{
+                        archivestate="已归档,已认证,初审";
+                    }
 
                     var temp = {
                         limit: limit,     //页面大小
@@ -466,7 +473,7 @@
                         inpNo: "" + $("#inpNo").val(),
                         visitId:""+$("#visitId").val(),
                         name:""+$("#name").val(),
-                        archivestate: "" + $("#archivestate").val(),
+                        archivestate: archivestate,
                         state:"" + $("#state").val(),
                         startDate: $("#startDate").val(),
                         endDate: $("#endDate").val(),
@@ -549,16 +556,16 @@
                         title: '出院科室',
                         field: 'deptName',
                         align: 'left',
-                        valign: 'middle',
+                        valign: 'middle'
                     },
                     {
                         title: '出院日期',
                         field: 'dischargeDateTime',
                         align: 'center',
-                        valign: 'middle',
-                        formatter: function (value, row, index) {
+                        valign: 'middle'
+                        /*formatter: function (value, row, index) {
                             return value.substring(0, 10);
-                        }
+                        }*/
                         // formatter: function (value, row, index) {
                         //     return value
                         // }
@@ -610,6 +617,11 @@
                             return a;
                         }
                     },
+                    /*{
+                        title: '召回原因',
+                        field: 'recallReason',
+                        valign: 'middle',
+                    },*/
                     {
                         title: "操作",
                         align: 'left',
@@ -767,8 +779,13 @@
         var name = "" + $("#name").val();
         var idNo = "" + $("#idNo").val();
         var state = "" + $("#state").val();
-        var archivestate=""+ $("#archivestate").val();
         var deptName= $("#deptName").val();
+        var archivestate="";
+        if($("#archivestate").val()!=null && $("#archivestate").val()!=""){
+            archivestate="" + $("#archivestate").val();
+        }else{
+            archivestate="已归档,已认证,初审";
+        }
 
         //var url = window.location.href;
         // var deptName = url.substring(url.lastIndexOf('&') + 1).replace("depts=", "");