lis检验项目，报告项目维护

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

@@ -0,0 +1,40 @@
+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.DTO.XmInfoNewDTO;
+import com.czlis.liswork.pojo.XmInfoNew;
+import com.czlis.liswork.service.ReportItemService;
+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("/xminfo")
+public class ReportItemController extends BaseController {
+
+    @Autowired
+    private ReportItemService reportItemService;
+
+
+    @ApiOperation("查询检验项目列表")
+    @GetMapping("/query")
+    public TableDataInfo query(String yq,String xmdh){
+        startPage();
+        List<XmInfoNew> xmInfoNewList = reportItemService.query(yq,xmdh);
+        return getDataTable(xmInfoNewList);
+    }
+
+    @PostMapping("/add")
+    public Result add(@RequestBody XmInfoNewDTO xmInfoNewDTO){
+        return reportItemService.add(xmInfoNewDTO);
+    }
+}

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

@@ -0,0 +1,51 @@
+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.XmBase;
+import com.czlis.liswork.service.XmBaseService;
+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("/xmbase")
+public class XmBaseController extends BaseController {
+
+    @Autowired
+    XmBaseService xmBaseService;
+
+    @ApiOperation("查询报告项目")
+    @GetMapping("/query")
+    public TableDataInfo query(String xmdh){
+        startPage();
+        List<XmBase> xmBaseList = xmBaseService.query(xmdh);
+        return getDataTable(xmBaseList);
+    }
+
+    @ApiOperation("新增报告项目")
+    @PostMapping("/add")
+    public Result add(@RequestBody XmBase xmBase){
+        return xmBaseService.add(xmBase);
+    }
+
+    @DeleteMapping("/del")
+    public Result delete(@RequestBody String xmdh){
+        return xmBaseService.delete(xmdh);
+    }
+
+    @PostMapping("/update")
+    public Result update(@RequestBody @NotBlank(message = "参数不能为空！") XmBase xmBase){
+        return xmBaseService.update(xmBase);
+    }
+}

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

@@ -0,0 +1,17 @@
+package com.czlis.liswork.mapper.dict;
+
+import com.czlis.liswork.pojo.*;
+import com.czlis.liswork.pojo.DTO.XmInfoNewDTO;
+
+import java.util.List;
+
+public interface ReportItemMapper {
+    List<XmInfoNew> query(String yq, String xmdh);
+    void addXmInfoNew(XmInfoNew xmInfoNew);
+    void addXmDoubleRow(XmDouble xmDoubleRow);
+    void addXmInterRow(XmInter xmInterRow);
+    void addXmRefRow(XmRef xmRefRow);
+    void addXmValRow(XmVal xmValRow);
+    void addXmTextResultRow(XmTextResult xmTextResultRow);
+
+}

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

@@ -0,0 +1,15 @@
+package com.czlis.liswork.mapper.dict;
+
+import com.czlis.liswork.pojo.XmBase;
+
+import java.util.List;
+
+public interface XmBaseMapper {
+    List<XmBase> query(String xmdh);
+
+    void add(XmBase xmBase);
+
+    void delete(String xmdh);
+
+    void update(XmBase xmBase);
+}

liswork/src/main/java/com/czlis/liswork/pojo/DTO/XmInfoNewDTO.java

@@ -0,0 +1,20 @@
+package com.czlis.liswork.pojo.DTO;
+
+import com.czlis.liswork.pojo.*;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class XmInfoNewDTO {
+    private List<XmInfoNew> xmInfoNewRows;
+    private List<XmDouble> xmDoubleRows;
+    private List<XmVal> xmValRows;
+    private List<XmInter> xmInterRows;
+    private List<XmRef> xmRefRows;
+    private List<XmTextResult> xmTextResultRows;
+}

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

@@ -0,0 +1,25 @@
+package com.czlis.liswork.pojo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class XmBase {
+    private String xmdh;
+    private String xmmc;
+    private String xmlb;
+    private String xmz;
+    private String dw;
+    private BigDecimal cksx;
+    private BigDecimal ckxx;
+    private String dyckz;
+    private Integer dyxh;
+    private String jsgs;
+    private String lcyy;
+    private String bz;
+}

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

