diff --git a/liswork/src/main/java/com/czlis/liswork/pojo/WholeProcessVO.java b/liswork/src/main/java/com/czlis/liswork/pojo/WholeProcessVO.java
index 02cbe0c..ecc91d5 100644
--- a/liswork/src/main/java/com/czlis/liswork/pojo/WholeProcessVO.java
+++ b/liswork/src/main/java/com/czlis/liswork/pojo/WholeProcessVO.java
@@ -137,6 +137,7 @@ public class WholeProcessVO {
     private String jsysname;
     private String brlyname;
     private String cyrname;
+    private String ztname;
     @ApiModelProperty(value = "申请时间起始")
     private Date sqsj1;
     @ApiModelProperty(value = "申请时间截止")
diff --git a/liswork/src/main/resources/mapper/WholeProcessMapper.xml b/liswork/src/main/resources/mapper/WholeProcessMapper.xml
index cbcd3bf..b683ed1 100644
--- a/liswork/src/main/resources/mapper/WholeProcessMapper.xml
+++ b/liswork/src/main/resources/mapper/WholeProcessMapper.xml
@@ -16,7 +16,8 @@
             isnull((select zdmc from com_dict where zdlb = 'SRD' AND zddh = a.cyr),a.cyr) as  cyrname,
             isnull((select zdmc from com_dict where zdlb = 'HOS' AND zddh = a.yljg),a.yljg) as  yljgname,
                isnull((select zdmc from com_dict where zdlb = 'BT' AND zddh = a.yblx),a.yblx) as  yblxname,
-        datediff(minute,a.cysj,a.jssj) as cp_cytojs,
+            (case when a.zt='2' and isnull(a.yqdh,'')!='' then '检验中' else isnull((select dict_label from sys_dict_data where dict_type='lis_req_type' and dict_value=a.zt),a.zt) end  ) as  ztname,
+               datediff(minute,a.cysj,a.jssj) as cp_cytojs,
         datediff(minute,a.jssj,a.confirmtime) as cp_jstobg,
         (select max(min1) from lab_tatctrl where (lab_tatctrl.jzbz='@' or (lab_tatctrl.jzbz='1' and a.jzbz='1') or (lab_tatctrl.jzbz='0' and isnull(a.jzbz,'') !='1')) and ( lab_tatctrl.yblx='@' or  lab_tatctrl.yblx=a.yblx ) and lab_tatctrl.ruletype = '4'  and lab_tatctrl.refcode=c.sqxmdh) as min1,
         (select max(min2) from lab_tatctrl where (lab_tatctrl.jzbz='@' or (lab_tatctrl.jzbz='1' and a.jzbz='1') or (lab_tatctrl.jzbz='0' and isnull(a.jzbz,'') !='1')) and ( lab_tatctrl.yblx='@' or  lab_tatctrl.yblx=a.yblx ) and lab_tatctrl.ruletype = '4'  and lab_tatctrl.refcode=c.sqxmdh) as min2,
@@ -95,7 +96,6 @@
             <if test="addr != null"> and  a.addr = #{addr}</if>
             <if test="lstd != null"> and  a.lstd = #{lstd}</if>
             <if test="slzq != null"> and  a.slzq = #{slzq}</if>
-            <if test="fb != null"> and  a.fb = #{fb}</if>
             <if test="ybrl != null"> and  a.ybrl = #{ybrl}</if>
             <if test="qsyljg != null"> and  a.qsyljg = #{qsyljg}</if>
             <if test="cjbw != null"> and  a.cjbw = #{cjbw}</if>