条码类别维护

liswork/src/main/java/com/czlis/liswork/mapper/LisWorkMapper.java

@@ -23,5 +23,5 @@ public interface LisWorkMapper {
     List<LabResult> getLabResult(LabResult labResult);
     List<LabPatInfo> getLabPatInfo(LabPatInfo labPatInfo);
     List<LabResultMed> getLabResultMedInfo(LabResultMed labResultMed);
-    SysUser getSysUser(String userId, String mm);
+    SysUser getSysUser(@Param("userId") String userId,@Param("mm") String mm);
 }

liswork/src/main/java/com/czlis/liswork/mapper/LisWorkPageInfoMapper.java

@@ -5,17 +5,18 @@ import com.czlis.common.core.domain.entity.lis.LabGraph;
 import com.czlis.common.core.domain.entity.lis.LabGraphUnit;
 import com.czlis.common.core.domain.entity.lis.LabOldGraph;
 import com.czlis.common.core.domain.entity.lis.LabResultRe;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
 public interface LisWorkPageInfoMapper {
-    List<LabGraph> getLabGraphList(Date jyrq,String yq,String ybh);
+    List<LabGraph> getLabGraphList(@Param("jyrq") Date jyrq,@Param("yq") String yq,@Param("ybh") String ybh);
-    List<LabOldGraph> getLabOldGraphList(Date jyrq,String yq,String ybh);
+    List<LabOldGraph> getLabOldGraphList(@Param("jyrq") Date jyrq,@Param("yq") String yq,@Param("ybh") String ybh);
-    List<LabGraphUnit> getLabGraphUnitList(String yq,String txmc);
+    List<LabGraphUnit> getLabGraphUnitList(@Param("yq") String yq,@Param("txmc") String txmc);
-    List<LabResultRe> getRedo(Date jyrq, String yq, String ybh);
+    List<LabResultRe> getRedo(@Param("jyrq") Date jyrq,@Param("yq") String yq,@Param("ybh") String ybh);
     List<Map<String,Object>> getReqdetail(String sqh);
-    List<Map<String, Object>> getOtherinstr(Date dayStart, DateTime dayEnd, String brdh, String brxm);
+    List<Map<String, Object>> getOtherinstr(@Param("dayStart") Date dayStart,@Param("dayEnd") DateTime dayEnd,@Param("brdh") String brdh,@Param("brxm") String brxm);
-    List<Map<String, Object>> getReqInfo(Date jyrq, String yq, String ybh);
+    List<Map<String, Object>> getReqInfo(@Param("jyrq") Date jyrq,@Param("yq") String yq,@Param("ybh") String ybh);
 }

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