@@ -0,0 +1,32 @@
+package com.czlis.liswork.pojo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class XmDouble {
+    private Integer xmid;
+    private String xmdh;
+    private String csms;
+    private String xmxz;
+    private String csbc;
+    private String ckbc;
+    private String ydfs;
+    private String zbpl;
+    private String zbsj;
+    private String kbms;
+    private BigDecimal negxx;
+    private BigDecimal negsx;
+    private BigDecimal posxx;
+    private BigDecimal possx;
+    private BigDecimal shq;
+    private BigDecimal xhq;
+    private String yxgs;
+    private String mrmb;
+    private String mrsjph;
+}

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

@@ -0,0 +1,72 @@
+package com.czlis.liswork.pojo;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class XmInfoNew {
+    private Integer xmid;
+    private String yq;
+    private String xmdh;
+    private String xmmc;
+    private String zhbdh;
+    private String bgdh;
+    private BigDecimal cksx;
+    private BigDecimal ckxx;
+    private String dyckz;
+    private String dylx;
+    private Integer dyxh;
+    private String zjf;
+    private String xmlb;
+    private BigDecimal xs;
+    private Integer xsws;
+    private String mrz;
+    private BigDecimal jg;
+    private BigDecimal cb;
+    private String dw;
+    private String jsgs;
+    private String zkxm;
+    private BigDecimal sjx;
+    private BigDecimal xjx;
+    private String ygxb;
+    private String ygnl;
+    private String ygbb;
+    private String lcyy;
+    private String jgbz;
+    private Integer jgjg;
+    private BigDecimal jgz;
+    private String csff;
+    private String yymc;
+    private Integer fzdyxh;
+    private String clinicref;
+    private Float llimit;
+    private Float hlimit;
+    private BigDecimal xsbs;
+    private BigDecimal redoxx;
+    private BigDecimal redosx;
+    private String qcuselog;
+    private String qcusepos;
+    private String itemclass;
+    private String whocode;
+    private String germflag;
+    private BigDecimal qccv;
+    private String qcvs;
+    private String knowledge;
+    private String ygzq;
+    private String ygzd;
+    private String xmgl;
+    private String yqdl;
+    private String uflag;
+    private String val1;
+    private String val2;
+    private String val3;
+    private String val4;
+    private String val5;
+
+}

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

@@ -0,0 +1,25 @@
+package com.czlis.liswork.pojo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class XmInfoVs {
+    private Integer vsid;
+    private String yq;
+    private Integer xmid;
+    private String dylx;
+    private Integer dyxh;
+    private String uflag;
+    private BigDecimal xs;
+    private Integer xsws;
+    private Integer fzdyxh;
+    private String zkxm;
+    private String qccv;
+    private String qcvs;
+}

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

@@ -0,0 +1,16 @@
+package com.czlis.liswork.pojo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class XmInter {
+    private String yq;
+    private String tdh;
+    private String xmdh;
+    private Integer xmid;
+
+}

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

@@ -0,0 +1,32 @@
+package com.czlis.liswork.pojo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class XmRef {
+    private Integer xmid;
+    private String xmdh;
+    private Integer xh;
+    private String xb;
+    private BigDecimal nl1;
+    private BigDecimal nl2;
+    private String bblx;
+    private BigDecimal cksx;
+    private BigDecimal ckxx;
+    private String dyck;
+    private String nldw;
+    private BigDecimal redoxx;
+    private BigDecimal redosx;
+    private BigDecimal alterxx;
+    private BigDecimal altersx;
+    private String slzq;
+    private String zd;
+    private String instrid;
+    private String yq;
+}

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

@@ -0,0 +1,19 @@
+package com.czlis.liswork.pojo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class XmTextResult {
+    private Integer xmid;
+    private String xmdh;
+    private Integer xh;
+    private String textresult;
+    private String reserve;
+    private String yxjs;
+    private String cjyy;
+    private String zd;
+}

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

@@ -0,0 +1,18 @@
+package com.czlis.liswork.pojo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class XmVal {
+    private Integer xmid;
+    private String xmdh;
+    private String qz;
+    private String srm;
+    private Integer xh;
+    private String jgbz;
+
+}

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

@@ -0,0 +1,14 @@
+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 java.util.List;
+
+public interface ReportItemService {
+    List<XmInfoNew> query(String yq, String xmdh);
+
+    Result add(XmInfoNewDTO xmInfoNewDTO);
+
+}

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

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

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

