lis项目维护

liswork/src/main/java/com/czlis/liswork/controller/dict/InstrController.java

@@ -0,0 +1,52 @@
+package com.czlis.liswork.controller.dict;
+
+import com.czlis.common.core.controller.BaseController;
+import com.czlis.common.core.domain.Result;
+import com.czlis.common.core.page.TableDataInfo;
+import com.czlis.liswork.pojo.LabInstr;
+import com.czlis.liswork.service.InstrService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 仪器维护注册
+ */
+@Api(tags = "仪器维护注册")
+@RestController
+@RequestMapping("/instr")
+public class InstrController extends BaseController {
+
+    @Autowired
+    private InstrService instrService;
+
+    @ApiOperation("查询数据")
+    @GetMapping("/query")
+    public TableDataInfo query(String yq){
+        startPage();
+        List<LabInstr> labInstrList = instrService.query(yq);
+        return getDataTable(labInstrList);
+    }
+
+    @ApiOperation("新增数据")
+    @PostMapping("/add")
+    public Result add(LabInstr labInstr){
+        return instrService.add(labInstr);
+    }
+
+    @ApiOperation("修改数据")
+    @PostMapping("/update")
+    public Result update(LabInstr labInstr){
+        return instrService.update(labInstr);
+    }
+
+    @ApiOperation("删除数据")
+    @DeleteMapping("/del")
+    public Result delete(String yq){
+        return instrService.delete(yq);
+    }
+
+}

liswork/src/main/java/com/czlis/liswork/controller/dict/ReportItemController.java

@@ -5,6 +5,7 @@ import com.czlis.common.core.domain.Result;
 import com.czlis.common.core.page.TableDataInfo;
 import com.czlis.liswork.pojo.DTO.XmInfoNewDTO;
 import com.czlis.liswork.pojo.XmInfoNew;
+import com.czlis.liswork.pojo.XmInfoVs;
 import com.czlis.liswork.service.ReportItemService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -50,4 +51,15 @@ public class ReportItemController extends BaseController {
     public Result update(@RequestBody XmInfoNewDTO xmInfoNewDTO){
         return reportItemService.update(xmInfoNewDTO);
     }
+
+    @ApiOperation("新增仪器项目对照")
+    @PostMapping("/addvs")
+    public Result addvs(XmInfoVs xmInfoVs){
+        return reportItemService.addvs(xmInfoVs);
+    }
+
+    @DeleteMapping("/delvs")
+    public Result deleteXmInfoVs(Integer vsid){
+        return reportItemService.deleteXmInfoVs(vsid);
+    }
 }

liswork/src/main/java/com/czlis/liswork/controller/dict/XmFeeInstrController.java

@@ -0,0 +1,50 @@
+package com.czlis.liswork.controller.dict;
+
+import com.czlis.common.core.controller.BaseController;
+import com.czlis.common.core.domain.Result;
+import com.czlis.common.core.page.TableDataInfo;
+import com.czlis.liswork.pojo.XmFeeInstr;
+import com.czlis.liswork.service.XmFeeInstrService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.constraints.NotBlank;
+import java.util.List;
+
+/**
+ * 仪器收费项目对照
+ */
+@Api(tags = "仪器收费项目对照")
+@RestController
+@RequestMapping("/feeinstr")
+public class XmFeeInstrController extends BaseController {
+
+    @Autowired
+    private XmFeeInstrService xmFeeInstrService;
+
+    @ApiOperation("查询仪器收费项目对照")
+    @GetMapping("/query")
+    public TableDataInfo query(String yq,String sfxmdh){
+        startPage();
+        List<XmFeeInstr> xmFeeInstrList =  xmFeeInstrService.query(yq,sfxmdh);
+        return getDataTable(xmFeeInstrList);
+    }
+
+    @ApiOperation("新增仪器收费项目对照")
+    @PostMapping("/add")
+    public Result add(XmFeeInstr xmFeeInstr){
+        return xmFeeInstrService.add(xmFeeInstr);
+    }
+
+    @PostMapping("/update")
+    public Result update(XmFeeInstr xmFeeInstr){
+        return xmFeeInstrService.update(xmFeeInstr);
+    }
+
+    @DeleteMapping("/del")
+    public Result delete(@NotBlank(message = "yq参数不能为空！") String yq,@NotBlank(message = "sfxmdh参数不能为空！") String sfxmdh){
+        return xmFeeInstrService.delete(yq,sfxmdh);
+    }
+}

liswork/src/main/java/com/czlis/liswork/controller/dict/XmReqitemVsReportitemController.java

