模版界面，审核条件界面

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

@@ -15,5 +15,7 @@ public class LabInputmdl {
     private Integer qsybh;
     private Integer jsybh;
     private String yblx;
+    private String oldMbmc;
+
 
 }

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

@@ -14,4 +14,5 @@ public class LabInputmdlDetail {
     private String xmdh;
     private String mrz;
     private String xmmc;
+    private String oldMbmc;
 }

lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/constants/SysLogConstants.java

@@ -29,5 +29,5 @@ public class SysLogConstants {
     public static final String XMMEDINSTR_LOG = "抗生素通道号设定";
     public static final String XMMEDMAIN_LOG = "细菌抗生素组对照";
     public static final String XMKNOWLEDGE_LOG = "知识库";
-
+    public static final String LABCHECKRULES_LOG = "高级审核条件";
 }

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

@@ -1,5 +1,6 @@
 package com.czlis.interfaceCommon.mapper;
 
+import com.czlis.common.core.domain.Result;
 import com.czlis.common.core.domain.entity.lis.LabCheckrules;
 
 import java.util.List;
@@ -18,4 +19,12 @@ public interface LabCheckrulesMapper {
      * @return
      */
     List<LabCheckrules> getLabCheckrulesAutocheck(String yq);
+
+    void insert(LabCheckrules labCheckrules);
+
+    void update(LabCheckrules labCheckrules);
+
+    List<LabCheckrules> query(LabCheckrules labCheckrules);
+
+    void delete(int ruleid);
 }

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

@@ -12,4 +12,44 @@
         FROM lab_checkrules where (isnull(autocheck,'') = '1')  and rptunitid = #{yq}
     </select>
 
+    <select id="query" resultType="com.czlis.common.core.domain.entity.lis.LabCheckrules">
+        select * from lab_checkrules
+        <where>
+            <if test="ruleid != null">and ruleid = #{ruleid}</if>
+            <if test="rptunitid != null and rptunitid != ''">and rptunitid = #{rptunitid}</if>
+            <if test="checktype != null and checktype != ''">and checktype = #{checktype}</if>
+            <if test="logflag != null and logflag != ''">and logflag = #{logflag}</if>
+            <if test="autocheck != null and autocheck != ''">and autocheck = #{autocheck}</if>
+            <if test="actions != null and actions != ''">and actions = #{actions}</if>
+        </where>
+
+    </select>
+
+    <insert id="insert">
+        insert into lab_checkrules(
+        <if test="autocheck != null and autocheck != ''">autocheck,</if>
+        rptunitid, checkrules, checktype, logflag, logcontent, ruledisplay, actions)
+        values(
+        <if test="autocheck != null and autocheck != ''">#{autocheck},</if>
+           #{rptunitid}, #{checkrules},#{checktype},#{logflag},#{logcontent},#{ruledisplay},#{actions}
+        )
+    </insert>
+
+    <update id="update">
+        update lab_checkrules set
+        <if test="checkrules != null and checkrules != ''">checkrules = #{checkrules},</if>
+        <if test="checktype != null and checktype != ''">checktype = #{checktype},</if>
+        <if test="logflag != null and logflag != ''">logflag = #{logflag},</if>
+        <if test="logcontent != null and logcontent != ''">logcontent = #{logcontent},</if>
+        <if test="ruledisplay != null and ruledisplay != ''">ruledisplay = #{ruledisplay},</if>
+        <if test="actions != null and actions != ''">actions = #{actions},</if>
+        <if test="autocheck != null and autocheck != ''">autocheck = #{autocheck},</if>
+        rptunitid = #{rptunitid}
+        where ruleid = #{ruleid}
+    </update>
+
+    <delete id="delete">
+        delete from lab_checkrules where ruleid = #{ruleid}
+    </delete>
+
 </mapper>

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

@@ -7,7 +7,7 @@
         select * from lab_inputmdl
         <where>
             <if test="yq != null and yq !=''"> and yq = #{yq}</if>
-            <if test="mbmc != null and mbmc !=''"> and mbmc = #{mbmc}</if>
+            <if test="mbmc != null and mbmc !=''"> and mbmc like '%'+#{mbmc}+'%'</if>
         </where>
     </select>
 
@@ -40,7 +40,6 @@
     <update id="update">
         update lab_inputmdl
         <set>
-            <if test="mbmc != null and mbmc != ''"> mbmc = #{mbmc},</if>
             <if test="srbh != null"> srbh = #{srbh},</if>
             <if test="zdsr != null and zdsr != ''"> zdsr = #{zdsr},</if>
             <if test="qsybh != null "> qsybh = #{qsybh},</if>
@@ -48,7 +47,7 @@
             <if test="yblx != null and yblx != ''"> yblx = #{yblx},</if>
         yq = #{yq},mbmc = #{mbmc}
         </set>
-        where yq = #{yq},mbmc = #{mbmc}
+        where yq = #{yq} and mbmc = #{oldMbmc}
     </update>
 
     <update id="updateDetail">
@@ -58,7 +57,7 @@
             <if test="mrz != null and mrz != ''">mrz = #{mrz},</if>
             yq = #{yq},mbmc = #{mbmc},xh=#{xh}
         </set>
-        where yq = #{yq},mbmc = #{mbmc},xh=#{xh}
+        where yq = #{yq} and mbmc = #{oldMbmc} and xh=#{xh}
     </update>
 
     <delete id="delete">
@@ -66,7 +65,8 @@
     </delete>
 
     <delete id="deleteDetail">