@@ -0,0 +1,62 @@
+package com.czlis.liswork.service.impl;
+
+import com.czlis.common.core.domain.Result;
+import com.czlis.liswork.mapper.dict.ReportItemMapper;
+import com.czlis.liswork.pojo.*;
+import com.czlis.liswork.pojo.DTO.XmInfoNewDTO;
+import com.czlis.liswork.service.ReportItemService;
+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 ReportItemServiceImpl implements ReportItemService {
+
+    @Autowired
+    private ReportItemMapper reportItemMapper;
+
+    @Override
+    public List<XmInfoNew> query(String yq, String xmdh) {
+        return reportItemMapper.query(yq,xmdh);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public Result add(XmInfoNewDTO xmInfoNewDTO) {
+        List<XmInfoNew> xmInfoNewRows = xmInfoNewDTO.getXmInfoNewRows();
+        for (XmInfoNew xmInfoNewRow : xmInfoNewRows) {
+            reportItemMapper.addXmInfoNew(xmInfoNewRow);
+        }
+
+        List<XmDouble> xmDoubleRows = xmInfoNewDTO.getXmDoubleRows();
+        for (XmDouble xmDoubleRow : xmDoubleRows) {
+            reportItemMapper.addXmDoubleRow(xmDoubleRow);
+        }
+
+        List<XmInter> xmInterRows = xmInfoNewDTO.getXmInterRows();
+        for (XmInter xmInterRow : xmInterRows) {
+            reportItemMapper.addXmInterRow(xmInterRow);
+        }
+
+        List<XmRef> xmRefRows = xmInfoNewDTO.getXmRefRows();
+        for (XmRef xmRefRow : xmRefRows) {
+            reportItemMapper.addXmRefRow(xmRefRow);
+        }
+
+        List<XmVal> xmValRows = xmInfoNewDTO.getXmValRows();
+        for (XmVal xmValRow : xmValRows) {
+            reportItemMapper.addXmValRow(xmValRow);
+        }
+
+        List<XmTextResult> xmTextResultRows = xmInfoNewDTO.getXmTextResultRows();
+        for (XmTextResult xmTextResultRow : xmTextResultRows) {
+            reportItemMapper.addXmTextResultRow(xmTextResultRow);
+        }
+        return new Result("0","添加项目成功！");
+    }
+}

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

@@ -0,0 +1,49 @@
+package com.czlis.liswork.service.impl;
+
+import com.czlis.common.core.domain.Result;
+import com.czlis.liswork.mapper.dict.XmBaseMapper;
+import com.czlis.liswork.pojo.XmBase;
+import com.czlis.liswork.service.XmBaseService;
+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 XmBaseServiceImpl implements XmBaseService {
+
+    @Autowired
+    XmBaseMapper xmBaseMapper;
+
+    @Override
+    public List<XmBase> query(String xmdh) {
+        return xmBaseMapper.query(xmdh);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public Result add(XmBase xmBase) {
+        xmBaseMapper.add(xmBase);
+        return new Result("0","新增报告项目成功！");
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public Result delete(String xmdh) {
+        xmBaseMapper.delete(xmdh);
+        return new Result("0","删除报告项目成功！");
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public Result update(XmBase xmBase) {
+        xmBaseMapper.update(xmBase);
+        return new Result("0","修改数据成功！");
+    }
+
+
+}

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

@@ -0,0 +1,195 @@
+<?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.ReportItemMapper">
+
+    <select id="query" resultType="com.czlis.liswork.pojo.XmInfoNew">
+        select * from xm_info_new
+        <where>
+           <if test="yq != null and yq != ''">yq = #{yq}</if>
+           <if test="xmdh != null and xmdh != ''">yq = #{xmdh}</if>
+        </where>
+    </select>
+
+    <insert id="addXmInfoNew">
+        insert into xm_info_new(
+        <if test="yq != null and yq != ''">yq,</if>
+        <if test="xmdh != null and xmdh != ''">xmdh,</if>
+        <if test="xmmc != null and xmmc != ''">xmmc,</if>
+        <if test="zhbdh != null and zhbdh != ''">zhbdh,</if>
+        <if test="bgdh != null and bgdh != ''">bgdh,</if>
+        <if test="cksx != null">cksx,</if>
+        <if test="ckxx != null">ckxx,</if>
+        <if test="dyckz != null and dyckz != ''">dyckz,</if>
+        <if test="dylx != null and dylx != ''">dylx,</if>
+        <if test="dyxh != null ">dyxh,</if>
+        <if test="zjf != null and zjf != ''">zjf,</if>
+        <if test="xmlb != null and xmlb != ''">xmlb,</if>
+        <if test="xs != null ">xs,</if>
+        <if test="xsws != null ">xsws,</if>
+        <if test="mrz != null and mrz != ''">mrz,</if>
+        <if test="jg != null ">jg,</if>
+        <if test="cb != null ">cb,</if>
+        <if test="dw != null and dw != ''">dw,</if>
+        <if test="jsxm != null and jsxm != ''">jsxm,</if>
+        <if test="jsgs != null and jsgs != ''">jsgs,</if>
+        <if test="zkxm != null and zkxm != ''">zkxm,</if>
+        <if test="sjx != null ">sjx,</if>
+        <if test="xjx != null ">xjx,</if>
+        <if test="ygxb != null and ygxb=''">ygxb,</if>
+        <if test="ygnl != null and ygnl=''">ygnl,</if>
+        <if test="ygbb != null and ygbb=''">ygbb,</if>
+        <if test="lcyy != null and lcyy=''">lcyy,</if>
+        <if test="jgbz != null and jgbz=''">jgbz,</if>
+        <if test="jgjg != null" >jgbz,</if>
+        <if test="jgz != null" >jgz,</if>
+        <if test="csff != null and csff != ''" >csff,</if>
+        <if test="yymc != null and yymc != ''" >yymc,</if>
+        <if test="fzdyxh != null" >fzdyxh,</if>
+        <if test="clinicref != null and clinicref != ''" >clinicref,</if>
+        <if test="llimit != null " >llimit,</if>
+        <if test="hlimit != null " >hlimit,</if>
+        <if test="xsbs != null " >xsbs,</if>
+        <if test="redoxx != null " >redoxx,</if>
+        <if test="redosx != null " >redosx,</if>
+        <if test="qcuselog != null and qcuselog != ''" >qcuselog,</if>
+        <if test="qcusepos != null and qcusepos != ''" >qcusepos,</if>
+        <if test="itemclass != null and itemclass != ''" >itemclass,</if>
+        <if test="whocode != null and whocode != ''" >whocode,</if>
+        <if test="germflag != null and germflag != ''" >germflag,</if>
+        <if test="qccv != null " >qccv,</if>
+        <if test="qcvs != null and qcvs != ''" >qcvs,</if>
+        <if test="knowledge != null and knowledge != ''" >knowledge,</if>
+        <if test="ygzq != null and ygzq != ''" >ygzq,</if>
+        <if test="ygzd != null and ygzd != ''" >ygzd,</if>
+        <if test="xmgl != null and xmgl != ''" >xmgl,</if>
+        <if test="yqdl != null and yqdl != ''" >yqdl,</if>
+        <if test="uflag != null and uflag != ''" >uflag,</if>
+        <if test="val1 != null and val1 != ''" >val1,</if>
+        <if test="val2 != null and val2 != ''" >val2,</if>
+        <if test="val3 != null and val3 != ''" >val3,</if>
+        <if test="val4 != null and val4 != ''" >val4,</if>
+        <if test="val5 != null and val5 != ''" >val5,</if>
+        xmid
+        )values (
+        <if test="yq != null and yq != ''">#{yq},</if>
+        <if test="xmdh != null and xmdh != ''">#{xmdh},</if>
+        <if test="xmmc != null and xmmc != ''">#{xmmc},</if>
+        <if test="zhbdh != null and zhbdh != ''">#{zhbdh},</if>
+        <if test="bgdh != null and bgdh != ''">#{bgdh},</if>
+        <if test="cksx != null">#{cksx},</if>
+        <if test="ckxx != null">#{ckxx},</if>
+        <if test="dyckz != null and dyckz != ''">#{dyckz},</if>
+        <if test="dylx != null and dylx != ''">#{dylx},</if>
+        <if test="dyxh != null ">#{dyxh},</if>
+        <if test="zjf != null and zjf != ''">#{zjf},</if>
+        <if test="xmlb != null and xmlb != ''">#{xmlb},</if>
+        <if test="xs != null ">#{xs},</if>
+        <if test="xsws != null ">#{xsws},</if>
+        <if test="mrz != null and mrz != ''">#{mrz},</if>
+        <if test="jg != null ">#{jg},</if>
+        <if test="cb != null ">#{cb},</if>
+        <if test="dw != null and dw != ''">#{dw},</if>
+        <if test="jsxm != null and jsxm != ''">#{jsxm},</if>
+        <if test="jsgs != null and jsgs != ''">#{jsgs},</if>
+        <if test="zkxm != null and zkxm != ''">#{zkxm},</if>
+        <if test="sjx != null ">#{sjx},</if>
+        <if test="xjx != null ">#{xjx},</if>
+        <if test="ygxb != null and ygxb=''">#{ygxb},</if>
+        <if test="ygnl != null and ygnl=''">#{ygnl},</if>
+        <if test="ygbb != null and ygbb=''">#{ygbb},</if>
+        <if test="lcyy != null and lcyy=''">#{lcyy},</if>
+        <if test="jgbz != null and jgbz=''">#{jgbz},</if>
+        <if test="jgjg != null" >#{jgbz},</if>
+        <if test="jgz != null" >#{jgz},</if>
+        <if test="csff != null and csff != ''" >#{csff},</if>
+        <if test="yymc != null and yymc != ''" >#{yymc},</if>
+        <if test="fzdyxh != null" >#{fzdyxh},</if>
+        <if test="clinicref != null and clinicref != ''" >#{clinicref},</if>
+        <if test="llimit != null " >#{llimit},</if>
+        <if test="hlimit != null " >#{hlimit},</if>
+        <if test="xsbs != null " >#{xsbs},</if>
+        <if test="redoxx != null " >#{redoxx},</if>
+        <if test="redosx != null " >#{redosx},</if>
+        <if test="qcuselog != null and qcuselog != ''" >#{qcuselog},</if>
+        <if test="qcusepos != null and qcusepos != ''" >#{qcusepos},</if>
+        <if test="itemclass != null and itemclass != ''" >#{itemclass},</if>
+        <if test="whocode != null and whocode != ''" >#{whocode},</if>
+        <if test="germflag != null and germflag != ''" >#{germflag},</if>
+        <if test="qccv != null " >#{qccv},</if>
+        <if test="qcvs != null and qcvs != ''" >#{qcvs},</if>
+        <if test="knowledge != null and knowledge != ''" >#{knowledge},</if>
+        <if test="ygzq != null and ygzq != ''" >#{ygzq},</if>
+        <if test="ygzd != null and ygzd != ''" >#{ygzd},</if>
+        <if test="xmgl != null and xmgl != ''" >#{xmgl},</if>
+        <if test="yqdl != null and yqdl != ''" >#{yqdl},</if>
+        <if test="uflag != null and uflag != ''" >#{uflag},</if>
+        <if test="val1 != null and val1 != ''" >#{val1},</if>
+        <if test="val2 != null and val2 != ''" >#{val2},</if>
+        <if test="val3 != null and val3 != ''" >#{val3},</if>
+        <if test="val4 != null and val4 != ''" >#{val4},</if>
+        <if test="val5 != null and val5 != ''" >#{val5},</if>
+        #{xmid}
+        )
+    </insert>
+
+    <insert id="addXmDoubleRow">
+        insert into xm_double(
+        <if test="xmdh != null and xmdh != ''">xmdh,</if>
+        <if test="csms != null and csms != ''">csms,</if>
+        <if test="xmxz != null and xmxz != ''">xmxz,</if>
+        <if test="csbc != null and csbc != ''">csbc,</if>
+        <if test="ckbc != null and ckbc != ''">ckbc,</if>
+        <if test="ydfs != null and ydfs != ''">ydfs,</if>
+        <if test="zbpl != null and zbpl != ''">zbpl,</if>
+        <if test="zbsj != null and zbsj != ''">zbsj,</if>
+        <if test="kbms != null and kbms != ''">kbms,</if>
+        <if test="negxx != null">negxx,</if>
+        <if test="negsx != null">negsx,</if>
+        <if test="posxx != null">posxx,</if>
+        <if test="possx != null">possx,</if>
+        <if test="shq != null">shq,</if>
+        <if test="xhq != null">xhq,</if>
+        <if test="yxgs != null and yxgs != ''">yxgs,</if>
+        <if test="mrmb != null and mrmb != ''">mrmb,</if>
+        <if test="mrsjph != null and mrsjph != ''">mrsjph,</if>
+        xmid
+        )values(
+        <if test="xmdh != null and xmdh != ''">#{xmdh},</if>
+        <if test="csms != null and csms != ''">#{csms},</if>
+        <if test="xmxz != null and xmxz != ''">#{xmxz},</if>
+        <if test="csbc != null and csbc != ''">#{csbc},</if>
+        <if test="ckbc != null and ckbc != ''">#{ckbc},</if>
+        <if test="ydfs != null and ydfs != ''">#{ydfs},</if>
+        <if test="zbpl != null and zbpl != ''">#{zbpl},</if>
+        <if test="zbsj != null and zbsj != ''">#{zbsj},</if>
+        <if test="kbms != null and kbms != ''">#{kbms},</if>
+        <if test="negxx != null">#{negxx},</if>
+        <if test="negsx != null">#{negsx},</if>
+        <if test="posxx != null">#{posxx},</if>
+        <if test="possx != null">#{possx},</if>
+        <if test="shq != null">#{shq},</if>
+        <if test="xhq != null">#{xhq},</if>
+        <if test="yxgs != null and yxgs != ''">#{yxgs},</if>
+        <if test="mrmb != null and mrmb != ''">#{mrmb},</if>
+        <if test="mrsjph != null and mrsjph != ''">#{mrsjph},</if>
+        #{xmid}
+        )
+    </insert>
+
+    <insert id="addXmInterRow">
+        insert into xm_inter(
+         <if test="xmdh != null and xmdh !=''">xmdh,</if>
+         <if test="xmid != null">xmid,</if>
+         yq,tdh
+        )values(
+        <if test="xmdh != null and xmdh != ''">#{xmdh},</if>
+        <if test="xmid != null">#{xmid},</if>
+         #{yq},#{tdh}
+        )
+    </insert>
+
+
+
+
+</mapper>

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

@@ -0,0 +1,67 @@
+<?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.XmBaseMapper">
+
+    <select id="query">
+        select * from xm_base
+        <where>
+           <if test="xmdh != null and xmdh != ''">xmdh = #{xmdh}</if>
+        </where>
+    </select>
+
+    <insert id="add">
+        insert into xm_base(
+        <if test="xmmc != null and xmmc != ''">xmmc,</if>
+        <if test="xmlb != null and xmlb != ''">xmlb,</if>
+        <if test="xmz != null and xmz != ''">xmz,</if>
+        <if test="dw != null and dw != ''">dw,</if>
+        <if test="cksx != null">cksx,</if>
+        <if test="ckxx != null">ckxx,</if>
+        <if test="dyckz != null and dyckz != ''">dyckz,</if>
+        <if test="dyxh != null">dyxh,</if>
+        <if test="jsgs != null and jsgs != ''">jsgs,</if>
+        <if test="lcyy != null and lcyy != ''">lcyy,</if>
+        <if test="bz != null and bz != ''">bz,</if>
+        xmdh
+        )values (
+        <if test="xmmc != null and xmmc != ''">#{xmmc},</if>
+        <if test="xmlb != null and xmlb != ''">#{xmlb},</if>
+        <if test="xmz != null and xmz != ''">#{xmz},</if>
+        <if test="dw != null and dw != ''">#{dw},</if>
+        <if test="cksx != null">#{cksx},</if>
+        <if test="ckxx != null">#{ckxx},</if>
+        <if test="dyckz != null and dyckz != ''">#{dyckz},</if>
+        <if test="dyxh != null">#{dyxh},</if>
+        <if test="jsgs != null and jsgs != ''">#{jsgs},</if>
+        <if test="lcyy != null and lcyy != ''">#{lcyy},</if>
+        <if test="bz != null and bz != ''">#{bz},</if>
+        #{xmdh}
+        )
+    </insert>
+
+    <delete id="delete">
+        delete from xm_base where xmdh = #{xmdh}
+    </delete>
+
+    <update id="update">
+        update xm_base
+        <set>
+            <if test="xmmc != null and xmmc != ''">xmmc = #{xmmc},</if>
+            <if test="xmlb != null and xmlb != ''">xmlb = #{xmlb},</if>
+            <if test="xmz != null and xmz != ''">xmz = #{xmz},</if>
+            <if test="dw != null and dw != ''">dw = #{dw},</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="dyxh != null">dyxh = #{dyxh},</if>
+            <if test="jsgs != null and jsgs != ''">jsgs = #{jsgs},</if>
+            <if test="lcyy != null and lcyy != ''">lcyy = #{lcyy},</if>
+            <if test="bz != null and bz != ''">bz = #{bz},</if>
+        </set>
+        where xmdh = #{xmdh}
+    </update>
+
+
+
+</mapper>

mzcx/src/main/java/com/czlis/mzcx/controller/FeeitemVsClassController.java

@@ -42,7 +42,7 @@ public class FeeitemVsClassController extends BaseController {
 
     @ApiOperation("删除条码类别与项目对照")
     @DeleteMapping("/del")
-    public Result del(){
-        return null;
+    public Result del(String sfxmdh){
+        return feeitemVsClassService.del(sfxmdh);
     }
 }

mzcx/src/main/java/com/czlis/mzcx/mapper/FeeitemVsClassMapper.java

@@ -8,4 +8,6 @@ public interface FeeitemVsClassMapper {
     List<LabFeeitemVsClass> query(LabFeeitemVsClass labFeeitemVsClass);
 
     void add(LabFeeitemVsClass labFeeitemVsClass);
+
+    void del(String sfxmdh);
 }

mzcx/src/main/java/com/czlis/mzcx/pojo/XmFeeVs.java

@@ -0,0 +1,13 @@
+package com.czlis.mzcx.pojo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class XmFeeVs {
+    private String sfxmdh;
+    private Integer vscount;
+}

mzcx/src/main/java/com/czlis/mzcx/pojo/XmFeeVsFee.java

@@ -0,0 +1,14 @@
+package com.czlis.mzcx.pojo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class XmFeeVsFee {
+    private String sfxmdh;
+    private String vssfxmdh;
+    private Integer seq;
+}

mzcx/src/main/java/com/czlis/mzcx/service/FeeitemVsClassService.java

@@ -1,5 +1,6 @@
 package com.czlis.mzcx.service;
 
+import com.czlis.common.core.domain.Result;
 import com.czlis.mzcx.pojo.LabFeeitemVsClass;
 
 import java.util.List;
@@ -9,4 +10,5 @@ public interface FeeitemVsClassService {
 
     void add(LabFeeitemVsClass labFeeitemVsClass);
 
+    Result del(String sfxmdh);
 }

mzcx/src/main/java/com/czlis/mzcx/service/impl/FeeitemVsClassServiceImpl.java

@@ -1,5 +1,6 @@
 package com.czlis.mzcx.service.impl;
 
+import com.czlis.common.core.domain.Result;
 import com.czlis.mzcx.mapper.FeeitemVsClassMapper;
 import com.czlis.mzcx.pojo.LabFeeitemVsClass;
 import com.czlis.mzcx.service.FeeitemVsClassService;
@@ -27,4 +28,10 @@ public class FeeitemVsClassServiceImpl implements FeeitemVsClassService {
     public void add(LabFeeitemVsClass labFeeitemVsClass) {
         feeitemVsClassMapper.add(labFeeitemVsClass);
     }
+
+    @Override
+    public Result del(String sfxmdh) {
+        feeitemVsClassMapper.del(sfxmdh);
+        return new Result("0","删除成功！");
+    }
 }

mzcx/src/main/resources/mapper/FeeitemVsClassMapper.xml

@@ -20,9 +20,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         )values(
         <if test="xh != null">#{xh},</if>
         <if test="sfxmdh != null and sfxmdh != ''">#{sfxmdh},</if>
-        sflbdh
-                       )
+        #{sflbdh})
     </insert>
 
+    <delete id="del" parameterType="string">
+        delete from lab_feeitem_vs_class where sfxmdh = #{sfxmdh}
+    </delete>
+
 
 </mapper>