@@ -0,0 +1,54 @@
+package com.czlis.liswork.controller.dict;
+
+import com.czlis.common.core.controller.BaseController;
+import com.czlis.common.core.domain.Result;
+import com.czlis.common.core.page.TableDataInfo;
+import com.czlis.liswork.pojo.XmReqitemVsReportitem;
+import com.czlis.liswork.service.XmReqitemVsReportitemService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ *  收费项目报告项目对照
+ */
+@Api(tags = "收费项目报告项目对照")
+@RestController
+@RequestMapping("/vsReportitem")
+public class XmReqitemVsReportitemController extends BaseController {
+
+    @Autowired
+    private XmReqitemVsReportitemService xmReqitemVsReportitemService;
+
+    @ApiOperation("查询收费项目报告项目对照")
+    @PostMapping("/query")
+    public TableDataInfo query(XmReqitemVsReportitem xmReqitemVsReportitem){
+        startPage();
+        List<XmReqitemVsReportitem> xmReqitemVsReportitemList = xmReqitemVsReportitemService.query(xmReqitemVsReportitem);
+        return getDataTable(xmReqitemVsReportitemList);
+    }
+
+    @ApiOperation("新增收费项目报告项目对照")
+    @PostMapping("/add")
+    public Result add(XmReqitemVsReportitem xmReqitemVsReportitem){
+        return xmReqitemVsReportitemService.add(xmReqitemVsReportitem);
+    }
+
+    @ApiOperation("删除收费项目报告项目对照")
+    @DeleteMapping("/del")
+    public Result delete(String sqxmdh,String yq,String xmdh,String tdh){
+        return xmReqitemVsReportitemService.delete(sqxmdh,yq,xmdh,tdh);
+    }
+
+    @ApiOperation("修改收费项目报告项目对照")
+    @PostMapping("/update")
+    public Result update(XmReqitemVsReportitem xmReqitemVsReportitem){
+        return xmReqitemVsReportitemService.update(xmReqitemVsReportitem);
+    }
+}

liswork/src/main/java/com/czlis/liswork/mapper/dict/ReportItemMapper.java

@@ -29,4 +29,8 @@ public interface ReportItemMapper {
     void updateXmRefRow(XmRef xmRefRow);
     void updateXmValRow(XmVal xmValRow);
     void updateXmTextResultRow(XmTextResult xmTextResultRow);
+
+    void addXmInfoVs(XmInfoVs xmInfoVs);
+    void deleteXmInfoVs(Integer vsid);
+
 }

liswork/src/main/java/com/czlis/liswork/mapper/dict/XmFeeInstrMapper.java

@@ -0,0 +1,12 @@
+package com.czlis.liswork.mapper.dict;
+
+import com.czlis.liswork.pojo.XmFeeInstr;
+
+import java.util.List;
+
+public interface XmFeeInstrMapper {
+    List<XmFeeInstr> query(String yq, String sfxmdh);
+    void add(XmFeeInstr xmFeeInstr);
+    void update(XmFeeInstr xmFeeInstr);
+    void delete(String yq, String sfxmdh);
+}

liswork/src/main/java/com/czlis/liswork/mapper/dict/XmReqitemVsReportitemMapper.java

@@ -0,0 +1,13 @@
+package com.czlis.liswork.mapper.dict;
+
+import com.czlis.liswork.pojo.XmReqitemVsReportitem;
+
+import java.util.List;
+
+public interface XmReqitemVsReportitemMapper {
+    List<XmReqitemVsReportitem> query(XmReqitemVsReportitem xmReqitemVsReportitem);
+    void add(XmReqitemVsReportitem xmReqitemVsReportitem);
+    void delete(String sqxmdh, String yq, String xmdh, String tdh);
+    void update(XmReqitemVsReportitem xmReqitemVsReportitem);
+
+}

liswork/src/main/java/com/czlis/liswork/mapper/xtwh/InstrMapper.java

@@ -0,0 +1,12 @@
+package com.czlis.liswork.mapper.xtwh;
+
+import com.czlis.liswork.pojo.LabInstr;
+
+import java.util.List;
+
+public interface InstrMapper {
+    List<LabInstr> query(String yq);
+    void add(LabInstr labInstr);
+    void update(LabInstr labInstr);
+    void delete(String yq);
+}

liswork/src/main/java/com/czlis/liswork/pojo/LabInstr.java

@@ -0,0 +1,55 @@
+package com.czlis.liswork.pojo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class LabInstr {
+    private String yq;
+    private String yqmc;
+    private String yqdl;
+    private Integer jbs;
+    private String csbg;
+    private String dnmc;
+    private Integer bgdh;
+    private String bgtt;
+    private String zcm;
+    private Integer zzdx;
+    private String zzfx;
+    private BigDecimal zzcd;
+    private BigDecimal zzkd;
+    private BigDecimal sjl;
+    private BigDecimal zjl;
+    private BigDecimal yjl;
+    private BigDecimal xjl;
+    private Integer qtzzdx;
+    private String qtzzfx;
+    private BigDecimal qtsjl;
+    private BigDecimal qtzjl;
+    private BigDecimal qtyjl;
+    private BigDecimal qtxjl;
+    private Integer myhs;
+    private String pcdyms;
+    private Integer txjg;
+    private String sdtfx1;
+    private String sdtfx2;
+    private String posflag;
+    private String weakflag;
+    private String upflag;
+    private String lowflag;
+    private String errflag;
+    private String yqxh;
+    private String lisgroup;
+    private Integer myhs1;
+    private Integer userpt2cnt;
+    private String instrid;
+    private String wjzflag;
+    private String backgpmd;
+    private String yljg;
+    private String useflag;
+}

