diff --git a/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmInfoNew.java b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmInfoNew.java
index 87d3f43..e831f0f 100644
--- a/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmInfoNew.java
+++ b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmInfoNew.java
@@ -72,4 +72,6 @@ public class XmInfoNew {
     private String inputcode;
     private String jsxm;
 
+    private String queryDylx;
+
 }
diff --git a/liswork/src/main/java/com/czlis/liswork/controller/dict/ReportItemController.java b/liswork/src/main/java/com/czlis/liswork/controller/dict/ReportItemController.java
index 07e671e..ccce3ab 100644
--- a/liswork/src/main/java/com/czlis/liswork/controller/dict/ReportItemController.java
+++ b/liswork/src/main/java/com/czlis/liswork/controller/dict/ReportItemController.java
@@ -32,10 +32,11 @@ public class ReportItemController extends BaseController {
 
     @ApiOperation("查询检验项目列表")
     @GetMapping("/query")
-    public Result query(XmInfoNew xmInfoNew) {
+    public TableDataInfo query(XmInfoNew xmInfoNew) {
+        startPage();
         log.info("查询列表："+xmInfoNew);
        List<XmInfoNew> xmInfoNewList = reportItemService.query(xmInfoNew);
-       return new Result("0","查询成功！",xmInfoNewList);
+       return getDataTable(xmInfoNewList);
     }
 
 
@@ -161,4 +162,27 @@ public class ReportItemController extends BaseController {
     public Result delXmTextresultNew(XmTextresultNew xmTextresultNew){
         return reportItemService.delXmTextresultNew(xmTextresultNew);
     }
+
+
+    @ApiOperation("查询批量数据")
+    @GetMapping("/queryBatch")
+    public Result queryBatch(XmInfoNew xmInfoNew){
+        return reportItemService.queryBatch(xmInfoNew);
+    }
+
+    @Anonymous
+    @Log(title = SysLogConstants.REPORTITEM_LOG,businessType = BusinessType.INSERT_VS)
+    @ApiOperation("批量新增数据")
+    @PostMapping("/addBatch")
+    public Result addBatch(@RequestBody List<XmInfoNew> xmInfoNewList){
+        return reportItemService.addBatch(xmInfoNewList);
+    }
+
+    @Anonymous
+    @Log(title = SysLogConstants.REPORTITEM_LOG,businessType = BusinessType.DELETE)
+    @ApiOperation("批量删除对应")
+    @PostMapping("/delBatch")
+    public Result delBatch(@RequestBody List<Integer> vsidList ){
+        return reportItemService.delBatch(vsidList);
+    }
 }
diff --git a/liswork/src/main/java/com/czlis/liswork/mapper/dict/ReportItemMapper.java b/liswork/src/main/java/com/czlis/liswork/mapper/dict/ReportItemMapper.java
index 93ad848..b3b37cb 100644
--- a/liswork/src/main/java/com/czlis/liswork/mapper/dict/ReportItemMapper.java
+++ b/liswork/src/main/java/com/czlis/liswork/mapper/dict/ReportItemMapper.java
@@ -61,4 +61,10 @@ public interface ReportItemMapper {
     void delXmAlarmdetailNew(XmAlarmdetailNew xmAlarmdetailNew);
 
     void delXmTextresultNew(XmTextresultNew xmTextresultNew);
+
+    List<XmInfoNew> queryBatch(XmInfoNew xmInfoNew);
+
+    void addBatch(@Param("xmInfoNewList") List<XmInfoNew> xmInfoNewList);
+
+    void delBatch(@Param("vsidList") List<Integer> vsidList);
 }
diff --git a/liswork/src/main/java/com/czlis/liswork/service/ReportItemService.java b/liswork/src/main/java/com/czlis/liswork/service/ReportItemService.java
index 0a59512..a784bf8 100644
--- a/liswork/src/main/java/com/czlis/liswork/service/ReportItemService.java
+++ b/liswork/src/main/java/com/czlis/liswork/service/ReportItemService.java
@@ -45,4 +45,10 @@ public interface ReportItemService {
     Result delXmValNew(XmValNew xmValNew);
 
     Result delXmTextresultNew(XmTextresultNew xmTextresultNew);
+
+    Result queryBatch(XmInfoNew xmInfoNew);
+
+    Result addBatch(List<XmInfoNew> xmInfoNewList);
+
+    Result delBatch(List<Integer> vsidList);
 }
diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/ReportItemServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/ReportItemServiceImpl.java
index 985a517..29003fc 100644
--- a/liswork/src/main/java/com/czlis/liswork/service/impl/ReportItemServiceImpl.java
+++ b/liswork/src/main/java/com/czlis/liswork/service/impl/ReportItemServiceImpl.java
@@ -104,6 +104,7 @@ public class ReportItemServiceImpl implements ReportItemService {
     @Override
     public Result delete(Integer xmid) {
         Long xmInfoVsCount = reportItemMapper.getXmInfoVsCount(xmid);
+        if(xmid == null) return new Result("-1","参数为空不允许删除！");
         if(xmInfoVsCount > 0) return new Result("-1","已经有仪器做过这个项目的对照，不允许删除！");
         XmInfoNew xmInfoNew1 = new XmInfoNew();
         xmInfoNew1.setXmid(xmid);
@@ -259,6 +260,7 @@ public class ReportItemServiceImpl implements ReportItemService {
 
     @Override
     public Result deleteXmInfoVs(Integer vsid) {
+        if(vsid == null) return new Result("-1","入参仪器对应ID不能为空！");
         reportItemMapper.deleteXmInfoVs(vsid);
         return new Result("0","删除成功！");
     }
@@ -277,6 +279,8 @@ public class ReportItemServiceImpl implements ReportItemService {
 
     @Override
     public Result deleteXmFilter(String yq, String lgph) {
+        if(yq == null || yq.equals("")) return new Result("-1","入参yq不能为空！");
+        if(lgph == null || lgph.equals("")) return new Result("-1","入参lgph不能为空！");
         reportItemMapper.deleteXmFilter(yq,lgph);
         return new Result("0","删除成功！");
     }
@@ -295,6 +299,8 @@ public class ReportItemServiceImpl implements ReportItemService {
 
     @Override
     public Result deleteXmLot(String yq, String sjph) {
+        if(yq == null || yq.equals("")) return new Result("-1","入参yq不能为空！");
+        if(sjph == null || sjph.equals("")) return new Result("-1","入参sjph不能为空！");
         reportItemMapper.deleteXmLot(yq,sjph);
         return new Result("0","删除成功！");
     }
@@ -337,21 +343,48 @@ public class ReportItemServiceImpl implements ReportItemService {
 
     @Override
     public Result delXmAlarmdetailNew(XmAlarmdetailNew xmAlarmdetailNew) {
+        if(xmAlarmdetailNew == null) return new Result("-1","入参不能为空！");
+        if(xmAlarmdetailNew.getXmid() == null) return new Result("-1","xmid不能为空！");
         reportItemMapper.delXmAlarmdetailNew(xmAlarmdetailNew);
         return new Result("0","删除数据成功！");
     }
 
     @Override
     public Result delXmValNew(XmValNew xmValNew) {
+        if(xmValNew == null) return new Result("-1","入参不能为空！");
+        if(xmValNew.getXmid() == null) return new Result("-1","xmid不能为空！");
         reportItemMapper.deleteXmValNew(xmValNew);
         return new Result("0","删除成功！");
     }
 
     @Override
     public Result delXmTextresultNew(XmTextresultNew xmTextresultNew) {
+        if(xmTextresultNew == null) return new Result("-1","入参不能为空！");
+        if(xmTextresultNew.getXmid() == null) return new Result("-1","xmid不能为空！");
         reportItemMapper.delXmTextresultNew(xmTextresultNew);
         return new Result("0","删除成功！");
     }
 
+    @Override
+    public Result queryBatch(XmInfoNew xmInfoNew) {
+        if(xmInfoNew == null) return new Result("-1","入参不能为空！");
+        if(xmInfoNew.getQueryDylx() == null || xmInfoNew.getQueryDylx().equals("")) return new Result("-1","查询类型不能为空！");
+        if(xmInfoNew.getYq() == null || xmInfoNew.getYq().equals("")) return new Result("-1","仪器参数不能为空！");
+        List<XmInfoNew> xmInfoNewList = reportItemMapper.queryBatch(xmInfoNew);
+        return new Result("0","查询成功！",xmInfoNewList);
+    }
+
+    @Override
+    public Result addBatch(List<XmInfoNew> xmInfoNewList) {
+        reportItemMapper.addBatch(xmInfoNewList);
+        return new Result("0","批量新增数据成功！");
+    }
+
+    @Override
+    public Result delBatch(List<Integer> vsidList) {
+        reportItemMapper.delBatch(vsidList);
+        return new Result("0","批量删除数据成功！");
+    }
+
 
 }
diff --git a/liswork/src/main/resources/mapper/ReportItemMapper.xml b/liswork/src/main/resources/mapper/ReportItemMapper.xml
index 4987b57..39300cc 100644
--- a/liswork/src/main/resources/mapper/ReportItemMapper.xml
+++ b/liswork/src/main/resources/mapper/ReportItemMapper.xml
@@ -377,66 +377,15 @@
     </select>
 
     <update id="updateXmInfoNew">
-        update xm_info_new
-        <set>
-            <if test="yq != null and yq != ''">yq = #{yq},</if>
-            <if test="xmdh != null and xmdh != ''">xmdh = #{xmdh},</if>
-            <if test="xmmc != null and xmmc != ''">xmmc = #{xmmc},</if>
-            <if test="zhbdh != null and zhbdh != ''">zhbdh = #{zhbdh},</if>
-            <if test="bgdh != null and bgdh != ''">bgdh = #{bgdh},</if>
-            <if test="cksx != null">cksx = #{cksx},</if>
-            <if test="ckxx != null">ckxx = #{ckxx},</if>
-            <if test="dyckz != null and dyckz != ''">dyckz = #{dyckz},</if>
-            <if test="dylx != null and dylx != ''">dylx = #{dylx},</if>
-            <if test="dyxh != null ">dyxh = #{dylx},</if>
-            <if test="zjf != null and zjf != ''">zjf = #{zjf},</if>
-            <if test="xmlb != null and xmlb != ''">xmlb = #{xmlb},</if>
-            <if test="xs != null ">xs = #{xs},</if>
-            <if test="xsws != null ">xsws = #{xsws},</if>
-            <if test="mrz != null and mrz != ''">mrz = #{mrz},</if>
-            <if test="jg != null ">jg = #{jg},</if>
-            <if test="cb != null ">cb = #{cb},</if>
-            <if test="dw != null and dw != ''">dw = #{dw},</if>
-            <if test="jsxm != null and jsxm != ''">jsxm = #{jsxm},</if>
-            <if test="jsgs != null and jsgs != ''">jsgs = #{jsgs},</if>
-            <if test="zkxm != null and zkxm != ''">zkxm = #{zkxm},</if>
-            <if test="sjx != null ">sjx = #{sjx},</if>
-            <if test="xjx != null ">xjx = #{xjx},</if>
-            <if test="ygxb != null and ygxb=''">ygxb = #{ygxb},</if>
-            <if test="ygnl != null and ygnl=''">ygnl = #{ygnl},</if>
-            <if test="ygbb != null and ygbb=''">ygbb = #{ygbb},</if>
-            <if test="lcyy != null and lcyy=''">lcyy = #{lcyy},</if>
-            <if test="jgbz != null and jgbz=''">jgbz = #{jgbz},</if>
-            <if test="jgjg != null" >jgjg = #{jgjg},</if>
-            <if test="jgz != null" >jgz = #{jgz},</if>
-            <if test="csff != null and csff != ''" >csff = #{csff},</if>
-            <if test="yymc != null and yymc != ''" >yymc = #{yymc},</if>
-            <if test="fzdyxh != null" >fzdyxh = #{fzdyxh},</if>
-            <if test="clinicref != null and clinicref != ''" >clinicref = #{clinicref},</if>
-            <if test="llimit != null " >llimit = #{llimit},</if>
-            <if test="hlimit != null " >hlimit = #{hlimit},</if>
-            <if test="xsbs != null " >xsbs = #{xsbs},</if>
-            <if test="redoxx != null " >redoxx = #{redoxx},</if>
-            <if test="redosx != null " >redosx = #{redosx},</if>
-            <if test="qcuselog != null and qcuselog != ''" >qcuselog = #{qcuselog},</if>
-            <if test="qcusepos != null and qcusepos != ''" >qcusepos = #{qcusepos},</if>
-            <if test="itemclass != null and itemclass != ''" >itemclass = #{itemclass},</if>
-            <if test="whocode != null and whocode != ''" >whocode = #{whocode},</if>
-            <if test="germflag != null and germflag != ''" >germflag = #{germflag},</if>
-            <if test="qccv != null " >qccv = #{qccv},</if>
-            <if test="qcvs != null and qcvs != ''" >qcvs = #{qcvs},</if>
-            <if test="knowledge != null and knowledge != ''" >knowledge = #{knowledge},</if>
-            <if test="ygzq != null and ygzq != ''" >ygzq = #{ygzq},</if>
-            <if test="ygzd != null and ygzd != ''" >ygzd = #{ygzd},</if>
-            <if test="xmgl != null and xmgl != ''" >xmgl = #{xmgl},</if>
-            <if test="yqdl != null and yqdl != ''" >yqdl = #{yqdl},</if>
-            <if test="uflag != null and uflag != ''" >uflag = #{uflag},</if>
-            <if test="val1 != null and val1 != ''" >val1 = #{val1},</if>
-            <if test="val2 != null and val2 != ''" >val2 = #{val2},</if>
-            <if test="val3 != null and val3 != ''" >val3 = #{val3},</if>
-            <if test="val4 != null and val4 != ''" >val4 = #{val4},</if>
-            <if test="val5 != null and val5 != ''" >val5 = #{val5},</if>
-        </set>
+        update xm_info_new set yq = #{yq},xmdh = #{xmdh},xmmc = #{xmmc},zhbdh = #{zhbdh},bgdh = #{bgdh},cksx = #{cksx},
+        dyckz = #{dyckz},dylx = #{dylx},dyxh = #{dyxh},zjf = #{zjf},xmlb = #{xmlb},xs = #{xs},xsws = #{xsws},mrz = #{mrz},
+        jg = #{jg},cb = #{cb},dw = #{dw},jsxm = #{jsxm},jsgs = #{jsgs},zkxm = #{zkxm},sjx = #{sjx},xjx = #{xjx},
+        ygxb = #{ygxb},lcyy = #{lcyy},jgbz = #{jgbz},jgjg = #{jgjg},jgz = #{jgz},csff = #{csff},yymc = #{yymc},
+        fzdyxh = #{fzdyxh},clinicref = #{clinicref,jdbcType=VARCHAR},llimit = #{llimit,jdbcType=REAL},hlimit = #{hlimit,jdbcType=REAL},xsbs = #{xsbs},
+        redoxx = #{redoxx},redosx = #{redosx},qcuselog = #{qcuselog},qcusepos = #{qcusepos},itemclass = #{itemclass},
+        whocode = #{whocode},germflag = #{germflag},qccv = #{qccv},qcvs = #{qcvs},knowledge = #{knowledge},
+        ygzq = #{ygzq},ygzd = #{ygzd},xmgl = #{xmgl},yqdl = #{yqdl},uflag = #{uflag},val1 = #{val1},val2 = #{val2},
+        val3 = #{val3},val4 = #{val4},val5 = #{val5},ygnl = #{ygnl},ygbb = #{ygbb},ckxx = #{ckxx}
         where xmid = #{xmid}
     </update>
 
@@ -616,4 +565,33 @@
     <delete id="delXmTextresultNew">
         delete from xm_textresult_new where xmid = #{xmid} and xh = #{xh}
     </delete>
+
+    <select id="queryBatch" resultType="com.czlis.common.core.domain.entity.lis.XmInfoNew">
+        <![CDATA[select * from xm_info_new where isnull(uflag,'0') = '0']]>
+        <if test="queryDylx == 1">and xmid not in (select xmid from xm_info_vs where xm_info_vs.yq = #{yq})</if>
+        <if test="queryDylx == 2">and xmid in (select xmid from xm_info_vs where xm_info_vs.yq = #{yq})</if>
+        <if test="xmgl != null and xmgl != ''">and xmgl = #{xmgl}</if>
+        <if test="itemclass != null and itemclass != ''">and itemclass = #{itemclass}</if>
+        <if test="inputcode != null and inputcode != ''" >and (xmdh like '%'+#{inputcode}+'%' or xmmc like '%'+#{inputcode}+'%' or zjf like '%'+#{inputcode}+'%')</if>
+        <if test="yqdl != null and yqdl != ''">and yqdl = #{yqdl}</if>
+        <if test="xmid != null and xmid != ''">and xmid = #{xmid}</if>
+        <if test="isWsw != null and isWsw !=''"><![CDATA[and yqdl <> '细菌仪']]></if>
+
+    </select>
+
+    <insert id="addBatch">
+        insert into xm_info_vs(yq, xmid, dylx, dyxh, uflag, xs, xsws, fzdyxh, zkxm)
+        values
+        <foreach collection="xmInfoNewList" item="xmInfoNew" separator=",">
+            (#{xmInfoNew.yq}, #{xmInfoNew.xmid},#{xmInfoNew.dylx},#{xmInfoNew.dyxh},'0',#{xmInfoNew.xs},#{xmInfoNew.xsws},'0','N')
+        </foreach>
+
+    </insert>
+
+    <delete id="delBatch">
+        delete from xm_info_vs where vsid in
+        <foreach collection="vsidList" item="vsid" open="(" close=")" separator=",">
+            #{vsid}
+        </foreach>
+    </delete>
 </mapper>