修改检验项目界面，参数实现

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/ComOpt.java

@@ -13,5 +13,9 @@ public class ComOpt {
     private String xxlb;
     private String xxqz;
     private String bz;
+    private String opttype;
+    private String scope;
+    private Integer optSort;
+    private String lx;
 
 }

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/ComOptTemplate.java

@@ -0,0 +1,19 @@
+package com.czlis.common.core.domain.entity.lis;
+
+import com.czlis.common.core.domain.Result;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ComOptTemplate {
+    private String opttype;
+    private String comtype;
+    private String optcode;
+    private String optdefault;
+    private Integer optSort;
+    private String scope;
+    private String bz;
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmFilter.java

@@ -0,0 +1,14 @@
+package com.czlis.common.core.domain.entity.lis;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class XmFilter {
+    private String yq;
+    private String lgph;
+    private String bc;
+}

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmLot.java

@@ -0,0 +1,18 @@
+package com.czlis.common.core.domain.entity.lis;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class XmLot {
+    private String yq;
+    private String sjph;
+    private String sjcs;
+    private Date yxq;
+    private String csff;
+}

lis-common/src/main/java/com/czlis/common/enums/BusinessType.java

@@ -2,7 +2,7 @@ package com.czlis.common.enums;
 
 /**
  * 业务操作类型
- *
+ * 注意，这里的新增只能是在最后新增类型，否则会打乱这个顺序
  * @author admin
  */
 public enum BusinessType {
@@ -60,17 +60,30 @@ public enum BusinessType {
      * 接口调用10
      */
     INTERFACE_INVOKE,
+    /**
+     * 新增明细11
+     */
+    INSERT_DETAIL,
 
     /**
-     * 删除明细11
+     * 删除明细12
      */
     DELETE_DETAIL,
     /**
-     * 打印12
+     * 打印13
      */
     PRINT,
     /**
-     * 打印回单
+     * 打印回单14
      */
     PRINTBACKPAPER,
+    /**
+     *新增对照15
+     */
+    INSERT_VS,
+    /**
+     * 删除对照16
+     */
+    DELETE_VS,
+
 }

lis-common/src/main/java/com/czlis/common/utils/ComOptionUtils.java

@@ -1,14 +1,18 @@
 package com.czlis.common.utils;
 
-import com.alibaba.fastjson2.JSONArray;
+
+import cn.hutool.json.JSONUtil;
 import com.czlis.common.constant.CacheConstants;
 import com.czlis.common.core.domain.entity.lis.ComOpt;
 import com.czlis.common.core.redis.RedisCache;
 import com.czlis.common.utils.spring.SpringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
+
 
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+
 
 public class ComOptionUtils {
 
@@ -32,6 +36,11 @@ public class ComOptionUtils {
         Collection<String> keys = SpringUtils.getBean(RedisCache.class).keys(CacheConstants.COM_OPT_KEY + "*");
         SpringUtils.getBean(RedisCache.class).deleteObject(keys);
     }
+
+    public static void clearOptCache(String yq,String xxdh) {
+        Collection<String> keys = SpringUtils.getBean(RedisCache.class).keys(CacheConstants.COM_OPT_KEY + yq+":"+xxdh);
+        SpringUtils.getBean(RedisCache.class).deleteObject(keys);
+    }
     /**
      * 获取参数缓存
      * 根据现在的参数，获取到的数据应该只有一条
@@ -59,4 +68,18 @@ public class ComOptionUtils {
     public static String getCacheKey(String configKey) {
         return CacheConstants.COM_OPT_KEY + configKey;
     }
+
+
+    /**
+     * 设置参数值域
+     * @param dddwList
+     * @param inputList
+     * @return
+     */
+    public static String setValueRange(List<String> dddwList,List<String> inputList){
+        Map<String,Object> map = new HashMap<String,Object>();
+        map.put("dddwList",dddwList);
+        map.put("inputList",inputList);
+        return JSONUtil.toJsonStr(map);
+    }
 }

lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/ComOptMapper.java

@@ -1,9 +1,11 @@
 package com.czlis.interfaceCommon.mapper;
 
 import com.czlis.common.core.domain.entity.lis.ComOpt;
+import com.czlis.common.core.domain.entity.lis.ComOptTemplate;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 public interface ComOptMapper {
     ComOpt getComOptOne(@Param("yq") String yq,@Param("xxdh") String xxdh);
@@ -17,4 +19,11 @@ public interface ComOptMapper {
 
     void delete(@Param("yq") String yq,@Param("xxdh") String xxdh);
 
+    List<ComOptTemplate> getComOptTemplate(ComOptTemplate comOptTemplate);
+
+    void addTemplate(ComOptTemplate comOptTemplate);
+
+    void updateTemplate(ComOptTemplate comOptTemplate);
+
+    List<Map<String, Object>> queryTree();
 }

lis-interfaceCommon/src/main/resources/mapper/ComOptMapper.xml

@@ -11,23 +11,25 @@
     </select>
 
 
-    <select id="query">
+    <select id="getComOptList">
         select * from com_opt
         <where>
             <if test="yq != null and yq != ''"> and yq = #{yq}</if>
             <if test="xxdh != null and xxdh != ''"> and xxdh = #{xxdh}</if>
             <if test="xxlb != null and xxlb != ''"> and xxlb = #{xxlb}</if>
             <if test="xxqz != null and xxqz != ''"> and xxqz = #{xxqz}</if>
+            <![CDATA[and yq is not null and yq <> '']]>
         </where>
+        order by optsort
     </select>
 
     <insert id="add">
         insert into com_opt(
         <if test="bz != null and bz !=''">bz,</if>
-        yq,xxdh,xxlb,xxqz
+        yq,xxdh,xxlb,xxqz,lx
         )values(
         <if test="bz != null and bz !=''">#{bz},</if>
-        #{yq},#{xxdh},#{xxlb},#{xxqz}
+        #{yq},#{xxdh},#{xxlb},#{xxqz},#{lx}
         )
     </insert>
 
@@ -43,4 +45,39 @@
         delete from com_opt where yq = #{yq} and xxdh = #{xxdh}
     </delete>
 
+    <select id="getComOptTemplate" resultType="com.czlis.common.core.domain.entity.lis.ComOptTemplate">
+        select * from com_opt_template
+        <where>
+            <if test="comtype != null and comtype !=''">and comtype = #{comtype}</if>
+            <if test="optcode != null and optcode !=''">and optcode = #{optcode}</if>
+        </where>
+    </select>
+
+    <insert id="addTemplate">
+        insert into com_opt_template(
+        opttype,comtype,optcode,optdefault,optSort,scope
+        )values(
+        #{opttype},#{comtype},#{optcode},#{optdefault},#{optSort},#{scope}
+        )
+    </insert>
+
+    <update id="updateTemplate">
+        update com_opt_template set
+        <if test="opttype != null and opttype !=''">opttype = #{opttype}</if>
+        <if test="comtype != null and comtype !=''">comtype = #{comtype}</if>
+        <if test="optcode != null and opttype !=''">optcode = #{optcode}</if>
+        <if test="optdefault != null and optdefault !=''">optdefault = #{optdefault}</if>
+        <if test="optSort != null">optSort = #{optSort}</if>
+        <if test="scope != null and scope != ''">scope = #{scope}</if>
+    </update>
+
+    <select id="queryTree" resultType="map">
+        <![CDATA[
+        select (case a.lx when '1' then (select dict_label from sys_dict_data where a.yq = dict_value and dict_type = 'lis_opt_type') when '2' then a.yq else '' end),a.lx from (select distinct yq,lx from com_opt where yq is not null and yq <> '') a
+        union
+        select yq,'2' from lab_instr where useflag = '0'
+        order by lx
+        ]]>
+    </select>
+
 </mapper>

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

@@ -1,8 +1,12 @@
 package com.czlis.liswork.controller.dict;
 
+import com.czlis.common.annotation.Log;
 import com.czlis.common.core.controller.BaseController;
 import com.czlis.common.core.domain.Result;
+import com.czlis.common.core.domain.entity.lis.XmFilter;
+import com.czlis.common.core.domain.entity.lis.XmLot;
 import com.czlis.common.core.page.TableDataInfo;
+import com.czlis.common.enums.BusinessType;
 import com.czlis.liswork.pojo.DTO.XmInfoNewDTO;
 import com.czlis.common.core.domain.entity.lis.XmInfoNew;
 import com.czlis.common.core.domain.entity.lis.XmInfoVs;
@@ -34,33 +38,77 @@ public class ReportItemController extends BaseController {
         return getDataTable(xmInfoNewList);
     }
 
+    @Log(title = "检验项目",businessType = BusinessType.INSERT)
     @ApiOperation("新增检验项目")
     @PostMapping("/add")
     public Result add(@RequestBody XmInfoNewDTO xmInfoNewDTO){
         return reportItemService.add(xmInfoNewDTO);
     }
 
+    @Log(title = "检验项目",businessType = BusinessType.DELETE)
     @ApiOperation("删除检验项目")
     @DeleteMapping("/del")
     public Result delete(Integer xmid){
         return reportItemService.delete(xmid);
     }
 
+    @Log(title = "检验项目",businessType = BusinessType.UPDATE)
     @ApiOperation("修改检验项目")
     @PostMapping("/update")
     public Result update(@RequestBody XmInfoNewDTO xmInfoNewDTO){
         return reportItemService.update(xmInfoNewDTO);
     }
 
+    @Log(title = "检验项目",businessType = BusinessType.INSERT_VS)
     @ApiOperation("新增仪器项目对照")
     @PostMapping("/addvs")
-    public Result addvs(XmInfoVs xmInfoVs){
+    public Result addvs(@RequestBody XmInfoVs xmInfoVs){
         return reportItemService.addvs(xmInfoVs);
     }
 
+    @Log(title = "检验项目",businessType = BusinessType.DELETE_VS)
     @ApiOperation("删除仪器项目对照")
     @DeleteMapping("/delvs")
     public Result deleteXmInfoVs(Integer vsid){
         return reportItemService.deleteXmInfoVs(vsid);
     }
+
+    @ApiOperation("查询滤光片波长对照表")
+    @GetMapping("/queryFilter")
+    public Result getXmFilter(XmFilter xmFilter){
+        return reportItemService.getXmFilter(xmFilter);
+    }
+
+    @Log(title = "光片波长对照表",businessType = BusinessType.INSERT)
+    @ApiOperation("新增滤光片波长对照表")
+    @PostMapping("/addXmFilter")
+    public Result addXmFilter(@RequestBody XmFilter xmFilter){
+        return reportItemService.addXmFilter(xmFilter);
+    }
+
+    @Log(title = "光片波长对照表",businessType = BusinessType.DELETE)
+    @ApiOperation("删除滤光片波长对照表")
+    @GetMapping("/delXmFilter")
+    public Result deleteXmFilter(String yq,String lgph){
+        return reportItemService.deleteXmFilter(yq,lgph);
+    }
+
+    @ApiOperation("获取试剂维护数据")
+    @GetMapping("/queryXmLot")
+    public Result getXmLot(){
+        return reportItemService.getXmLot();
+    }
+
+    @ApiOperation("新增试剂维护数据")
+    @PostMapping("/addXmLot")
+    public Result addXmLot(XmLot xmLot){
+        return reportItemService.addXmLot(xmLot);
+    }
+
+    @ApiOperation("删除试剂维护数据")
+    @GetMapping("/delXmLot")
+    public Result deleteXmLot(String yq,String sjph){
+        return reportItemService.deleteXmLot(yq,sjph);
+    }
+
 }

liswork/src/main/java/com/czlis/liswork/controller/xtwh/ComOptController.java

@@ -1,10 +1,14 @@
 package com.czlis.liswork.controller.xtwh;
 
+import com.czlis.common.annotation.Anonymous;
+import com.czlis.common.annotation.Log;
 import com.czlis.common.core.controller.BaseController;
 import com.czlis.common.core.domain.Result;
 import com.czlis.common.core.domain.entity.lis.ComOpt;
+import com.czlis.common.core.domain.entity.lis.ComOptTemplate;
 import com.czlis.common.core.domain.entity.lis.LabPat;
 import com.czlis.common.core.page.TableDataInfo;
+import com.czlis.common.enums.BusinessType;
 import com.czlis.liswork.service.ComOptService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -32,23 +36,42 @@ public class ComOptController extends BaseController {
         return getDataTable(comOptList);
     }
 
+    @Log(title = "后台参数",businessType = BusinessType.INSERT)
     @ApiOperation("新增参数")
     @PostMapping("/add")
     public Result add(@RequestBody ComOpt comOpt) {
         return comOptService.add(comOpt);
     }
 
+    @Log(title = "后台参数",businessType = BusinessType.UPDATE)
     @ApiOperation("修改参数")
     @PostMapping("/update")
     public Result update(@RequestBody ComOpt comOpt) {
         return comOptService.update(comOpt);
     }
 
+    @Log(title = "后台参数",businessType = BusinessType.DELETE)
     @ApiOperation("删除参数")
     @DeleteMapping("/del")
     public Result delete(String yq,String xxdh) {
         return comOptService.delete(yq,xxdh);
     }
 
+    @ApiOperation("查询参数模版")
+    @GetMapping("/queryTemplate")
+    public Result getComOptTemplate(){
+        return comOptService.getComOptTemplate();
+    }
 
+    @ApiOperation("新增模版参数")
+    @PostMapping("/addTemplate")
+    public Result addTemplate(@RequestBody ComOptTemplate comOptTemplate) {
+        return comOptService.addTemplate(comOptTemplate);
+    }
+
+    @ApiOperation("查询参数列表树状结构")
+    @GetMapping("/queryTree")
+    public Result queryTree(){
+        return comOptService.queryTree();
+    }
 }

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

@@ -33,4 +33,15 @@ public interface ReportItemMapper {
     void addXmInfoVs(XmInfoVs xmInfoVs);
     void deleteXmInfoVs(Integer vsid);
 
+    List<XmFilter> getXmFilter(XmFilter xmFilter);
+
+    void addXmFilter(XmFilter xmFilter);
+
+    void deleteXmFilter(@Param("yq") String yq,@Param("lgph") String lgph);
+
+    List<XmLot> getXmLot();
+
+    void addXmLot(XmLot xmLot);
+
+    void deleteXmLot(@Param("yq") String yq,@Param("sjph") String sjph);
 }

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

@@ -2,6 +2,7 @@ package com.czlis.liswork.service;
 
 import com.czlis.common.core.domain.Result;
 import com.czlis.common.core.domain.entity.lis.ComOpt;
+import com.czlis.common.core.domain.entity.lis.ComOptTemplate;
 
 import java.util.List;
 
@@ -13,4 +14,11 @@ public interface ComOptService {
     Result update(ComOpt comOpt);
 
     Result delete(String yq, String xxdh);
+
+    Result getComOptTemplate();
+
+    Result addTemplate(ComOptTemplate comOptTemplate);
+
+    Result queryTree();
+
 }

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

@@ -1,6 +1,8 @@
 package com.czlis.liswork.service;
 
 import com.czlis.common.core.domain.Result;
+import com.czlis.common.core.domain.entity.lis.XmFilter;
+import com.czlis.common.core.domain.entity.lis.XmLot;
 import com.czlis.liswork.pojo.DTO.XmInfoNewDTO;
 import com.czlis.common.core.domain.entity.lis.XmInfoNew;
 import com.czlis.common.core.domain.entity.lis.XmInfoVs;
@@ -20,4 +22,16 @@ public interface ReportItemService {
     Result addvs(XmInfoVs xmInfoVs);
 
     Result deleteXmInfoVs(Integer vsid);
+
+    Result getXmFilter(XmFilter xmFilter);
+
+    Result addXmFilter(XmFilter xmFilter);
+
+    Result deleteXmFilter(String yq, String lgph);
+
+    Result getXmLot();
+
+    Result addXmLot(XmLot xmLot);
+
+    Result deleteXmLot(String yq, String sjph);
 }

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

@@ -1,45 +0,0 @@
-package com.czlis.liswork.service.impl;
-
-import com.czlis.common.core.domain.Result;
-import com.czlis.common.core.domain.entity.lis.ComOpt;
-import com.czlis.interfaceCommon.mapper.ComOptMapper;
-import com.czlis.liswork.service.ComOptService;
-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 ComOptServiceImpl implements ComOptService {
-
-    @Autowired
-    private ComOptMapper comOptMapper;
-
-    @Override
-    public List<ComOpt> getComOptList(ComOpt comOpt) {
-        List<ComOpt> comOptList = comOptMapper.getComOptList(comOpt);
-        return comOptList;
-    }
-
-    @Override
-    public Result add(ComOpt comOpt) {
-        comOptMapper.add(comOpt);
-        return new Result("0","新增成功！");
-    }
-
-    @Override
-    public Result update(ComOpt comOpt) {
-        comOptMapper.update(comOpt);
-        return new Result("0","修改数据成功！");
-    }
-
-    @Override
-    public Result delete(String yq, String xxdh) {
-        comOptMapper.delete(yq,xxdh);
-        return new Result("0","删除数据成功！");
-    }
-
-
-}

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

@@ -30,6 +30,12 @@ public class ReportItemServiceImpl implements ReportItemService {
     public Result add(XmInfoNewDTO xmInfoNewDTO) {
         List<XmInfoNew> xmInfoNewRows = xmInfoNewDTO.getXmInfoNewRows();
         for (XmInfoNew xmInfoNewRow : xmInfoNewRows) {
+            if(xmInfoNewRow.getCkxx().compareTo(xmInfoNewRow.getCksx()) >= 1  ){
+                return new Result("-1","新增失败，项目的参考下限："+xmInfoNewRow.getCkxx()+"不能大于参考上限："+xmInfoNewRow.getCksx());
+            }
+            if(xmInfoNewRow.getXjx().compareTo(xmInfoNewRow.getSjx()) >= 1){
+                return new Result("-1","审核条件逻辑错误，项目下极限限不可大于项目上极限！");
+            }
             reportItemMapper.addXmInfoNew(xmInfoNewRow);
         }
 
@@ -40,6 +46,7 @@ public class ReportItemServiceImpl implements ReportItemService {
 
         List<XmInter> xmInterRows = xmInfoNewDTO.getXmInterRows();
         for (XmInter xmInterRow : xmInterRows) {
+            //前端：通道号不能重复，这里要判断
             reportItemMapper.addXmInterRow(xmInterRow);
         }
 
@@ -127,5 +134,41 @@ public class ReportItemServiceImpl implements ReportItemService {
         return new Result("0","删除成功！");
     }
 
+    @Override
+    public Result getXmFilter(XmFilter xmFilter) {
+       List<XmFilter> xmFilterList = reportItemMapper.getXmFilter(xmFilter);
+        return new Result("0","查询成功！",xmFilterList);
+    }
+
+    @Override
+    public Result addXmFilter(XmFilter xmFilter) {
+        reportItemMapper.addXmFilter(xmFilter);
+        return new Result("0","新增成功!");
+    }
+
+    @Override
+    public Result deleteXmFilter(String yq, String lgph) {
+        reportItemMapper.deleteXmFilter(yq,lgph);
+        return new Result("0","删除成功！");
+    }
+
+    @Override
+    public Result getXmLot() {
+       List<XmLot> lotList = reportItemMapper.getXmLot();
+        return new Result("0","查询成功！",lotList);
+    }
+
+    @Override
+    public Result addXmLot(XmLot xmLot) {
+        reportItemMapper.addXmLot(xmLot);
+        return new Result("0","新增成功！");
+    }
+
+    @Override
+    public Result deleteXmLot(String yq, String sjph) {
+        reportItemMapper.deleteXmLot(yq,sjph);
+        return new Result("0","删除成功！");
+    }
+
 
 }

liswork/src/main/java/com/czlis/liswork/service/impl/xtwh/ComOptServiceImpl.java

@@ -0,0 +1,98 @@
+package com.czlis.liswork.service.impl.xtwh;
+
+import com.czlis.common.core.domain.Result;
+import com.czlis.common.core.domain.entity.lis.ComOpt;
+import com.czlis.common.core.domain.entity.lis.ComOptTemplate;
+import com.czlis.common.core.domain.entity.lis.LabInstr;
+import com.czlis.common.utils.ComOptionUtils;
+import com.czlis.interfaceCommon.mapper.ComOptMapper;
+import com.czlis.interfaceCommon.utils.CommonUtil;
+import com.czlis.liswork.service.ComOptService;
+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;
+import java.util.Map;
+
+@Service
+@Slf4j
+public class ComOptServiceImpl implements ComOptService {
+
+    @Autowired
+    private ComOptMapper comOptMapper;
+    @Autowired
+    private CommonUtil commonUtil;
+
+    @Override
+    public List<ComOpt> getComOptList(ComOpt comOpt) {
+        List<ComOpt> comOptList = comOptMapper.getComOptList(comOpt);
+        return comOptList;
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public Result add(ComOpt comOpt) {
+        comOptMapper.add(comOpt);
+        //设置缓存
+        ComOptionUtils.setOptCache(comOpt.getYq(),comOpt.getXxdh(),comOpt);
+        return new Result("0","新增成功！");
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public Result update(ComOpt comOpt) {
+        comOptMapper.update(comOpt);
+        //设置缓存
+        ComOptionUtils.setOptCache(comOpt.getYq(),comOpt.getXxdh(),comOpt);
+        return new Result("0","修改数据成功！");
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public Result delete(String yq, String xxdh) {
+        comOptMapper.delete(yq,xxdh);
+        //清除缓存
+        ComOptionUtils.clearOptCache(yq,xxdh);
+        return new Result("0","删除数据成功！");
+    }
+
+    @Override
+    public Result getComOptTemplate() {
+        List<ComOptTemplate> comOptTemplateList = comOptMapper.getComOptTemplate(null);
+        return new Result("0","查询成功！",comOptTemplateList);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public Result addTemplate(ComOptTemplate comOptTemplate) {
+        comOptMapper.addTemplate(comOptTemplate);
+        List<LabInstr> labInstrList = commonUtil.getLabInstrList(null);
+        for (LabInstr labInstr : labInstrList) {
+            String yq = labInstr.getYq();
+            String value = commonUtil.getComOptValue(yq, comOptTemplate.getOptcode());
+            if(value == null || value.equals(""))  continue;
+            ComOpt comOpt = new ComOpt();
+            comOpt.setYq(yq);
+            comOpt.setXxdh(comOptTemplate.getComtype());
+            comOpt.setXxlb("INSTR");
+            comOpt.setXxqz(comOptTemplate.getOptdefault());
+            comOpt.setBz(comOptTemplate.getBz());
+            comOpt.setOpttype(comOptTemplate.getOpttype());
+            comOpt.setScope(comOptTemplate.getScope());
+            comOpt.setOptSort(comOptTemplate.getOptSort());
+            add(comOpt);
+        }
+
+        return new Result("0","添加模版参数成功！");
+    }
+
+    @Override
+    public Result queryTree() {
+        List<Map<String,Object>> list = comOptMapper.queryTree();
+        return new Result("0","查询成功！",list);
+    }
+
+
+}

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

@@ -469,4 +469,43 @@
     <delete id="deleteXmInfoVs">
         delete from xm_info_vs where vsid = #{vsid}
     </delete>
+
+    <select id="getXmFilter" resultType="com.czlis.common.core.domain.entity.lis.XmFilter">
+        select * from xm_filter
+        <where>
+            <if test="yq != null and yq != ''">and yq = #{yq}</if>
+        </where>
+    </select>
+
+    <insert id="addXmFilter">
+        insert into xm_filter(
+        yq,lgph,bc
+        )values(
+        #{yq},#{lgph},#{bc}
+        )
+    </insert>
+
+    <delete id="deleteXmFilter">
+        delete from xm_filter where yq = #{yq} and lgph = #{lgph}
+    </delete>
+
+    <select id="getXmLot" resultType="com.czlis.common.core.domain.entity.lis.XmLot">
+        select * from xm_lot
+        <where>
+            <if test="yq != null and yq != ''"> and yq = #{yq}</if>
+            <if test="sjph != null and sjph != ''"> and sjph = #{sjph}</if>
+        </where>
+    </select>
+
+    <insert id="addXmLot">
+        insert into xm_lot(
+            yq,sjph,sjcs,yxq,csff
+        )values(
+        #{yq},#{sjph},#{yxq},#{csff}
+        )
+    </insert>
+
+    <delete id="deleteXmLot">
+        delete from xm_log where yq = #{yq} and sjph = #{sjph}
+    </delete>
 </mapper>

sql/lis8.0/updatedb_lis8.0.sql

@@ -54,3 +54,42 @@ if not exists(SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS  WHERE TABLE_NAME = 'sys_
 begin
 alter table sys_user add snid1 varchar(50)
 end
+
+if not exists(SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS  WHERE TABLE_NAME = 'com_opt_template')
+begin
+    create table com_opt_template
+    (
+        id bigint identity(1,1),
+        opttype varchar(10) not null,  -- 1.单选框，2.文本框，3.下拉框
+        comtype varchar(100) not null,  --1._BAR_ ，_BLDCK，_BLDIN,
+        optcode varchar(100) not null,   --参数名称
+        optdefault varchar(100),   --默认值
+        optSort int,   --排序
+        scope  varchar(1000),  --阈值
+        bz varchar(500)
+    );
+    ALTER TABLE com_opt_template
+        ADD CONSTRAINT PK_com_opt_template PRIMARY KEY CLUSTERED (comtype,optcode);
+
+end
+
+
+if not exists(SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS  WHERE TABLE_NAME = 'com_opt' AND COLUMN_NAME = 'opttype')
+    begin
+        alter table com_opt add opttype varchar(10)
+    end
+
+if not exists(SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS  WHERE TABLE_NAME = 'com_opt' AND COLUMN_NAME = 'scope')
+    begin
+        alter table com_opt add scope varchar(100)
+    end
+
+if not exists(SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS  WHERE TABLE_NAME = 'com_opt' AND COLUMN_NAME = 'optSort')
+    begin
+        alter table com_opt add optSort int
+    end
+
+if not exists(SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS  WHERE TABLE_NAME = 'com_opt' AND COLUMN_NAME = 'status')
+    begin
+        alter table com_opt add status varchar(10)
+    end