liswork/src/main/java/com/czlis/liswork/pojo/XmFeeInstr.java

@@ -0,0 +1,15 @@
+package com.czlis.liswork.pojo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class XmFeeInstr {
+    private String yq;
+    private String sfxmdh;
+    private String mrz;
+    private Integer xh;
+}

liswork/src/main/java/com/czlis/liswork/pojo/XmReqitemVsReportitem.java

@@ -0,0 +1,21 @@
+package com.czlis.liswork.pojo;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class XmReqitemVsReportitem {
+
+    private String sqxmdh;
+    private String sqxmmc;
+    private String yq;
+    private String xmdh;
+    private Integer seq;
+    private String tdh;
+    private String mrz;
+    private String def;
+}

liswork/src/main/java/com/czlis/liswork/service/InstrService.java

@@ -0,0 +1,13 @@
+package com.czlis.liswork.service;
+
+import com.czlis.common.core.domain.Result;
+import com.czlis.liswork.pojo.LabInstr;
+
+import java.util.List;
+
+public interface InstrService {
+    List<LabInstr> query(String yq);
+    Result add(LabInstr labInstr);
+    Result update(LabInstr labInstr);
+    Result delete(String yq);
+}

liswork/src/main/java/com/czlis/liswork/service/ReportItemService.java

@@ -3,6 +3,7 @@ package com.czlis.liswork.service;
 import com.czlis.common.core.domain.Result;
 import com.czlis.liswork.pojo.DTO.XmInfoNewDTO;
 import com.czlis.liswork.pojo.XmInfoNew;
+import com.czlis.liswork.pojo.XmInfoVs;
 
 import java.util.List;
 
@@ -16,4 +17,7 @@ public interface ReportItemService {
     Result update(XmInfoNewDTO xmInfoNewDTO);
 
 
+    Result addvs(XmInfoVs xmInfoVs);
+
+    Result deleteXmInfoVs(Integer vsid);
 }

liswork/src/main/java/com/czlis/liswork/service/XmFeeInstrService.java

@@ -0,0 +1,16 @@
+package com.czlis.liswork.service;
+
+import com.czlis.common.core.domain.Result;
+import com.czlis.liswork.pojo.XmFeeInstr;
+
+import java.util.List;
+
+public interface XmFeeInstrService {
+    List<XmFeeInstr> query(String yq, String sfxmdh);
+
+    Result add(XmFeeInstr xmFeeInstr);
+
+    Result update(XmFeeInstr xmFeeInstr);
+
+    Result delete(String yq, String sfxmdh);
+}

liswork/src/main/java/com/czlis/liswork/service/XmReqitemVsReportitemService.java

@@ -0,0 +1,14 @@
+package com.czlis.liswork.service;
+
+import com.czlis.common.core.domain.Result;
+import com.czlis.common.core.page.TableDataInfo;
+import com.czlis.liswork.pojo.XmReqitemVsReportitem;
+
+import java.util.List;
+
+public interface XmReqitemVsReportitemService {
+    List<XmReqitemVsReportitem> query(XmReqitemVsReportitem xmReqitemVsReportitem);
+    Result add(XmReqitemVsReportitem xmReqitemVsReportitem);
+    Result delete(String sqxmdh, String yq, String xmdh, String tdh);
+    Result update(XmReqitemVsReportitem xmReqitemVsReportitem);
+}

liswork/src/main/java/com/czlis/liswork/service/impl/InstrServiceImpl.java

@@ -0,0 +1,44 @@
+package com.czlis.liswork.service.impl;
+
+import com.czlis.common.core.domain.Result;
+import com.czlis.liswork.mapper.xtwh.InstrMapper;
+import com.czlis.liswork.pojo.LabInstr;
+import com.czlis.liswork.service.InstrService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+
+import java.util.List;
+
+@Service
+@Slf4j
+public class InstrServiceImpl implements InstrService {
+
+    @Autowired
+    private InstrMapper instrMapper;
+
+
+    @Override
+    public List<LabInstr> query(String yq) {
+        return instrMapper.query(yq);
+    }
+
+    @Override
+    public Result add(LabInstr labInstr) {
+        instrMapper.add(labInstr);
+        return new Result("0","添加数据成功！");
+    }
+
+    @Override
+    public Result update(LabInstr labInstr) {
+        instrMapper.update(labInstr);
+        return new Result("0","修改数据成功！");
+    }
+
+    @Override
+    public Result delete(String yq) {
+        instrMapper.delete(yq);
+        return new Result("0","删除数据成功！");
+    }
+}

liswork/src/main/java/com/czlis/liswork/service/impl/ReportItemServiceImpl.java

@@ -115,5 +115,17 @@ public class ReportItemServiceImpl implements ReportItemService {
         return new Result("0","添加项目成功！");
     }
 
+    @Override
+    public Result addvs(XmInfoVs xmInfoVs) {
+        reportItemMapper.addXmInfoVs(xmInfoVs);
+        return new Result("0","添加对照项目成功！");
+    }
+
+    @Override
+    public Result deleteXmInfoVs(Integer vsid) {
+        reportItemMapper.deleteXmInfoVs(vsid);
+        return new Result("0","删除成功！");
+    }
+
 
 }

