碳源投加按两个池子处理： 基本的增删改查、查询实时数据、计算等全部换成2个池子分开处理

src/main/java/com/xlht/xlhtproject/domain/TXinyiMedicineParam.java

@@ -22,112 +22,164 @@ import java.util.Date;
 @AllArgsConstructor
 public class TXinyiMedicineParam
 {
-    private static final long serialVersionUID = 1L;
+    private static final Long serialVersionUID = 1L;
 
     /** 主键 */
     private Long id;
 
-    /** 加药泵（0 1号泵 ；1 2号泵 ；2 3号泵） */
-    private Long numberBeng;
-
-    /** 加药方式(0自动 1一号池 2二号池 3人工投放) */
+    /** 自动方式（0自动 1人工投放） */
     private Integer type;
 
-    /** 进水流量类型（0手动 1仪表） */
-    private Integer jsLlType;
+    /** 进水流量类型1池（0手动 1仪表） */
+    private Integer jsLlTypeOne;
 
     /** 进水流量1号池 */
     private BigDecimal jsLlOne;
 
+    /** 进水流量类型2池（0手动 1仪表） */
+    private Integer jsLlTypeTwo;
+
     /** 进水流量2号池 */
     private BigDecimal jsLlTwo;
 
-    /** 进水cod类型（0手动 1仪表 2化验） */
-    private Integer jsCodType;
+    /** 进水cod类型1池（0手动 1仪表 2化验） */
+    private Integer jsCodTypeOne;
 
     /** 进水cod1号池 */
     private BigDecimal jsCodOne;
 
+    /** 进水cod类型2池（0手动 1仪表 2化验） */
+    private Integer jsCodTypeTwo;
+
     /** 进水cod二号池 */
     private BigDecimal jsCodTwo;
 
-    /** 好氧池硝酸盐类型（0手动 1化验 2预测） */
-    private Integer hycXsyType;
+    /** 好氧池硝酸盐类型1池（0手动 1化验 2预测） */
+    private Integer hycXsyTypeOne;
 
     /** 好氧池硝酸盐1号池 */
     private BigDecimal hycXsyOne;
 
-    /** 好氧池硝酸盐二号池 */
+    /** 好氧池硝酸盐类型2池（0手动 1化验 2预测） */
+    private Integer hycXsyTypeTwo;
+
+    /** 好氧池硝酸盐2号池 */
     private BigDecimal hycXsyTwo;
 
-    /** 缺氧池硝酸盐类型（0手动 1化验） */
-    private Integer qycYxyType;
+    /** 缺氧池硝酸盐类型1池（0手动 1化验） */
+    private Integer qycYxyTypeOne;
 
     /** 缺氧池硝酸盐1号池 */
     private BigDecimal qycYxyOne;
 
+    /** 缺氧池硝酸盐类型2池（0手动 1化验） */
+    private Integer qycYxyTypeTwo;
+
     /** 缺氧池硝酸盐2号池 */
     private BigDecimal qycYxyTwo;
 
-    /** 缺氧池氨氮类型（0手动 1化验） */
-    private Integer qycAdType;
+    /** 缺氧池氨氮类型1池（0手动 1化验） */
+    private Integer qycAdTypeOne;
 
     /** 缺氧池氨氮1号池 */
     private BigDecimal qycAdOne;
 
-    /** 缺氧池氨氮二号池 */
+    /** 缺氧池氨氮类型2池（0手动 1化验） */
+    private Integer qycAdTypeTwo;
+
+    /** 缺氧池氨氮2号池 */
     private BigDecimal qycAdTwo;
 
-    /** 进水总氮类型（0手动 1仪表） */
-    private Integer jsTnType;
+    /** 进水总氮类型1池（0手动 1仪表） */
+    private Integer jsTnTypeOne;
 
     /** 进水总氮1号池 */
     private BigDecimal jsTnOne;
 
+    /** 进水总氮类型2池（0手动 1仪表） */
+    private Integer jsTnTypeTwo;
+
     /** 进水总氮2号池 */
     private BigDecimal jsTnTwo;
 
-    /** 后台反馈设定 */
-    private BigDecimal htfksd;
+    /** 后台反馈设定1池 */
+    private BigDecimal htfksdOne;
 
-    /** 基准系数 */
-    private BigDecimal jzxs;
+    /** 后台反馈设定2池 */
+    private BigDecimal htfksdTwo;
 
-    /** 修正系数 */
-    private BigDecimal xzxs;
+    /** 基准系数1池 */
+    private BigDecimal jzxsOne;
 
-    /** 控制系数 */
-    private BigDecimal kzxs;
+    /** 基准系数2池 */
+    private BigDecimal jzxsTwo;
 
-    /** 水量分配系数 */
-    private BigDecimal slfpxs;
+    /** 修正系数1池 */
+    private BigDecimal xzxsOne;
 
-    /** 碳源当量 */
-    private BigDecimal tydl;
+    /** 修正系数2池 */
+    private BigDecimal xzxsTwo;
 
-    /** 转换系数 */
-    private BigDecimal zhxs;
+    /** 控制系数1池 */
+    private BigDecimal kzxsOne;
 
-    /** 稀释配属 */
-    private BigDecimal sxps;
+    /** 控制系数2池 */
+    private BigDecimal kzxsTwo;
 
-    /** 药剂密度 */
-    private BigDecimal yymd;
+    /** 水量分配系数1池 */
+    private BigDecimal slfpxsOne;
 
-    /** 最小启动流量 */
-    private BigDecimal zxqdll;
+    /** 水量分配系数2池 */
+    private BigDecimal slfpxsTwo;
 
-    /** 碳氮比 */
-    private BigDecimal tdb;
+    /** 碳源当量1池 */
+    private BigDecimal tydlOne;
 
-    /** 加药量 */
-    private BigDecimal medicineAmount;
+    /** 碳源当量2池 */
+    private BigDecimal tydlTwo;
 
-    /** 删除标志（0代表存在 2代表删除） */
-    private Long delFlag;
+    /** 转换系数1池 */
+    private BigDecimal zhxsOne;
+
+    /** 转换系数2池 */
+    private BigDecimal zhxsTwo;
+
+    /** 稀释配属1池 */
+    private BigDecimal sxpsOne;
+
+    /** 稀释配属2池 */
+    private BigDecimal sxpsTwo;
+
+    /** 药剂密度1池 */
+    private BigDecimal yymdOne;
+
+    /** 药剂密度2池 */
+    private BigDecimal yymdTwo;
+
+    /** 最小启动流量1池 */
+    private BigDecimal zxqdllOne;
+
+    /** 最小启动流量2池 */
+    private BigDecimal zxqdllTwo;
+
+    /** 加药量1池 */
+    private BigDecimal medicineAmountOne;
+
+    /** 加药量2池 */
+    private BigDecimal medicineAmountTwo;
+
+    /** 碳氮比1池 */
+    private BigDecimal tdbOne;
+
+    /** 碳氮比2池 */
+    private BigDecimal tdbTwo;
 
     /** 乐观锁 */
-    private Long revision;
+    private Integer revision;
+
+    /** 删除标志（0代表存在 2代表删除） */
+    private Integer delFlag;
+
 
     //额外查询的字段
     //碳源投加瞬时流量(一池)

src/main/java/com/xlht/xlhtproject/service/impl/TXinyiMedicineParamServiceImpl.java

@@ -135,53 +135,87 @@ public class TXinyiMedicineParamServiceImpl implements ITXinyiMedicineParamServi
         SmartAdd smartAdd = this.shuju1Mapper.getNewestData();
         if(!Objects.isNull(smartAdd)){
             //获取对应的类型
-            Integer hycXsyType = latestRecord.getHycXsyType();
-            Integer qycAdType = latestRecord.getQycAdType();
-            Integer qycYxyType = latestRecord.getQycYxyType();
-            Integer jsCodType = latestRecord.getJsCodType();
-            Integer jsLlType = latestRecord.getJsLlType();
-            Integer jsTnType = latestRecord.getJsTnType();
-            if(!Objects.isNull(hycXsyType)){
-                if(1 == hycXsyType){//化验
+            //一池的实时数据处理
+            Integer hycXsyTypeOne = latestRecord.getHycXsyTypeOne();
+            Integer qycAdTypeOne = latestRecord.getQycAdTypeOne();
+            Integer qycYxyTypeOne = latestRecord.getQycYxyTypeOne();
+            Integer jsCodTypeOne = latestRecord.getJsCodTypeOne();
+            Integer jsLlTypeOne = latestRecord.getJsLlTypeOne();
+            Integer jsTnTypeOne = latestRecord.getJsTnTypeOne();
+            if(!Objects.isNull(hycXsyTypeOne)){
+                if(1 == hycXsyTypeOne){//化验
                     latestRecord.setHycXsyOne(smartAdd.getHyXsyHYOne());
-                    latestRecord.setHycXsyTwo(smartAdd.getHyXsyHYTwo());
-                }else if(2 == hycXsyType){//预测
+                }else if(2 == hycXsyTypeOne){//预测
                     latestRecord.setHycXsyOne(smartAdd.getHyXsyYCOne());
-                    latestRecord.setHycXsyTwo(smartAdd.getHyXsyYCTwo());
                 }
             }
-            if(!Objects.isNull(qycAdType) && 1 == qycAdType){//化验
+            if(!Objects.isNull(qycAdTypeOne) && 1 == qycAdTypeOne){//化验
                 latestRecord.setQycAdOne(smartAdd.getQyAdHYOne());
-                latestRecord.setQycAdTwo(smartAdd.getQyAdHYTwo());
             }
-            if(!Objects.isNull(qycYxyType) && 1 == qycYxyType){//化验
+            if(!Objects.isNull(qycYxyTypeOne) && 1 == qycYxyTypeOne){//化验
                 latestRecord.setQycYxyOne(smartAdd.getQyXsyHYOne());
-                latestRecord.setQycYxyTwo(smartAdd.getQyXsyHYTwo());
             }
-            if(!Objects.isNull(jsCodType)){
-                if(1 == jsCodType){//仪表
+            if(!Objects.isNull(jsCodTypeOne)){
+                if(1 == jsCodTypeOne){//仪表
                     latestRecord.setJsCodOne(smartAdd.getJsCodYB());
-                    latestRecord.setJsCodTwo(smartAdd.getJsCodYB());
-                }else if(2 == jsCodType){//化验
+                }else if(2 == jsCodTypeOne){//化验
                     latestRecord.setJsCodOne(smartAdd.getJsCodHY());
-                    latestRecord.setJsCodTwo(smartAdd.getJsCodHY());
                 }
             }
-            if(!Objects.isNull(jsLlType) && 1 == jsLlType){//仪表
+            if(!Objects.isNull(jsLlTypeOne) && 1 == jsLlTypeOne){//仪表
                 latestRecord.setJsLlOne(smartAdd.getJslYB());
-                latestRecord.setJsLlTwo(smartAdd.getJslYB());
             }
-            if(!Objects.isNull(jsTnType) && 1 == jsTnType){//仪表
+            if(!Objects.isNull(jsTnTypeOne) && 1 == jsTnTypeOne){//仪表
                 latestRecord.setJsTnOne(smartAdd.getJsTnYB());
+            }
+
+            //二池的实时数据处理
+            Integer hycXsyTypeTwo = latestRecord.getHycXsyTypeTwo();
+            Integer qycAdTypeTwo = latestRecord.getQycAdTypeTwo();
+            Integer qycYxyTypeTwo = latestRecord.getQycYxyTypeTwo();
+            Integer jsCodTypeTwo = latestRecord.getJsCodTypeTwo();
+            Integer jsLlTypeTwo = latestRecord.getJsLlTypeTwo();
+            Integer jsTnTypeTwo = latestRecord.getJsTnTypeTwo();
+            if(!Objects.isNull(hycXsyTypeTwo)){
+                if(1 == hycXsyTypeTwo){//化验
+                    latestRecord.setHycXsyTwo(smartAdd.getHyXsyHYTwo());
+                }else if(2 == hycXsyTypeTwo){//预测
+                    latestRecord.setHycXsyTwo(smartAdd.getHyXsyYCTwo());
+                }
+            }
+            if(!Objects.isNull(qycAdTypeTwo) && 1 == qycAdTypeTwo){//化验
+                latestRecord.setQycAdTwo(smartAdd.getQyAdHYTwo());
+            }
+            if(!Objects.isNull(qycYxyTypeTwo) && 1 == qycYxyTypeTwo){//化验
+                latestRecord.setQycYxyTwo(smartAdd.getQyXsyHYTwo());
+            }
+            if(!Objects.isNull(jsCodTypeTwo)){
+                if(1 == jsCodTypeTwo){//仪表
+                    latestRecord.setJsCodTwo(smartAdd.getJsCodYB());
+                }else if(2 == jsCodTypeTwo){//化验
+                    latestRecord.setJsCodTwo(smartAdd.getJsCodHY());
+                }
+            }
+            if(!Objects.isNull(jsLlTypeTwo) && 1 == jsLlTypeTwo){//仪表
+                latestRecord.setJsLlTwo(smartAdd.getJslYB());
+            }
+            if(!Objects.isNull(jsTnTypeTwo) && 1 == jsTnTypeTwo){//仪表
                 latestRecord.setJsTnTwo(smartAdd.getJsTnYB());
             }
-            //计算实时的碳源投加量 (2个池子需要分开存 ToDo)
+
+            //计算实时的碳源投加量 (2个池子需要分开存)
             BigDecimal val = this.calculateUtils.calculateMedicineByLastRecord(latestRecord, 1);
             if(!Objects.isNull(val) && val.compareTo(BigDecimal.ZERO) < 0){
-                log.info("计算得到的碳源投加量是负数，按0处理");
+                log.info("一池计算得到的碳源投加量是负数，按0处理");
                 val = BigDecimal.ZERO;
             }
-            latestRecord.setMedicineAmount(val);
+            latestRecord.setMedicineAmountOne(val);
+            BigDecimal val2 = this.calculateUtils.calculateMedicineByLastRecord(latestRecord, 2);
+            if(!Objects.isNull(val2) && val2.compareTo(BigDecimal.ZERO) < 0){
+                log.info("二池计算得到的碳源投加量是负数，按0处理");
+                val2 = BigDecimal.ZERO;
+            }
+            latestRecord.setMedicineAmountTwo(val2);
             //获取2个池子的瞬时投药流量
             TTbDu tTbDu = tTbDuMapper.selectTTbDuByID(LONG_1);
             if(!Objects.isNull(tTbDu)){

src/main/java/com/xlht/xlhtproject/utils/CalculateUtils.java

@@ -23,52 +23,66 @@ public class CalculateUtils {
             return null;
         }
         //计算用到的值
-        Integer hycXsyType = param.getHycXsyType();
+        Integer hycXsyTypeOne = param.getHycXsyTypeOne();
+        Integer hycXsyTypeTwo = param.getHycXsyTypeTwo();
         BigDecimal hycXsyOne = param.getHycXsyOne();
         BigDecimal hycXsyTwo = param.getHycXsyTwo();
 
-        BigDecimal htfksd = param.getHtfksd();
+        BigDecimal htfksdOne = param.getHtfksdOne();
+        BigDecimal htfksdTwo = param.getHtfksdTwo();
 
-        Integer qycAdType = param.getQycAdType();
+        Integer qycAdTypeOne = param.getQycAdTypeOne();
+        Integer qycAdTypeTwo = param.getQycAdTypeTwo();
         BigDecimal qycAdOne = param.getQycAdOne();
         BigDecimal qycAdTwo = param.getQycAdTwo();
 
-        Integer qycYxyType = param.getQycYxyType();
+        Integer qycYxyTypeOne = param.getQycYxyTypeOne();
+        Integer qycYxyTypeTwo = param.getQycYxyTypeTwo();
         BigDecimal qycYxyOne = param.getQycYxyOne();
         BigDecimal qycYxyTwo = param.getQycYxyTwo();
 
-        BigDecimal xzxs = param.getXzxs();
+        BigDecimal xzxsOne = param.getXzxsOne();
+        BigDecimal xzxsTwo = param.getXzxsTwo();
 
-        BigDecimal jzxs = param.getJzxs();
+        BigDecimal jzxsOne = param.getJzxsOne();
+        BigDecimal jzxsTwo = param.getJzxsTwo();
 
-        Integer jsLlType = param.getJsLlType();
+        Integer jsLlTypeOne = param.getJsLlTypeOne();
+        Integer jsLlTypeTwo = param.getJsLlTypeTwo();
         BigDecimal jsLlOne = param.getJsLlOne();
         BigDecimal jsLlTwo = param.getJsLlTwo();
 
-        BigDecimal slfpxs = param.getSlfpxs();
+        BigDecimal slfpxsOne = param.getSlfpxsOne();
+        BigDecimal slfpxsTwo = param.getSlfpxsTwo();
 
-        BigDecimal kzxs = param.getKzxs();
+        BigDecimal kzxsOne = param.getKzxsOne();
+        BigDecimal kzxsTwo = param.getKzxsTwo();
 
-        Integer jsCodType = param.getJsCodType();
+        Integer jsCodTypeOne = param.getJsCodTypeOne();
+        Integer jsCodTypeTwo = param.getJsCodTypeTwo();
         BigDecimal jsCodOne = param.getJsCodOne();
         BigDecimal jsCodTwo = param.getJsCodTwo();
 
-        BigDecimal zhxs = param.getZhxs();
+        BigDecimal zhxsOne = param.getZhxsOne();
+        BigDecimal zhxsTwo = param.getZhxsTwo();
 
-        BigDecimal tydl = param.getTydl();
+        BigDecimal tydlOne = param.getTydlOne();
+        BigDecimal tydlTwo = param.getTydlTwo();
 
-        BigDecimal medicineAmount = param.getMedicineAmount();//手动需要
+        BigDecimal medicineAmountOne = param.getMedicineAmountOne();//手动需要
 
 //        Integer type = param.getType();//0自动 1一号池 2二号池 3人工投放
 
-        BigDecimal yymd = param.getYymd();
+        BigDecimal yymdOne = param.getYymdOne();
+        BigDecimal yymdTwo = param.getYymdTwo();
 
-        BigDecimal sxps = param.getSxps();
+        BigDecimal sxpsOne = param.getSxpsOne();
+        BigDecimal sxpsTwo = param.getSxpsTwo();
 
         //计算
         if(!Objects.isNull(type)) {
             if(3 == type){
-                return medicineAmount;
+                return medicineAmountOne;
             }
             //2024年09月19日11:30:06 锡林浩特，碳源投放是1池和2池分开投放的
             //计算1号池的值
@@ -77,9 +91,9 @@ public class CalculateUtils {
             if(0 == type)//锡林浩特没有这个逻辑，连个池子是分开的
                 return null;
             else if(1 == type) {
-                return getResultByDiff(hycXsyType, hycXsyOne, htfksd, qycAdType, qycAdOne, qycYxyType, qycYxyOne, xzxs, jzxs, jsLlType, jsLlOne, slfpxs, kzxs, jsCodType, jsCodOne, zhxs, tydl, "one", yymd, sxps);
+                return getResultByDiff(hycXsyTypeOne, hycXsyOne, htfksdOne, qycAdTypeOne, qycAdOne, qycYxyTypeOne, qycYxyOne, xzxsOne, jzxsOne, jsLlTypeOne, jsLlOne, slfpxsOne, kzxsOne, jsCodTypeOne, jsCodOne, zhxsOne, tydlOne, "one", yymdOne, sxpsOne);
             }else if(2 == type)
-                return getResultByDiff(hycXsyType, hycXsyTwo, htfksd, qycAdType, qycAdTwo, qycYxyType, qycYxyTwo, xzxs, jzxs, jsLlType, jsLlTwo, slfpxs, kzxs, jsCodType, jsCodTwo, zhxs, tydl, "two", yymd, sxps);
+                return getResultByDiff(hycXsyTypeTwo, hycXsyTwo, htfksdTwo, qycAdTypeTwo, qycAdTwo, qycYxyTypeTwo, qycYxyTwo, xzxsTwo, jzxsTwo, jsLlTypeTwo, jsLlTwo, slfpxsTwo, kzxsTwo, jsCodTypeTwo, jsCodTwo, zhxsTwo, tydlTwo, "two", yymdTwo, sxpsTwo);
             else {
                 return null;//错误的配置
             }

src/main/resources/mapper/TXinyiMedicineParamMapper.xml

@@ -3,43 +3,60 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xlht.xlhtproject.mapper.TXinyiMedicineParamMapper">
-    
-    <resultMap type="com.xlht.xlhtproject.domain.TXinyiMedicineParam" id="TXinyiMedicineParamResult">
+
+    <resultMap type="TXinyiMedicineParam" id="TXinyiMedicineParamResult">
         <result property="id"    column="id"    />
-        <result property="numberBeng"    column="number_beng"    />
         <result property="type"    column="type"    />
-        <result property="jsLlType"    column="js_ll_type"    />
+        <result property="jsLlTypeOne"    column="js_ll_type_one"    />
         <result property="jsLlOne"    column="js_ll_one"    />
+        <result property="jsLlTypeTwo"    column="js_ll_type_two"    />
         <result property="jsLlTwo"    column="js_ll_two"    />
-        <result property="jsCodType"    column="js_cod_type"    />
+        <result property="jsCodTypeOne"    column="js_cod_type_one"    />
         <result property="jsCodOne"    column="js_cod_one"    />
+        <result property="jsCodTypeTwo"    column="js_cod_type_two"    />
         <result property="jsCodTwo"    column="js_cod_two"    />
-        <result property="hycXsyType"    column="hyc_xsy_type"    />
+        <result property="hycXsyTypeOne"    column="hyc_xsy_type_one"    />
         <result property="hycXsyOne"    column="hyc_xsy_one"    />
+        <result property="hycXsyTypeTwo"    column="hyc_xsy_type_two"    />
         <result property="hycXsyTwo"    column="hyc_xsy_two"    />
-        <result property="qycYxyType"    column="qyc_yxy_type"    />
+        <result property="qycYxyTypeOne"    column="qyc_yxy_type_one"    />
         <result property="qycYxyOne"    column="qyc_yxy_one"    />
+        <result property="qycYxyTypeTwo"    column="qyc_yxy_type_two"    />
         <result property="qycYxyTwo"    column="qyc_yxy_two"    />
-        <result property="qycAdType"    column="qyc_ad_type"    />
+        <result property="qycAdTypeOne"    column="qyc_ad_type_one"    />
         <result property="qycAdOne"    column="qyc_ad_one"    />
+        <result property="qycAdTypeTwo"    column="qyc_ad_type_two"    />
         <result property="qycAdTwo"    column="qyc_ad_two"    />
-        <result property="jsTnType"    column="js_tn_type"    />
+        <result property="jsTnTypeOne"    column="js_tn_type_one"    />
         <result property="jsTnOne"    column="js_tn_one"    />
+        <result property="jsTnTypeTwo"    column="js_tn_type_two"    />
         <result property="jsTnTwo"    column="js_tn_two"    />
-        <result property="htfksd"    column="htfksd"    />
-        <result property="jzxs"    column="jzxs"    />
-        <result property="xzxs"    column="xzxs"    />
-        <result property="kzxs"    column="kzxs"    />
-        <result property="slfpxs"    column="slfpxs"    />
-        <result property="tydl"    column="tydl"    />
-        <result property="zhxs"    column="zhxs"    />
-        <result property="sxps"    column="sxps"    />
-        <result property="yymd"    column="yymd"    />
-        <result property="zxqdll"    column="zxqdll"    />
-        <result property="tdb"    column="tdb"    />
-        <result property="medicineAmount"    column="medicine_amount"    />
-        <result property="delFlag"    column="del_flag"    />
+        <result property="htfksdOne"    column="htfksd_one"    />
+        <result property="htfksdTwo"    column="htfksd_two"    />
+        <result property="jzxsOne"    column="jzxs_one"    />
+        <result property="jzxsTwo"    column="jzxs_two"    />
+        <result property="xzxsOne"    column="xzxs_one"    />
+        <result property="xzxsTwo"    column="xzxs_two"    />
+        <result property="kzxsOne"    column="kzxs_one"    />
+        <result property="kzxsTwo"    column="kzxs_two"    />
+        <result property="slfpxsOne"    column="slfpxs_one"    />
+        <result property="slfpxsTwo"    column="slfpxs_two"    />
+        <result property="tydlOne"    column="tydl_one"    />
+        <result property="tydlTwo"    column="tydl_two"    />
+        <result property="zhxsOne"    column="zhxs_one"    />
+        <result property="zhxsTwo"    column="zhxs_two"    />
+        <result property="sxpsOne"    column="sxps_one"    />
+        <result property="sxpsTwo"    column="sxps_two"    />
+        <result property="yymdOne"    column="yymd_one"    />
+        <result property="yymdTwo"    column="yymd_two"    />
+        <result property="zxqdllOne"    column="zxqdll_one"    />
+        <result property="zxqdllTwo"    column="zxqdll_two"    />
+        <result property="medicineAmountOne"    column="medicine_amount_one"    />
+        <result property="medicineAmountTwo"    column="medicine_amount_two"    />
+        <result property="tdbOne"    column="tdb_one"    />
+        <result property="tdbTwo"    column="tdb_two"    />
         <result property="revision"    column="revision"    />
+        <result property="delFlag"    column="del_flag"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
@@ -48,184 +65,188 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTXinyiMedicineParamVo">
-        select id, number_beng, type, js_ll_type, js_ll_one, js_ll_two, js_cod_type, js_cod_one, js_cod_two, hyc_xsy_type, hyc_xsy_one, hyc_xsy_two, qyc_yxy_type, qyc_yxy_one, qyc_yxy_two, qyc_ad_type, qyc_ad_one, qyc_ad_two, js_tn_type, js_tn_one, js_tn_two, htfksd, jzxs, xzxs, kzxs, slfpxs, tydl, zhxs, sxps, yymd, zxqdll, tdb, medicine_amount, del_flag, revision, create_by, create_time, update_by, update_time, remark from t_xinyi_medicine_param
+        select id, type, js_ll_type_one, js_ll_one, js_ll_type_two, js_ll_two, js_cod_type_one, js_cod_one, js_cod_type_two, js_cod_two, hyc_xsy_type_one, hyc_xsy_one, hyc_xsy_type_two, hyc_xsy_two, qyc_yxy_type_one, qyc_yxy_one, qyc_yxy_type_two, qyc_yxy_two, qyc_ad_type_one, qyc_ad_one, qyc_ad_type_two, qyc_ad_two, js_tn_type_one, js_tn_one, js_tn_type_two, js_tn_two, htfksd_one, htfksd_two, jzxs_one, jzxs_two, xzxs_one, xzxs_two, kzxs_one, kzxs_two, slfpxs_one, slfpxs_two, tydl_one, tydl_two, zhxs_one, zhxs_two, sxps_one, sxps_two, yymd_one, yymd_two, zxqdll_one, zxqdll_two, medicine_amount_one, medicine_amount_two, tdb_one, tdb_two, revision, del_flag, create_by, create_time, update_by, update_time, remark from t_xlht_medicine_param
     </sql>
 
-    <select id="selectTXinyiMedicineParamList" parameterType="com.xlht.xlhtproject.domain.TXinyiMedicineParam" resultMap="TXinyiMedicineParamResult">
-        <include refid="selectTXinyiMedicineParamVo"/>
-        <where>
-            1 = 1
-            <if test="numberBeng != null "> and number_beng = #{numberBeng}</if>
-            <if test="type != null "> and type = #{type}</if>
-            <if test="jsLlType != null "> and js_ll_type = #{jsLlType}</if>
-            <if test="jsLlOne != null "> and js_ll_one = #{jsLlOne}</if>
-            <if test="jsLlTwo != null "> and js_ll_two = #{jsLlTwo}</if>
-            <if test="jsCodType != null "> and js_cod_type = #{jsCodType}</if>
-            <if test="jsCodOne != null "> and js_cod_one = #{jsCodOne}</if>
-            <if test="jsCodTwo != null "> and js_cod_two = #{jsCodTwo}</if>
-            <if test="hycXsyType != null "> and hyc_xsy_type = #{hycXsyType}</if>
-            <if test="hycXsyOne != null "> and hyc_xsy_one = #{hycXsyOne}</if>
-            <if test="hycXsyTwo != null "> and hyc_xsy_two = #{hycXsyTwo}</if>
-            <if test="qycYxyType != null "> and qyc_yxy_type = #{qycYxyType}</if>
-            <if test="qycYxyOne != null "> and qyc_yxy_one = #{qycYxyOne}</if>
-            <if test="qycYxyTwo != null "> and qyc_yxy_two = #{qycYxyTwo}</if>
-            <if test="qycAdType != null "> and qyc_ad_type = #{qycAdType}</if>
-            <if test="qycAdOne != null "> and qyc_ad_one = #{qycAdOne}</if>
-            <if test="qycAdTwo != null "> and qyc_ad_two = #{qycAdTwo}</if>
-            <if test="jsTnType != null "> and js_tn_type = #{jsTnType}</if>
-            <if test="jsTnOne != null "> and js_tn_one = #{jsTnOne}</if>
-            <if test="jsTnTwo != null "> and js_tn_two = #{jsTnTwo}</if>
-            <if test="htfksd != null "> and htfksd = #{htfksd}</if>
-            <if test="jzxs != null "> and jzxs = #{jzxs}</if>
-            <if test="xzxs != null "> and xzxs = #{xzxs}</if>
-            <if test="kzxs != null "> and kzxs = #{kzxs}</if>
-            <if test="slfpxs != null "> and slfpxs = #{slfpxs}</if>
-            <if test="tydl != null "> and tydl = #{tydl}</if>
-            <if test="zhxs != null "> and zhxs = #{zhxs}</if>
-            <if test="sxps != null "> and sxps = #{sxps}</if>
-            <if test="yymd != null "> and yymd = #{yymd}</if>
-            <if test="zxqdll != null "> and zxqdll = #{zxqdll}</if>
-            <if test="tdb != null "> and tdb = #{tdb}</if>
-            <if test="medicineAmount != null "> and medicine_amount = #{medicineAmount}</if>
-            <if test="revision != null "> and revision = #{revision}</if>
-            <!-- 下面是新增的SQL检索条件  SqlServer写法-->
-            <if test="timeBegin != null  and timeBegin != ''"> and SUBSTRING (CONVERT ( VARCHAR, create_time, 120 ), 1, 10 ) &gt;= #{timeBegin}</if>
-            <if test="timeEnd != null  and timeEnd != ''"> and SUBSTRING (CONVERT ( VARCHAR, create_time, 120 ), 1, 10 ) &lt;= #{timeEnd}</if>
-            <!-- 下面是新增的SQL检索条件  MySQL写法-->
-            <!--<if test="timeBegin != null  and timeBegin != ''"> and DATE_FORMAT(create_time, '%Y-%m-%d') &gt;= #{timeBegin}</if>
-            <if test="timeEnd != null  and timeEnd != ''"> DATE_FORMAT(create_time, '%Y-%m-%d') &lt;= #{timeEnd}</if>-->
-        </where>
-        and del_flag = 0 order by id desc
-    </select>
-    
     <select id="selectTXinyiMedicineParamById" parameterType="Long" resultMap="TXinyiMedicineParamResult">
         <include refid="selectTXinyiMedicineParamVo"/>
         where id = #{id} and del_flag = 0
     </select>
-        
-    <insert id="insertTXinyiMedicineParam" parameterType="com.xlht.xlhtproject.domain.TXinyiMedicineParam" useGeneratedKeys="true" keyProperty="id">
-        insert into t_xinyi_medicine_param
+
+    <insert id="insertTXinyiMedicineParam" parameterType="TXinyiMedicineParam" useGeneratedKeys="true" keyProperty="id">
+        insert into t_xlht_medicine_param
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="numberBeng != null">number_beng,</if>
             <if test="type != null">type,</if>
-            <if test="jsLlType != null">js_ll_type,</if>
+            <if test="jsLlTypeOne != null">js_ll_type_one,</if>
             <if test="jsLlOne != null">js_ll_one,</if>
+            <if test="jsLlTypeTwo != null">js_ll_type_two,</if>
             <if test="jsLlTwo != null">js_ll_two,</if>
-            <if test="jsCodType != null">js_cod_type,</if>
+            <if test="jsCodTypeOne != null">js_cod_type_one,</if>
             <if test="jsCodOne != null">js_cod_one,</if>
+            <if test="jsCodTypeTwo != null">js_cod_type_two,</if>
             <if test="jsCodTwo != null">js_cod_two,</if>
-            <if test="hycXsyType != null">hyc_xsy_type,</if>
+            <if test="hycXsyTypeOne != null">hyc_xsy_type_one,</if>
             <if test="hycXsyOne != null">hyc_xsy_one,</if>
+            <if test="hycXsyTypeTwo != null">hyc_xsy_type_two,</if>
             <if test="hycXsyTwo != null">hyc_xsy_two,</if>
-            <if test="qycYxyType != null">qyc_yxy_type,</if>
+            <if test="qycYxyTypeOne != null">qyc_yxy_type_one,</if>
             <if test="qycYxyOne != null">qyc_yxy_one,</if>
+            <if test="qycYxyTypeTwo != null">qyc_yxy_type_two,</if>
             <if test="qycYxyTwo != null">qyc_yxy_two,</if>
-            <if test="qycAdType != null">qyc_ad_type,</if>
+            <if test="qycAdTypeOne != null">qyc_ad_type_one,</if>
             <if test="qycAdOne != null">qyc_ad_one,</if>
+            <if test="qycAdTypeTwo != null">qyc_ad_type_two,</if>
             <if test="qycAdTwo != null">qyc_ad_two,</if>
-            <if test="jsTnType != null">js_tn_type,</if>
+            <if test="jsTnTypeOne != null">js_tn_type_one,</if>
             <if test="jsTnOne != null">js_tn_one,</if>
+            <if test="jsTnTypeTwo != null">js_tn_type_two,</if>
             <if test="jsTnTwo != null">js_tn_two,</if>
-            <if test="htfksd != null">htfksd,</if>
-            <if test="jzxs != null">jzxs,</if>
-            <if test="xzxs != null">xzxs,</if>
-            <if test="kzxs != null">kzxs,</if>
-            <if test="slfpxs != null">slfpxs,</if>
-            <if test="tydl != null">tydl,</if>
-            <if test="zhxs != null">zhxs,</if>
-            <if test="sxps != null">sxps,</if>
-            <if test="yymd != null">yymd,</if>
-            <if test="zxqdll != null">zxqdll,</if>
-            <if test="tdb != null">tdb,</if>
-            <if test="medicineAmount != null">medicine_amount,</if>
-            <if test="delFlag != null">del_flag,</if>
+            <if test="htfksdOne != null">htfksd_one,</if>
+            <if test="htfksdTwo != null">htfksd_two,</if>
+            <if test="jzxsOne != null">jzxs_one,</if>
+            <if test="jzxsTwo != null">jzxs_two,</if>
+            <if test="xzxsOne != null">xzxs_one,</if>
+            <if test="xzxsTwo != null">xzxs_two,</if>
+            <if test="kzxsOne != null">kzxs_one,</if>
+            <if test="kzxsTwo != null">kzxs_two,</if>
+            <if test="slfpxsOne != null">slfpxs_one,</if>
+            <if test="slfpxsTwo != null">slfpxs_two,</if>
+            <if test="tydlOne != null">tydl_one,</if>
+            <if test="tydlTwo != null">tydl_two,</if>
+            <if test="zhxsOne != null">zhxs_one,</if>
+            <if test="zhxsTwo != null">zhxs_two,</if>
+            <if test="sxpsOne != null">sxps_one,</if>
+            <if test="sxpsTwo != null">sxps_two,</if>
+            <if test="yymdOne != null">yymd_one,</if>
+            <if test="yymdTwo != null">yymd_two,</if>
+            <if test="zxqdllOne != null">zxqdll_one,</if>
+            <if test="zxqdllTwo != null">zxqdll_two,</if>
+            <if test="medicineAmountOne != null">medicine_amount_one,</if>
+            <if test="medicineAmountTwo != null">medicine_amount_two,</if>
+            <if test="tdbOne != null">tdb_one,</if>
+            <if test="tdbTwo != null">tdb_two,</if>
             <if test="revision != null">revision,</if>
+            <if test="delFlag != null">del_flag,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="remark != null">remark,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="numberBeng != null">#{numberBeng},</if>
             <if test="type != null">#{type},</if>
-            <if test="jsLlType != null">#{jsLlType},</if>
+            <if test="jsLlTypeOne != null">#{jsLlTypeOne},</if>
             <if test="jsLlOne != null">#{jsLlOne},</if>
+            <if test="jsLlTypeTwo != null">#{jsLlTypeTwo},</if>
             <if test="jsLlTwo != null">#{jsLlTwo},</if>
-            <if test="jsCodType != null">#{jsCodType},</if>
+            <if test="jsCodTypeOne != null">#{jsCodTypeOne},</if>
             <if test="jsCodOne != null">#{jsCodOne},</if>
+            <if test="jsCodTypeTwo != null">#{jsCodTypeTwo},</if>
             <if test="jsCodTwo != null">#{jsCodTwo},</if>
-            <if test="hycXsyType != null">#{hycXsyType},</if>
+            <if test="hycXsyTypeOne != null">#{hycXsyTypeOne},</if>
             <if test="hycXsyOne != null">#{hycXsyOne},</if>
+            <if test="hycXsyTypeTwo != null">#{hycXsyTypeTwo},</if>
             <if test="hycXsyTwo != null">#{hycXsyTwo},</if>
-            <if test="qycYxyType != null">#{qycYxyType},</if>
+            <if test="qycYxyTypeOne != null">#{qycYxyTypeOne},</if>
             <if test="qycYxyOne != null">#{qycYxyOne},</if>
+            <if test="qycYxyTypeTwo != null">#{qycYxyTypeTwo},</if>
             <if test="qycYxyTwo != null">#{qycYxyTwo},</if>
-            <if test="qycAdType != null">#{qycAdType},</if>
+            <if test="qycAdTypeOne != null">#{qycAdTypeOne},</if>
             <if test="qycAdOne != null">#{qycAdOne},</if>
+            <if test="qycAdTypeTwo != null">#{qycAdTypeTwo},</if>
             <if test="qycAdTwo != null">#{qycAdTwo},</if>
-            <if test="jsTnType != null">#{jsTnType},</if>
+            <if test="jsTnTypeOne != null">#{jsTnTypeOne},</if>
             <if test="jsTnOne != null">#{jsTnOne},</if>
+            <if test="jsTnTypeTwo != null">#{jsTnTypeTwo},</if>
             <if test="jsTnTwo != null">#{jsTnTwo},</if>
-            <if test="htfksd != null">#{htfksd},</if>
-            <if test="jzxs != null">#{jzxs},</if>
-            <if test="xzxs != null">#{xzxs},</if>
-            <if test="kzxs != null">#{kzxs},</if>
-            <if test="slfpxs != null">#{slfpxs},</if>
-            <if test="tydl != null">#{tydl},</if>
-            <if test="zhxs != null">#{zhxs},</if>
-            <if test="sxps != null">#{sxps},</if>
-            <if test="yymd != null">#{yymd},</if>
-            <if test="zxqdll != null">#{zxqdll},</if>
-            <if test="tdb != null">#{tdb},</if>
-            <if test="medicineAmount != null">#{medicineAmount},</if>
-            <if test="delFlag != null">#{delFlag},</if>
+            <if test="htfksdOne != null">#{htfksdOne},</if>
+            <if test="htfksdTwo != null">#{htfksdTwo},</if>
+            <if test="jzxsOne != null">#{jzxsOne},</if>
+            <if test="jzxsTwo != null">#{jzxsTwo},</if>
+            <if test="xzxsOne != null">#{xzxsOne},</if>
+            <if test="xzxsTwo != null">#{xzxsTwo},</if>
+            <if test="kzxsOne != null">#{kzxsOne},</if>
+            <if test="kzxsTwo != null">#{kzxsTwo},</if>
+            <if test="slfpxsOne != null">#{slfpxsOne},</if>
+            <if test="slfpxsTwo != null">#{slfpxsTwo},</if>
+            <if test="tydlOne != null">#{tydlOne},</if>
+            <if test="tydlTwo != null">#{tydlTwo},</if>
+            <if test="zhxsOne != null">#{zhxsOne},</if>
+            <if test="zhxsTwo != null">#{zhxsTwo},</if>
+            <if test="sxpsOne != null">#{sxpsOne},</if>
+            <if test="sxpsTwo != null">#{sxpsTwo},</if>
+            <if test="yymdOne != null">#{yymdOne},</if>
+            <if test="yymdTwo != null">#{yymdTwo},</if>
+            <if test="zxqdllOne != null">#{zxqdllOne},</if>
+            <if test="zxqdllTwo != null">#{zxqdllTwo},</if>
+            <if test="medicineAmountOne != null">#{medicineAmountOne},</if>
+            <if test="medicineAmountTwo != null">#{medicineAmountTwo},</if>
+            <if test="tdbOne != null">#{tdbOne},</if>
+            <if test="tdbTwo != null">#{tdbTwo},</if>
             <if test="revision != null">#{revision},</if>
+            <if test="delFlag != null">#{delFlag},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="remark != null">#{remark},</if>
-         </trim>
+        </trim>
     </insert>
 
-    <update id="updateTXinyiMedicineParam" parameterType="com.xlht.xlhtproject.domain.TXinyiMedicineParam">
-        update t_xinyi_medicine_param
+    <update id="updateTXinyiMedicineParam" parameterType="TXinyiMedicineParam">
+        update t_xlht_medicine_param
         <trim prefix="SET" suffixOverrides=",">
-            <if test="numberBeng != null">number_beng = #{numberBeng},</if>
             <if test="type != null">type = #{type},</if>
-            <if test="jsLlType != null">js_ll_type = #{jsLlType},</if>
+            <if test="jsLlTypeOne != null">js_ll_type_one = #{jsLlTypeOne},</if>
             <if test="jsLlOne != null">js_ll_one = #{jsLlOne},</if>
+            <if test="jsLlTypeTwo != null">js_ll_type_two = #{jsLlTypeTwo},</if>
             <if test="jsLlTwo != null">js_ll_two = #{jsLlTwo},</if>
-            <if test="jsCodType != null">js_cod_type = #{jsCodType},</if>
+            <if test="jsCodTypeOne != null">js_cod_type_one = #{jsCodTypeOne},</if>
             <if test="jsCodOne != null">js_cod_one = #{jsCodOne},</if>
+            <if test="jsCodTypeTwo != null">js_cod_type_two = #{jsCodTypeTwo},</if>
             <if test="jsCodTwo != null">js_cod_two = #{jsCodTwo},</if>
-            <if test="hycXsyType != null">hyc_xsy_type = #{hycXsyType},</if>
+            <if test="hycXsyTypeOne != null">hyc_xsy_type_one = #{hycXsyTypeOne},</if>
             <if test="hycXsyOne != null">hyc_xsy_one = #{hycXsyOne},</if>
+            <if test="hycXsyTypeTwo != null">hyc_xsy_type_two = #{hycXsyTypeTwo},</if>
             <if test="hycXsyTwo != null">hyc_xsy_two = #{hycXsyTwo},</if>
-            <if test="qycYxyType != null">qyc_yxy_type = #{qycYxyType},</if>
+            <if test="qycYxyTypeOne != null">qyc_yxy_type_one = #{qycYxyTypeOne},</if>
             <if test="qycYxyOne != null">qyc_yxy_one = #{qycYxyOne},</if>
+            <if test="qycYxyTypeTwo != null">qyc_yxy_type_two = #{qycYxyTypeTwo},</if>
             <if test="qycYxyTwo != null">qyc_yxy_two = #{qycYxyTwo},</if>
-            <if test="qycAdType != null">qyc_ad_type = #{qycAdType},</if>
+            <if test="qycAdTypeOne != null">qyc_ad_type_one = #{qycAdTypeOne},</if>
             <if test="qycAdOne != null">qyc_ad_one = #{qycAdOne},</if>
+            <if test="qycAdTypeTwo != null">qyc_ad_type_two = #{qycAdTypeTwo},</if>
             <if test="qycAdTwo != null">qyc_ad_two = #{qycAdTwo},</if>
-            <if test="jsTnType != null">js_tn_type = #{jsTnType},</if>
+            <if test="jsTnTypeOne != null">js_tn_type_one = #{jsTnTypeOne},</if>
             <if test="jsTnOne != null">js_tn_one = #{jsTnOne},</if>
+            <if test="jsTnTypeTwo != null">js_tn_type_two = #{jsTnTypeTwo},</if>
             <if test="jsTnTwo != null">js_tn_two = #{jsTnTwo},</if>
-            <if test="htfksd != null">htfksd = #{htfksd},</if>
-            <if test="jzxs != null">jzxs = #{jzxs},</if>
-            <if test="xzxs != null">xzxs = #{xzxs},</if>
-            <if test="kzxs != null">kzxs = #{kzxs},</if>
-            <if test="slfpxs != null">slfpxs = #{slfpxs},</if>
-            <if test="tydl != null">tydl = #{tydl},</if>
-            <if test="zhxs != null">zhxs = #{zhxs},</if>
-            <if test="sxps != null">sxps = #{sxps},</if>
-            <if test="yymd != null">yymd = #{yymd},</if>
-            <if test="zxqdll != null">zxqdll = #{zxqdll},</if>
-            <if test="tdb != null">tdb = #{tdb},</if>
-            <if test="medicineAmount != null">medicine_amount = #{medicineAmount},</if>
-            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="htfksdOne != null">htfksd_one = #{htfksdOne},</if>
+            <if test="htfksdTwo != null">htfksd_two = #{htfksdTwo},</if>
+            <if test="jzxsOne != null">jzxs_one = #{jzxsOne},</if>
+            <if test="jzxsTwo != null">jzxs_two = #{jzxsTwo},</if>
+            <if test="xzxsOne != null">xzxs_one = #{xzxsOne},</if>
+            <if test="xzxsTwo != null">xzxs_two = #{xzxsTwo},</if>
+            <if test="kzxsOne != null">kzxs_one = #{kzxsOne},</if>
+            <if test="kzxsTwo != null">kzxs_two = #{kzxsTwo},</if>
+            <if test="slfpxsOne != null">slfpxs_one = #{slfpxsOne},</if>
+            <if test="slfpxsTwo != null">slfpxs_two = #{slfpxsTwo},</if>
+            <if test="tydlOne != null">tydl_one = #{tydlOne},</if>
+            <if test="tydlTwo != null">tydl_two = #{tydlTwo},</if>
+            <if test="zhxsOne != null">zhxs_one = #{zhxsOne},</if>
+            <if test="zhxsTwo != null">zhxs_two = #{zhxsTwo},</if>
+            <if test="sxpsOne != null">sxps_one = #{sxpsOne},</if>
+            <if test="sxpsTwo != null">sxps_two = #{sxpsTwo},</if>
+            <if test="yymdOne != null">yymd_one = #{yymdOne},</if>
+            <if test="yymdTwo != null">yymd_two = #{yymdTwo},</if>
+            <if test="zxqdllOne != null">zxqdll_one = #{zxqdllOne},</if>
+            <if test="zxqdllTwo != null">zxqdll_two = #{zxqdllTwo},</if>
+            <if test="medicineAmountOne != null">medicine_amount_one = #{medicineAmountOne},</if>
+            <if test="medicineAmountTwo != null">medicine_amount_two = #{medicineAmountTwo},</if>
+            <if test="tdbOne != null">tdb_one = #{tdbOne},</if>
+            <if test="tdbTwo != null">tdb_two = #{tdbTwo},</if>
             <if test="revision != null">revision = #{revision},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
@@ -236,14 +257,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
-    
+
 
     <delete id="deleteTXinyiMedicineParamById" parameterType="Long">
-        update t_xinyi_medicine_param set del_flag = 2,revision = revision + 1 where del_flag = 0 and id = #{id}
+        update t_xlht_medicine_param set del_flag = 2,revision = revision + 1 where del_flag = 0 and id = #{id}
     </delete>
 
     <delete id="deleteTXinyiMedicineParamByIds" parameterType="String">
-        update t_xinyi_medicine_param set del_flag = 2,revision = revision + 1 where del_flag = 0 and id in
+        update t_xlht_medicine_param set del_flag = 2,revision = revision + 1 where del_flag = 0 and id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
@@ -254,7 +275,66 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT TOP
             1 *
         FROM
-            t_xinyi_medicine_param
+            t_xlht_medicine_param
         where del_flag = 0 order by id desc
     </select>
+
+
+    <select id="selectTXinyiMedicineParamList" parameterType="TXinyiMedicineParam" resultMap="TXinyiMedicineParamResult">
+        <include refid="selectTXinyiMedicineParamVo"/>
+        <where>
+            1 = 1
+            <if test="type != null "> and type = #{type}</if>
+            <if test="jsLlTypeOne != null "> and js_ll_type_one = #{jsLlTypeOne}</if>
+            <if test="jsLlOne != null "> and js_ll_one = #{jsLlOne}</if>
+            <if test="jsLlTypeTwo != null "> and js_ll_type_two = #{jsLlTypeTwo}</if>
+            <if test="jsLlTwo != null "> and js_ll_two = #{jsLlTwo}</if>
+            <if test="jsCodTypeOne != null "> and js_cod_type_one = #{jsCodTypeOne}</if>
+            <if test="jsCodOne != null "> and js_cod_one = #{jsCodOne}</if>
+            <if test="jsCodTypeTwo != null "> and js_cod_type_two = #{jsCodTypeTwo}</if>
+            <if test="jsCodTwo != null "> and js_cod_two = #{jsCodTwo}</if>
+            <if test="hycXsyTypeOne != null "> and hyc_xsy_type_one = #{hycXsyTypeOne}</if>
+            <if test="hycXsyOne != null "> and hyc_xsy_one = #{hycXsyOne}</if>
+            <if test="hycXsyTypeTwo != null "> and hyc_xsy_type_two = #{hycXsyTypeTwo}</if>
+            <if test="hycXsyTwo != null "> and hyc_xsy_two = #{hycXsyTwo}</if>
+            <if test="qycYxyTypeOne != null "> and qyc_yxy_type_one = #{qycYxyTypeOne}</if>
+            <if test="qycYxyOne != null "> and qyc_yxy_one = #{qycYxyOne}</if>
+            <if test="qycYxyTypeTwo != null "> and qyc_yxy_type_two = #{qycYxyTypeTwo}</if>
+            <if test="qycYxyTwo != null "> and qyc_yxy_two = #{qycYxyTwo}</if>
+            <if test="qycAdTypeOne != null "> and qyc_ad_type_one = #{qycAdTypeOne}</if>
+            <if test="qycAdOne != null "> and qyc_ad_one = #{qycAdOne}</if>
+            <if test="qycAdTypeTwo != null "> and qyc_ad_type_two = #{qycAdTypeTwo}</if>
+            <if test="qycAdTwo != null "> and qyc_ad_two = #{qycAdTwo}</if>
+            <if test="jsTnTypeOne != null "> and js_tn_type_one = #{jsTnTypeOne}</if>
+            <if test="jsTnOne != null "> and js_tn_one = #{jsTnOne}</if>
+            <if test="jsTnTypeTwo != null "> and js_tn_type_two = #{jsTnTypeTwo}</if>
+            <if test="jsTnTwo != null "> and js_tn_two = #{jsTnTwo}</if>
+            <if test="htfksdOne != null "> and htfksd_one = #{htfksdOne}</if>
+            <if test="htfksdTwo != null "> and htfksd_two = #{htfksdTwo}</if>
+            <if test="jzxsOne != null "> and jzxs_one = #{jzxsOne}</if>
+            <if test="jzxsTwo != null "> and jzxs_two = #{jzxsTwo}</if>
+            <if test="xzxsOne != null "> and xzxs_one = #{xzxsOne}</if>
+            <if test="xzxsTwo != null "> and xzxs_two = #{xzxsTwo}</if>
+            <if test="kzxsOne != null "> and kzxs_one = #{kzxsOne}</if>
+            <if test="kzxsTwo != null "> and kzxs_two = #{kzxsTwo}</if>
+            <if test="slfpxsOne != null "> and slfpxs_one = #{slfpxsOne}</if>
+            <if test="slfpxsTwo != null "> and slfpxs_two = #{slfpxsTwo}</if>
+            <if test="tydlOne != null "> and tydl_one = #{tydlOne}</if>
+            <if test="tydlTwo != null "> and tydl_two = #{tydlTwo}</if>
+            <if test="zhxsOne != null "> and zhxs_one = #{zhxsOne}</if>
+            <if test="zhxsTwo != null "> and zhxs_two = #{zhxsTwo}</if>
+            <if test="sxpsOne != null "> and sxps_one = #{sxpsOne}</if>
+            <if test="sxpsTwo != null "> and sxps_two = #{sxpsTwo}</if>
+            <if test="yymdOne != null "> and yymd_one = #{yymdOne}</if>
+            <if test="yymdTwo != null "> and yymd_two = #{yymdTwo}</if>
+            <if test="zxqdllOne != null "> and zxqdll_one = #{zxqdllOne}</if>
+            <if test="zxqdllTwo != null "> and zxqdll_two = #{zxqdllTwo}</if>
+            <if test="medicineAmountOne != null "> and medicine_amount_one = #{medicineAmountOne}</if>
+            <if test="medicineAmountTwo != null "> and medicine_amount_two = #{medicineAmountTwo}</if>
+            <if test="tdbOne != null "> and tdb_one = #{tdbOne}</if>
+            <if test="tdbTwo != null "> and tdb_two = #{tdbTwo}</if>
+            <if test="revision != null "> and revision = #{revision}</if>
+        </where>
+        and del_flag = 0 order by id desc
+    </select>
 </mapper>