@@ -1,11 +1,12 @@
 package com.czlis.liswork.mapper.dict;
 
 import com.czlis.common.core.domain.entity.lis.*;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
 public interface ReportItemMapper {
-    List<XmInfoNew> query(String xmid, String yq, String xmdh);
+    List<XmInfoNew> query(@Param("xmid") String xmid,@Param("yq") String yq,@Param("xmdh") String xmdh);
     void addXmInfoNew(XmInfoNew xmInfoNew);
     void addXmDoubleRow(XmDouble xmDoubleRow);
     void addXmInterRow(XmInter xmInterRow);
@@ -14,7 +15,7 @@ public interface ReportItemMapper {
     void addXmTextResultRow(XmTextResult xmTextResultRow);
 
     void deleteXmInfoNew(Integer xmid);
-    void deleteXmDouble(String yq, String xmdh);
+    void deleteXmDouble(@Param("yq") String yq,@Param("xmdh") String xmdh);
     void deleteXmInter(Integer xmid);
     void deleteXmTextResult(Integer xmid);
     void deleteXmRef(Integer xmid);

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

@@ -1,12 +1,13 @@
 package com.czlis.liswork.mapper.dict;
 
 import com.czlis.common.core.domain.entity.lis.XmFeeInstr;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
 public interface XmFeeInstrMapper {
-    List<XmFeeInstr> query(String yq, String sfxmdh);
+    List<XmFeeInstr> query(@Param("yq") String yq,@Param("sfxmdh") String sfxmdh);
     void add(XmFeeInstr xmFeeInstr);
     void update(XmFeeInstr xmFeeInstr);
-    void delete(String yq, String sfxmdh);
+    void delete(@Param("yq") String yq,@Param("sfxmdh") String sfxmdh);
 }

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

@@ -1,13 +1,14 @@
 package com.czlis.liswork.mapper.dict;
 
 import com.czlis.common.core.domain.entity.lis.XmReqitemVsReportitem;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
 public interface XmReqitemVsReportitemMapper {
     List<XmReqitemVsReportitem> query(XmReqitemVsReportitem xmReqitemVsReportitem);
     void add(XmReqitemVsReportitem xmReqitemVsReportitem);
-    void delete(String sqxmdh, String yq, String xmdh, String tdh);
+    void delete(@Param("sqxmdh") String sqxmdh,@Param("yq") String yq,@Param("xmdh") String xmdh,@Param("tdh") String tdh);
     void update(XmReqitemVsReportitem xmReqitemVsReportitem);
 
 }

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

@@ -56,8 +56,8 @@ public class FeeitemClassController extends BaseController {
 
     @ApiOperation("删除条码类别")
     @DeleteMapping("/del")
-    public Result delete(String sfxmdh){
+    public Result delete(String sflbdh){
-        return feeitemClassService.delete(sfxmdh);
+        return feeitemClassService.delete(sflbdh);
     }
 
 

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

@@ -28,10 +28,9 @@ public class RptgetRuleController extends BaseController {
 
     @ApiOperation("查询报告领取规则列表")
     @GetMapping("/query")
-    public TableDataInfo query(LabRptgetRule rule) {
+    public Result query(LabRptgetRule rule) {
-        startPage();
         List<LabRptgetRule> labRptgetRuleList = rptgetRuleService.query(rule);
-        return getDataTable(labRptgetRuleList);
+        return new Result("0","获取成功！",labRptgetRuleList);
     }
 
     @ApiOperation("根据代号查询报告领取规则明细")

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

@@ -1,11 +1,12 @@
 package com.czlis.mzcx.mapper;
 
 import com.czlis.common.core.domain.entity.lis.LabFeeitemClass;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
 public interface FeeitemClassMapper {
-    List<LabFeeitemClass> query(String sflbdh,String sflbmc);
+    List<LabFeeitemClass> query(@Param("sflbdh") String sflbdh,@Param("sflbmc") String sflbmc);
 
     void add(LabFeeitemClass labFeeitemClass);
 

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

@@ -1,11 +1,12 @@
 package com.czlis.mzcx.mapper;
 
 import com.czlis.common.core.domain.entity.lis.XmFee;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
 public interface XmFeeMapper {
-    List<XmFee> query(String sfxmdh, String yljg, String xmlb);
+    List<XmFee> query(@Param("sfxmdh") String sfxmdh,@Param("yljg") String yljg,@Param("xmlb") String xmlb);
 
     void add(XmFee xmFee);
 

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

@@ -18,7 +18,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="sflbjc != null and sflbjc != ''">sflbjc,</if>
         <if test="bkcolor != null">bkcolor,</if>
         <if test="bglqdh != null">bglqdh,</if>
-        <if test="sflbmc != null and sflbmc != ''">sflbmc,</if>
         <if test="yblx != null and yblx != ''">yblx,</if>
         <if test="txmlb != null and txmlb != ''">txmlb,</if>
         <if test="sampletips != null and sampletips != ''">sampletips,</if>
@@ -38,7 +37,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="sflbjc != null and sflbjc != ''">#{sflbjc},</if>
         <if test="bkcolor != null">#{bkcolor},</if>
         <if test="bglqdh != null">#{bglqdh},</if>
-        <if test="sflbmc != null and sflbmc != ''">#{bglqdh},</if>
         <if test="yblx != null and yblx != ''">#{yblx},</if>
         <if test="txmlb != null and txmlb != ''">#{txmlb},</if>
         <if test="sampletips != null and sampletips != ''">#{sampletips},</if>
@@ -58,13 +56,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <update id="update" parameterType="com.czlis.common.core.domain.entity.lis.LabFeeitemClass">
-        update LabFeeitemClass
+        update lab_feeitemclass
         <set>
             <if test="sflbmc != null and sflbmc != ''">sflbmc = #{sflbmc},</if>
             <if test="sflbjc != null and sflbjc != ''">sflbjc = #{sflbjc},</if>
             <if test="bkcolor != null">bkcolor = #{bkcolor},</if>
             <if test="bglqdh != null">bglqdh = #{bglqdh},</if>
-            <if test="sflbmc != null and sflbmc != ''">bglqdh = #{bglqdh},</if>
             <if test="yblx != null and yblx != ''">yblx = #{yblx},</if>
             <if test="txmlb != null and txmlb != ''">txmlb = #{txmlb},</if>
             <if test="sampletips != null and sampletips != ''">sampletips = #{sampletips},</if>
@@ -83,7 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="delete" parameterType="string">
-        delete from LabFeeitemClass where sflbdh = #{sflbdh}
+        delete from lab_feeitemclass where sflbdh = #{sflbdh}
     </delete>
 
     <select id="getLabFeeitemVsClassCount" resultType="Long">