liswork/src/main/java/com/czlis/liswork/service/impl/XmFeeInstrServiceImpl.java

@@ -0,0 +1,44 @@
+package com.czlis.liswork.service.impl;
+
+import com.czlis.common.core.domain.Result;
+import com.czlis.liswork.mapper.dict.XmFeeInstrMapper;
+import com.czlis.liswork.pojo.XmFeeInstr;
+import com.czlis.liswork.service.XmFeeInstrService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+
+import java.util.List;
+
+@Service
+@Slf4j
+public class XmFeeInstrServiceImpl implements XmFeeInstrService {
+
+    @Autowired
+    private XmFeeInstrMapper xmFeeInstrMapper;
+
+
+    @Override
+    public List<XmFeeInstr> query(String yq, String sfxmdh) {
+        return xmFeeInstrMapper.query(yq,sfxmdh);
+    }
+
+    @Override
+    public Result add(XmFeeInstr xmFeeInstr) {
+        xmFeeInstrMapper.add(xmFeeInstr);
+        return new Result("0","新增项目成功！");
+    }
+
+    @Override
+    public Result update(XmFeeInstr xmFeeInstr) {
+        xmFeeInstrMapper.update(xmFeeInstr);
+        return new Result("0","修改项目成功！");
+    }
+
+    @Override
+    public Result delete(String yq, String sfxmdh) {
+        xmFeeInstrMapper.delete(yq,sfxmdh);
+        return new Result("0","删除项目成功！");
+    }
+}

liswork/src/main/java/com/czlis/liswork/service/impl/XmReqitemVsReportitemImpl.java