-        delete from lab_inputmdldetail where yq = #{yq} and mbmc = #{mbmc} and xh = #{xh}
+        delete from lab_inputmdldetail where yq = #{yq} and mbmc = #{mbmc}
+        <if test="xh != null"> and xh = #{xh}</if>
     </delete>
 
     <select id="getLabInputmdl" resultType="com.czlis.common.core.domain.entity.lis.LabInputmdl">

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

@@ -1,15 +1,18 @@
 package com.czlis.liswork.controller.xtwh;
 
+import com.czlis.common.annotation.Log;
 import com.czlis.common.core.domain.Result;
 import com.czlis.common.core.domain.entity.lis.LabCheckrules;
+import com.czlis.common.enums.BusinessType;
+import com.czlis.interfaceCommon.constants.SysLogConstants;
 import com.czlis.liswork.service.LabCheckrulesService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestMapping;
+
-import org.springframework.web.bind.annotation.RestController;
+import java.util.List;
 
 @Api(tags = "高级审核条件")
 @RestController
@@ -20,9 +23,24 @@ public class LabCheckrulesController {
     @Autowired
     private LabCheckrulesService labCheckrulesService;
 
-    @ApiOperation("获取报告列表")
+    @ApiOperation("获取审核条件列表")
     @GetMapping("/queryList")
     public Result queryList(LabCheckrules labCheckrules) {
         return labCheckrulesService.queryList(labCheckrules);
     }
+
+
+    @Log(title = SysLogConstants.LABCHECKRULES_LOG,businessType = BusinessType.UPDATE)
+    @ApiOperation("保存高级审核条件")
+    @PostMapping("/update")
+    public Result update(@RequestBody List<LabCheckrules> labCheckrulesList){
+        return  labCheckrulesService.update(labCheckrulesList);
+    }
+
+    @Log(title = SysLogConstants.LABCHECKRULES_LOG,businessType = BusinessType.DELETE)
+    @GetMapping("/delete")
+    @ApiOperation("删除高级审核条件")
+    public Result delete(int id){
+        return labCheckrulesService.delete(id);
+    }
 }

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

@@ -61,8 +61,8 @@ public class LabInputmdlController {
 
     @Log(title = SysLogConstants.LABINPUTMDL_LOG,businessType = BusinessType.DELETE_DETAIL)
     @ApiOperation("删除明细数据")
-    @GetMapping("/deleteDetail")
+    @PostMapping("/deleteDetail")
-    public Result deleteDetail(List<LabInputmdlDetail> labInputmdlDetailList){
+    public Result deleteDetail(@RequestBody List<LabInputmdlDetail> labInputmdlDetailList){
         return labInputmdlService.deleteDetail(labInputmdlDetailList);
     }
 

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

@@ -3,6 +3,12 @@ package com.czlis.liswork.service;
 import com.czlis.common.core.domain.Result;
 import com.czlis.common.core.domain.entity.lis.LabCheckrules;
 
+import java.util.List;
+
 public interface LabCheckrulesService {
     Result queryList(LabCheckrules labCheckrules);
+
+    Result update(List<LabCheckrules> labCheckrulesList);
+
+    Result delete(int id);
 }

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

@@ -8,6 +8,11 @@ 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 LabCheckrulesServiceImpl implements LabCheckrulesService {
@@ -17,6 +22,26 @@ public class LabCheckrulesServiceImpl implements LabCheckrulesService {
 
     @Override
     public Result queryList(LabCheckrules labCheckrules) {
-        return null;
+        List<LabCheckrules> labCheckrulesList = labCheckrulesMapper.query(labCheckrules);
+        return new Result("0","获取数据成功！",labCheckrulesList);
+    }
+
+    @Override
+    public Result update(List<LabCheckrules> labCheckrulesList) {
+        for (LabCheckrules labCheckrules : labCheckrulesList) {
+            LabCheckrules labCheckrules1 = new LabCheckrules();
+            if(labCheckrules.getRuleid() == null){
+                labCheckrulesMapper.insert(labCheckrules);
+            }else{
+                labCheckrulesMapper.update(labCheckrules);
+            }
+        }
+        return new Result("0","保存数据成功！");
+    }
+
+    @Override
+    public Result delete(int id) {
+        labCheckrulesMapper.delete(id);
+        return new Result("0","删除成功！");
     }
 }

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

@@ -46,7 +46,13 @@ public class LabInputmdlServiceImpl implements LabInputmdlService {
         labInputmdlMapper.update(labInputmdlDTO.getLabInputmdl());
         List<LabInputmdlDetail> labInputmdlDetailList = labInputmdlDTO.getLabInputmdlDetailList();
         for (LabInputmdlDetail labInputmdlDetail : labInputmdlDetailList) {
+            List<LabInputmdlDetail> labInputmdlDetailList1 = labInputmdlMapper.queryDetail(labInputmdlDetail);
+            if(labInputmdlDetailList1.size() > 0){
                 labInputmdlMapper.updateDetail(labInputmdlDetail);
+            }else{
+                labInputmdlMapper.addDetail(labInputmdlDetail);
+            }
+
         }
         return new Result("0","修改数据成功！");
     }
@@ -66,6 +72,7 @@ public class LabInputmdlServiceImpl implements LabInputmdlService {
     @Override
     public Result deleteDetail(List<LabInputmdlDetail> labInputmdlDetailList) {
         for (LabInputmdlDetail labInputmdlDetail : labInputmdlDetailList) {
+            if(labInputmdlDetail.getXh() == null) return new Result("-1","序号不能为空！");
             labInputmdlMapper.deleteDetail(labInputmdlDetail);
         }
         return new Result("0","删除明细成功！");