@@ -0,0 +1,47 @@
+package com.czlis.liswork.service.impl;
+
+import com.czlis.common.core.domain.Result;
+import com.czlis.common.core.page.TableDataInfo;
+import com.czlis.liswork.mapper.dict.XmReqitemVsReportitemMapper;
+import com.czlis.liswork.pojo.XmReqitemVsReportitem;
+import com.czlis.liswork.service.XmReqitemVsReportitemService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+@Service
+@Slf4j
+public class XmReqitemVsReportitemImpl implements XmReqitemVsReportitemService {
+
+    @Autowired
+    private XmReqitemVsReportitemMapper xmReqitemVsReportitemMapper;
+
+    @Override
+    public List<XmReqitemVsReportitem> query(XmReqitemVsReportitem xmReqitemVsReportitem) {
+        return xmReqitemVsReportitemMapper.query(xmReqitemVsReportitem);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public Result add(XmReqitemVsReportitem xmReqitemVsReportitem) {
+        xmReqitemVsReportitemMapper.add(xmReqitemVsReportitem);
+        return new Result("0","添加项目成功！");
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public Result delete(String sqxmdh, String yq, String xmdh, String tdh) {
+        xmReqitemVsReportitemMapper.delete(sqxmdh,yq,xmdh,tdh);
+        return new Result("0","删除项目成功！");
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public Result update(XmReqitemVsReportitem xmReqitemVsReportitem) {
+        xmReqitemVsReportitemMapper.update(xmReqitemVsReportitem);
+        return new Result("0","修改项目成功！");
+    }
+}

liswork/src/main/resources/mapper/InstrMapper.xml

@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.czlis.liswork.mapper.xtwh.InstrMapper">
+
+    <select id="query">
+        select * from lab_instr
+        <where>
+            <if test="yq != null and yq != ''">and yq = #{yq}</if>
+        </where>
+    </select>
+
+    <insert id="add">
+        insert into lab_instr(
+        <if test="yqmc != null and yqmc != ''">yqmc,</if>
+        <if test="yqdl != null and yqdl != ''">yqdl,</if>
+        <if test="jbs != null">jbs,</if>
+        <if test="csbg != null and csbg != ''">csbg,</if>
+        <if test="dnmc != null and dnmc != ''">dnmc,</if>
+        <if test="bgdh != null ">bgdh,</if>
+        <if test="bgtt != null and bgtt != ''">bgtt,</if>
+        <if test="zcm != null and zcm != ''">zcm,</if>
+        <if test="zzdx != null ">zzdx,</if>
+        <if test="zzfx != null and zzfx != ''">zzfx,</if>
+        <if test="zzcd != null">zzcd,</if>
+        <if test="zzkd != null">zzkd,</if>
+        <if test="sjl != null">sjl,</if>
+        <if test="zjl != null">zjl,</if>
+        <if test="yjl != null">yjl,</if>
+        <if test="xjl != null">xjl,</if>
+        <if test="qtzzdx != null">qtzzdx,</if>
+        <if test="qtzzfx != null and qtzzfx != ''">qtzzfx,</if>
+        <if test="qtsjl != null ">qtsjl,</if>
+        <if test="qtzjl != null ">qtzjl,</if>
+        <if test="qtyjl != null ">qtyjl,</if>
+        <if test="qtxjl != null ">qtxjl,</if>
+        <if test="myhs != null ">myhs,</if>
+        <if test="pcdyms != null and pcdyms != ''">pcdyms,</if>
+        <if test="txjg != null ">txjg,</if>
+        <if test="sdtfx1 != null and sdtfx1 != ''">sdtfx1,</if>
+        <if test="sdtfx2 != null and sdtfx2 != ''">sdtfx2,</if>
+        <if test="posflag != null and posflag != ''">posflag,</if>
+        <if test="weakflag != null and weakflag != ''">weakflag,</if>
+        <if test="upflag != null and upflag != ''">upflag,</if>
+        <if test="lowflag != null and lowflag != ''">lowflag,</if>
+        <if test="errflag != null and errflag != ''">errflag,</if>
+        <if test="yqxh != null and yqxh != ''">yqxh,</if>
+        <if test="lisgroup != null and lisgroup != ''">lisgroup,</if>
+        <if test="myhs1 != null ">myhs1,</if>
+        <if test="userpt2cnt != null ">userpt2cnt,</if>
+        <if test="billingmode != null and billingmode != ''">billingmode,</if>
+        <if test="instrid != null and instrid != ''">instrid,</if>
+        <if test="wjzflag != null and wjzflag != ''">wjzflag,</if>
+        <if test="backgpmd != null and backgpmd != ''">backgpmd,</if>
+        <if test="yljg != null and yljg != ''">yljg,</if>
+        <if test="useflag != null and useflag != ''">useflag,</if>
+        yq
+        )values(
+        <if test="yqmc != null and yqmc != ''">#{yqmc},</if>
+        <if test="yqdl != null and yqdl != ''">#{yqdl},</if>
+        <if test="jbs != null">#{jbs},</if>
+        <if test="csbg != null and csbg != ''">#{csbg},</if>
+        <if test="dnmc != null and dnmc != ''">#{dnmc},</if>
+        <if test="bgdh != null ">#{bgdh},</if>
+        <if test="bgtt != null and bgtt != ''">#{bgtt},</if>
+        <if test="zcm != null and zcm != ''">#{zcm},</if>
+        <if test="zzdx != null ">#{zzdx},</if>
+        <if test="zzfx != null and zzfx != ''">#{zzfx},</if>
+        <if test="zzcd != null">#{zzcd},</if>
+        <if test="zzkd != null">#{zzkd},</if>
+        <if test="sjl != null">#{sjl},</if>
+        <if test="zjl != null">#{zjl},</if>
+        <if test="yjl != null">#{yjl},</if>
+        <if test="xjl != null">#{xjl},</if>
+        <if test="qtzzdx != null">#{qtzzdx},</if>
+        <if test="qtzzfx != null and qtzzfx != ''">#{qtzzfx},</if>
+        <if test="qtsjl != null ">#{qtsjl},</if>
+        <if test="qtzjl != null ">#{qtzjl},</if>
+        <if test="qtyjl != null ">#{qtyjl},</if>
+        <if test="qtxjl != null ">#{qtxjl},</if>
+        <if test="myhs != null ">#{myhs},</if>
+        <if test="pcdyms != null and pcdyms != ''">#{pcdyms},</if>
+        <if test="txjg != null ">#{txjg},</if>
+        <if test="sdtfx1 != null and sdtfx1 != ''">#{sdtfx1},</if>
+        <if test="sdtfx2 != null and sdtfx2 != ''">#{sdtfx2},</if>
+        <if test="posflag != null and posflag != ''">#{posflag},</if>
+        <if test="weakflag != null and weakflag != ''">#{weakflag},</if>
+        <if test="upflag != null and upflag != ''">#{upflag},</if>
+        <if test="lowflag != null and lowflag != ''">#{lowflag},</if>
+        <if test="errflag != null and errflag != ''">#{errflag},</if>
+        <if test="yqxh != null and yqxh != ''">#{yqxh},</if>
+        <if test="lisgroup != null and lisgroup != ''">#{lisgroup},</if>
+        <if test="myhs1 != null ">#{myhs1},</if>
+        <if test="userpt2cnt != null ">#{userpt2cnt},</if>
+        <if test="billingmode != null and billingmode != ''">#{billingmode},</if>
+        <if test="instrid != null and instrid != ''">#{instrid},</if>
+        <if test="wjzflag != null and wjzflag != ''">#{wjzflag},</if>
+        <if test="backgpmd != null and backgpmd != ''">#{backgpmd},</if>
+        <if test="yljg != null and yljg != ''">#{yljg},</if>
+        <if test="useflag != null and useflag != ''">#{useflag},</if>
+        #{yq}
+        )
+    </insert>
+
+    <update id="update">
+        update lab_instr
+        <set>
+            <if test="yqmc != null and yqmc != ''">yqmc = #{yqmc},</if>
+            <if test="yqdl != null and yqdl != ''">yqdl = #{yqdl},</if>
+            <if test="jbs != null">jbs = #{jbs},</if>
+            <if test="csbg != null and csbg != ''">csbg = #{csbg},</if>
+            <if test="dnmc != null and dnmc != ''">dnmc = #{dnmc},</if>
+            <if test="bgdh != null ">bgdh = #{bgdh},</if>
+            <if test="bgtt != null and bgtt != ''">bgtt = #{bgtt},</if>
+            <if test="zcm != null and zcm != ''">zcm = #{zcm},</if>
+            <if test="zzdx != null ">zzdx = #{zzdx},</if>
+            <if test="zzfx != null and zzfx != ''">zzfx = #{zzfx},</if>
+            <if test="zzcd != null">zzcd = #{zzcd},</if>
+            <if test="zzkd != null">zzkd = #{zzkd},</if>
+            <if test="sjl != null">sjl = #{sjl},</if>
+            <if test="zjl != null">zjl = #{zjl},</if>
+            <if test="yjl != null">yjl = #{yjl},</if>
+            <if test="xjl != null">xjl = #{xjl},</if>
+            <if test="qtzzdx != null">qtzzdx = #{qtzzdx},</if>
+            <if test="qtzzfx != null and qtzzfx != ''">qtzzfx = #{qtzzfx},</if>
+            <if test="qtsjl != null ">qtsjl = #{qtsjl},</if>
+            <if test="qtzjl != null ">qtzjl = #{qtzjl},</if>
+            <if test="qtyjl != null ">qtyjl = #{qtyjl},</if>
+            <if test="qtxjl != null ">qtxjl = #{qtxjl},</if>
+            <if test="myhs != null ">myhs = #{myhs},</if>
+            <if test="pcdyms != null and pcdyms != ''">pcdyms = #{pcdyms},</if>
+            <if test="txjg != null ">txjg = #{txjg},</if>
+            <if test="sdtfx1 != null and sdtfx1 != ''">sdtfx1 = #{sdtfx1},</if>
+            <if test="sdtfx2 != null and sdtfx2 != ''">sdtfx2 = #{sdtfx2},</if>
+            <if test="posflag != null and posflag != ''">posflag = #{posflag},</if>
+            <if test="weakflag != null and weakflag != ''">weakflag = #{weakflag},</if>
+            <if test="upflag != null and upflag != ''">upflag = #{upflag},</if>
+            <if test="lowflag != null and lowflag != ''">lowflag = #{lowflag},</if>
+            <if test="errflag != null and errflag != ''">errflag = #{errflag},</if>
+            <if test="yqxh != null and yqxh != ''">yqxh = #{yqxh},</if>
+            <if test="lisgroup != null and lisgroup != ''">lisgroup = #{lisgroup},</if>
+            <if test="myhs1 != null ">myhs1 = #{myhs1},</if>
+            <if test="userpt2cnt != null ">userpt2cnt = #{userpt2cnt},</if>
+            <if test="billingmode != null and billingmode != ''">billingmode = #{billingmode},</if>
+            <if test="instrid != null and instrid != ''">instrid = #{instrid},</if>
+            <if test="wjzflag != null and wjzflag != ''">wjzflag = #{wjzflag},</if>
+            <if test="backgpmd != null and backgpmd != ''">backgpmd = #{backgpmd},</if>
+            <if test="yljg != null and yljg != ''">yljg = #{yljg},</if>
+            <if test="useflag != null and useflag != ''">useflag = #{useflag},</if>
+            yq = #{yq}
+        </set>
+        where yq = #{yq}
+    </update>
+
+    <delete id="delete">
+        delete from lab_instr where yq = #{yq}
+    </delete>
+
+</mapper>

liswork/src/main/resources/mapper/ReportItemMapper.xml

@@ -6,9 +6,9 @@
     <select id="query" resultType="com.czlis.liswork.pojo.XmInfoNew">
         select * from xm_info_new
         <where>
-            <if test="xmid != null and xmid != ''">xmid = #{xmid}</if>
+            <if test="xmid != null and xmid != ''"> and xmid = #{xmid}</if>
-           <if test="yq != null and yq != ''">yq = #{yq}</if>
+           <if test="yq != null and yq != ''"> and yq = #{yq}</if>
-           <if test="xmdh != null and xmdh != ''">yq = #{xmdh}</if>
+           <if test="xmdh != null and xmdh != ''"> and yq = #{xmdh}</if>
         </where>
     </select>
 
@@ -357,4 +357,116 @@
         </set>
         where xmid = #{xmid}
     </update>
+
+    <update id="updateXmDoubleRow">
+        update xm_double
+        <set>
+            <if test="xmdh != null and xmdh != ''">xmdh = #{xmdh},</if>
+            <if test="csms != null and csms != ''">csms = #{csms},</if>
+            <if test="xmxz != null and xmxz != ''">xmxz = #{xmxz},</if>
+            <if test="csbc != null and csbc != ''">csbc = #{csbc},</if>
+            <if test="ckbc != null and ckbc != ''">ckbc = #{ckbc},</if>
+            <if test="ydfs != null and ydfs != ''">ydfs = #{ydfs},</if>
+            <if test="zbpl != null and zbpl != ''">zbpl = #{zbpl},</if>
+            <if test="zbsj != null and zbsj != ''">zbsj = #{zbsj},</if>
+            <if test="kbms != null and kbms != ''">kbms = #{kbms},</if>
+            <if test="negxx != null">negxx = #{negxx},</if>
+            <if test="negsx != null">negsx = #{negsx},</if>
+            <if test="posxx != null">posxx = #{posxx},</if>
+            <if test="possx != null">possx = #{possx},</if>
+            <if test="shq != null">shq = #{shq},</if>
+            <if test="xhq != null">xhq = #{xhq},</if>
+            <if test="yxgs != null and yxgs != ''">yxgs = #{yxgs},</if>
+            <if test="mrmb != null and mrmb != ''">mrmb = #{mrmb},</if>
+            <if test="mrsjph != null and mrsjph != ''">mrsjph = #{mrsjph},</if>
+        </set>
+        where yq = #{yq} and xmdh = #{xmdh}
+    </update>
+
+    <update id="updateXmInterRow">
+        update xm_inter
+        <set>
+            <if test="xmdh != null and xmdh !=''">xmdh = #{xmdh},</if>
+            yq = #{yq},tdh = #{tdh}
+        </set>
+        where xmid = #{xmid}
+    </update>
+
+    <update id="updateXmRefRow">
+        update xm_ref_new
+        <set>
+            <if test="xb != null and xb != ''">xb = #{xb},</if>
+            <if test="nl1 != null">nl1 = #{nl1},</if>
+            <if test="nl2 != null">nl2 = #{nl2},</if>
+            <if test="bblx != null and bblx != ''">bblx = #{bblx},</if>
+            <if test="cksx != null">cksx = #{cksx},</if>
+            <if test="ckxx != null">ckxx = #{ckxx},</if>
+            <if test="dyck != null and dyck != ''">dyck = #{dyck},</if>
+            <if test="nldw != null and nldw != ''">nldw = #{nldw},</if>
+            <if test="redoxx != null">redoxx = #{redoxx},</if>
+            <if test="redosx != null">redosx = #{redosx},</if>
+            <if test="alterxx != null">alterxx = #{alterxx},</if>
+            <if test="altersx != null">altersx = #{altersx},</if>
+            <if test="slzq != null and slzq != ''">slzq = #{slzq},</if>
+            <if test="zd != null and zd != ''">zd = #{zd},</if>
+            <if test="instrid != null and instrid != ''">instrid = #{instrid},</if>
+            <if test="yq != null and yq != ''">yq = #{yq},</if>
+            xmid = #{xmid},xmdh = #{xmdh},xh = #{xh}
+        </set>
+        where xmid = #{xmid}
+    </update>
+
+    <update id="updateXmValRow">
+        update xm_val_new
+        <set>
+            <if test="srm != null and srm != ''">srm = #{srm},</if>
+            <if test="xh != null">xh = #{xh},</if>
+            <if test="jgbz != null and jgbz != ''">jgbz = #{jgbz},</if>
+            xmdh = #{xmdh},qz = #{qz}
+        </set>
+        where xmid = #{xmid}
+    </update>
+
+    <update id="updateXmTextResultRow">
+        update xm_textresult_new
+        <set>
+            <if test="textresult != null and textresult != ''">textresult #{textresult},</if>
+            <if test="reserve != null and reserve != ''">reserve = #{reserve},</if>
+            <if test="yxjs != null and yxjs != ''">yxjs = #{yxjs},</if>
+            <if test="cjyy != null and cjyy != ''">cjyy = #{cjyy},</if>
+            <if test="zd != null and zd != ''">zd,</if>
+            xmid,xmdh,xh
+        </set>
+        where xmid = #{xmid}
+    </update>
+
+    <insert id="addXmInfoVs">
+        insert into xm_info_vs(
+        <if test="dylx != null and dylx != ''">dylx,</if>
+        <if test="dyxh != null ">dyxh,</if>
+        <if test="uflag != null and uflag != ''">uflag,</if>
+        <if test="xs != null">xs,</if>
+        <if test="xsws != null">xsws,</if>
+        <if test="fzdyxh != null">fzdyxh,</if>
+        <if test="zkxm != null and zkxm != ''">zkxm,</if>
+        <if test="qccv != null and qccv != ''">qccv,</if>
+        <if test="qcvs != null and qcvs != ''">qcvs,</if>
+        xmid,yq,xmid
+        )values(
+        <if test="dylx != null and dylx != ''">#{dylx},</if>
+        <if test="dyxh != null ">#{dyxh},</if>
+        <if test="uflag != null and uflag != ''">#{uflag},</if>
+        <if test="xs != null">#{xs},</if>
+        <if test="xsws != null">#{xsws},</if>
+        <if test="fzdyxh != null">#{fzdyxh},</if>
+        <if test="zkxm != null and zkxm != ''">#{zkxm},</if>
+        <if test="qccv != null and qccv != ''">#{qccv},</if>
+        <if test="qcvs != null and qcvs != ''">#{qcvs},</if>
+        #{xmid},#{yq},#{xmid}
+        )
+    </insert>
+
+    <delete id="deleteXmInfoVs">
+        delete from xm_info_vs where vsid = #{vsid}
+    </delete>
 </mapper>

liswork/src/main/resources/mapper/XmBaseMapper.xml

@@ -6,7 +6,7 @@
     <select id="query">
         select * from xm_base
         <where>
-           <if test="xmdh != null and xmdh != ''">xmdh = #{xmdh}</if>
+           <if test="xmdh != null and xmdh != ''"> and xmdh = #{xmdh}</if>
         </where>
     </select>
 

liswork/src/main/resources/mapper/XmFeeInstrMapper.xml

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.czlis.liswork.mapper.dict.XmFeeInstrMapper">
+
+    <select id="query">
+        select * from xm_feeinstr
+        <where>
+            <if test="yq != null and yq != ''"> and yq = #{yq}</if>
+            <if test="sfxmdh != null and sfxmdh != ''">and sfxmdh = #{sfxmdh}</if>
+        </where>
+    </select>
+
+    <insert id="add">
+        insert into xm_feeinstr(
+        <if test="mrz != null and mrz != ''">mrz,</if>
+        <if test="xh != null ">xh,</if>
+        yq,sfxmdh
+        )values (
+        <if test="mrz != null and mrz != ''">#{mrz},</if>
+        <if test="xh != null ">#{xh},</if>
+        #{yq},#{sfxmdh}
+        )
+    </insert>
+
+    <update id="update">
+        update xm_feeinstr
+        <set>
+            <if test="mrz != null and mrz != ''">mrz = #{mrz},</if>
+            <if test="xh != null ">xh = #{xh},</if>
+            yq = #{yq},sfxmdh = #{sfxmdh}
+        </set>
+        where yq = #{yq} and sfxmdh = #{sfxmdh}
+    </update>
+
+    <delete id="delete">
+        delete from xm_feeinstr where yq = #{yq} and sfxmdh = #{sfxmdh}
+    </delete>
+
+
+
+
+</mapper>

liswork/src/main/resources/mapper/XmReqitemVsReportitemMapper.xml

@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.czlis.liswork.mapper.dict.XmReqitemVsReportitemMapper">
+
+    <select id="query">
+        select * from xm_reqitem_vs_reportitem
+        <where>
+            <if test="sqxmdh != null and sqxmdh != ''">and sqxmdh = #{sqxmdh}</if>
+            <if test="sqxmmc != null and sqxmmc != ''"> and sqxmmc = #{sqxmmc}</if>
+            <if test="yq != null and yq != ''">and yq = #{yq}</if>
+            <if test="xmdh != null and xmdh != ''"> and xmdh = #{xmdh}</if>
+            <if test="seq != null"> and seq = #{seq}</if>
+            <if test="tdh != null and tdh != ''"> and tdh = #{tdh}</if>
+            <if test="mrz != null and mrz != ''"> and mrz = #{mrz}</if>
+            <if test="def != null and def != ''"> and def = #{def}</if>
+        </where>
+    </select>
+
+    <insert id="add">
+        insert into xm_reqitem_vs_reportitem(
+        <if test="sqxmmc != null and sqxmmc != ''">sqxmmc ,</if>
+        <if test="yq != null and yq != ''">yq ,</if>
+        <if test="xmdh != null and xmdh != ''">xmdh ,</if>
+        <if test="seq != null">seq ,</if>
+        <if test="tdh != null and tdh != ''">tdh ,</if>
+        <if test="mrz != null and mrz != ''">mrz ,</if>
+        <if test="def != null and def != ''">def ,</if>
+        sqxmdh
+        )values(
+        <if test="sqxmmc != null and sqxmmc != ''">#{sqxmmc} ,</if>
+        <if test="yq != null and yq != ''">#{yq} ,</if>
+        <if test="xmdh != null and xmdh != ''">#{xmdh} ,</if>
+        <if test="seq != null">#{seq} ,</if>
+        <if test="tdh != null and tdh != ''">#{tdh} ,</if>
+        <if test="mrz != null and mrz != ''">#{mrz} ,</if>
+        <if test="def != null and def != ''">#{def} ,</if>
+        #{sqxmdh}
+        )
+    </insert>
+
+    <update id="update">
+        update xm_reqitem_vs_reportitem
+        <set>
+            <if test="sqxmmc != null and sqxmmc != ''">sqxmmc = #{sqxmmc},</if>
+            <if test="seq != null">seq = #{seq},</if>
+            <if test="tdh != null and tdh != ''">tdh = #{tdh},</if>
+            <if test="mrz != null and mrz != ''">mrz = #{mrz},</if>
+            <if test="def != null and def != ''">def = #{def},</if>
+            sqxmdh = #{sqxmdh},yq =#{yq},xmdh = #{xmdh}
+        </set>
+        where sqxmdh = #{sqxmdh} and yq =#{yq} and xmdh = #{xmdh}
+    </update>
+
+    <delete id="delete">
+        delete from xm_reqitem_vs_reportitem where sqxmdh = #{sqxmdh} and yq = #{yq} and xmdh = #{xmdh}
+        <if test="tdh != null and tdh != ''">and tdh = #{tdh}</if>
+    </delete>
+
+
+</mapper>