主程序

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

@@ -11,4 +11,6 @@ public interface LabResultMedMapper {
     int getLabResultMedCount(@Param("jyrq")Date jyrq, @Param("yq")String yq, @Param("ybh")String ybh);
     int delLabResultMed(@Param("jyrq")Date jyrq, @Param("yq")String yq, @Param("ybh")String ybh,@Param("xmdh")String xmdh);
     int delLabResultMedAll(@Param("jyrq")Date jyrq, @Param("yq")String yq, @Param("ybh")String ybh);
+    int insertLabResultMed(LabResultMed labResultMed);
+    int insertLabResultMedAll(List<LabResultMed> labResultMedList);
 }

lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/CommonUtil.java

@@ -342,6 +342,14 @@ public class CommonUtil {
     public void delLabResultMedAll(Date jyrq, String yq, String ybh) {
         labResultMedMapper.delLabResultMedAll(jyrq, yq, ybh);
     }
+    @Transactional(rollbackFor = Exception.class)
+    public int insertLabResultMed(LabResultMed labResultMed){
+        return labResultMedMapper.insertLabResultMed(labResultMed);
+    }
+    @Transactional(rollbackFor = Exception.class)
+    public int insertLabResultMedAll(List<LabResultMed> labResultMedList){
+        return labResultMedMapper.insertLabResultMedAll(labResultMedList);
+    }
     //封箱
     public List<LabReqpack> getLabReqpack(String packno){
         return labReqpackMapper.getLabReqpack(packno);
@@ -422,6 +430,9 @@ public class CommonUtil {
     public Integer insertComLog(ComLog comLog) {
         return comLogMapper.insertComLog(comLog);
     }
+    public List<ComLog> getComLog(ComLog comLog) {
+        return comLogMapper.getComLog(comLog);
+    }
 
     @Transactional(rollbackFor = Exception.class)
     public Integer insertLisPatlog(LisPatlog lisPatlog) {

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

@@ -38,14 +38,37 @@
     <delete id="delLabResultMed" >
         delete from lab_resultmed
         where jyrq = #{jyrq}
-          and yq = #{yq,jdbcType=CHAR}
+          and yq = #{yq}
-          and ybh = #{ybh,jdbcType=VARCHAR}
+          and ybh = #{ybh}
-          and xmdh = #{xmdh,jdbcType=VARCHAR}
+          and xmdh = #{xmdh}
     </delete>
     <delete id="delLabResultMedAll" >
         delete from lab_resultmed
         where jyrq = #{jyrq}
-          and yq = #{yq,jdbcType=CHAR}
+          and yq = #{yq}
-          and ybh = #{ybh,jdbcType=VARCHAR}
+          and ybh = #{ybh}
     </delete>
+    <insert id="insertLabResultMed" parameterType="com.czlis.common.core.domain.entity.lis.LabResultMed">
+        insert into lab_resultmed (jyrq, yq, ybh,
+                                   xmdh, xh, ywdh, mic,
+                                   rad, csjg, jgbz, bz,
+                                   txtresult)
+        values (#{jyrq}, #{yq}, #{ybh},
+                #{xmdh}, #{xh}, #{ywdh}, #{mic},
+                #{rad}, #{csjg}, #{jgbz}, #{bz},
+                #{txtresult})
+    </insert>
+    <insert id="insertLabResultMedAll" parameterType="java.util.List">
+        insert into lab_resultmed (jyrq, yq, ybh,xmdh, xh, ywdh, mic,rad, csjg, jgbz, bz,txtresult)
+        SELECT jyrq, yq, ybh,xmdh, xh, ywdh, mic,rad, csjg, jgbz, bz,txtresult
+        FROM (
+        <foreach collection="list" item="item" separator="UNION ALL">
+        SELECT #{item.jyrq}, #{item.yq}, #{item.ybh},
+                #{item.xmdh}, #{item.xh}, #{item.ywdh}, #{item.item.mic},
+                #{item.rad}, #{item.csjg}, #{item.jgbz}, #{item.bz},#{item.txtresult}
+        </foreach>
+        ) AS temp
+    </insert>
+    
+    
 </mapper>

liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkGermController.java

@@ -4,6 +4,7 @@ import com.czlis.common.core.controller.BaseController;
 import com.czlis.common.core.domain.Result;
 import com.czlis.common.core.domain.entity.lis.LabPat;
 import com.czlis.common.core.domain.entity.lis.LabResult;
+import com.czlis.common.core.domain.entity.lis.LabResultMed;
 import com.czlis.common.core.page.TableDataInfo;
 import com.czlis.liswork.service.LabResultService;
 import com.czlis.liswork.service.LisWorkGermService;
@@ -44,10 +45,35 @@ public class LisWorkGermController extends BaseController {
     public Result savetestresult(@RequestBody LabResult labResult) {
         return lisWorkGermService.saveTestResult(labResult);
     }
+    @ApiOperation("保存药敏结果")
+    @PostMapping("/savemedresult")
+    public Result savemedresult(@RequestBody LabResultMed labResultmed) {
+        return lisWorkGermService.savemedresult(labResultmed);
+    }
+    @ApiOperation("保存所有药敏结果")
+    @PostMapping("/savemedresultall")
+    public Result savemedresultall(@RequestBody List<LabResultMed> labResultmedlist) {
+        return lisWorkGermService.savemedresultall(labResultmedlist);
+    }
+    @ApiOperation("删除药敏结果")
+    @PostMapping("/deletemedresult")
+    public Result deletemedresult(@RequestBody LabResultMed labResultmed) {
+        return lisWorkGermService.deletemedresult(labResultmed);
+    }
     @ApiOperation("获取培养基记录")
     @GetMapping("/getmedium")
     public Result getmedium(Date jyrq, String yq, String ybh){
         return lisWorkGermService.getmedium(jyrq, yq, ybh);
     }
+    @ApiOperation("获取操作记录")
+    @GetMapping("/getcomlog")
+    public Result getcomlog(Date jyrq, String yq, String ybh){
+        return lisWorkGermService.getcomlog(jyrq, yq, ybh);
+    }
+    @ApiOperation("获取药敏模板")
+    @GetMapping("/getmedgroup")
+    public Result getmedgroup(String mbmc){
+        return lisWorkGermService.getmedgroup(mbmc);
+    }
 
 }

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

@@ -2,12 +2,18 @@ package com.czlis.liswork.service;
 
 import com.czlis.common.core.domain.Result;
 import com.czlis.common.core.domain.entity.lis.LabResult;
-import com.czlis.common.core.page.TableDataInfo;
+import com.czlis.common.core.domain.entity.lis.LabResultMed;
 
 import java.util.Date;
+import java.util.List;
 
 public interface LisWorkGermService {
     Result saveTestResult(LabResult labResult);
     Result getInstrid(String yq);
     Result getmedium(Date jyrq, String yq, String ybh);
+    Result getcomlog(Date jyrq, String yq, String ybh);
+    Result getmedgroup(String mbmc);
+    Result savemedresult(LabResultMed labResultmed);
+    Result savemedresultall(List<LabResultMed> labResultmedlist);
+    Result deletemedresult(LabResultMed labResultmed);
 }

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

@@ -1,13 +1,12 @@
 package com.czlis.liswork.service.impl;
 
 import com.czlis.common.core.domain.Result;
-import com.czlis.common.core.domain.entity.lis.BactMediumgroupdet;
+import com.czlis.common.core.domain.entity.lis.*;
-import com.czlis.common.core.domain.entity.lis.LabGermsheetNew;
-import com.czlis.common.core.domain.entity.lis.LabPat;
-import com.czlis.common.core.domain.entity.lis.LabResult;
 import com.czlis.common.utils.SecurityUtils;
+import com.czlis.interfaceCommon.mapper.LabResultMedMapper;
 import com.czlis.interfaceCommon.utils.CommonUtil;
 import com.czlis.liswork.mapper.LisWorkGermMapper;
+import com.czlis.liswork.mapper.xtwh.XmMedgroupMapper;
 import com.czlis.liswork.pojo.DTO.MediumDTO;
 import com.czlis.liswork.service.LisWorkGermService;
 import lombok.extern.slf4j.Slf4j;
@@ -24,6 +23,8 @@ public class LisWorkGermServiceImpl implements LisWorkGermService {
     CommonUtil commonUtil;
     @Autowired
     LisWorkGermMapper lisWorkGermMapper;
+    @Autowired
+    XmMedgroupMapper xmMedgroupMapper;
     /**
      * 保存专家评语
      * @param labResult
@@ -138,5 +139,38 @@ public class LisWorkGermServiceImpl implements LisWorkGermService {
         if(bm==null||"".equals(bm))return null;
         return "EJBG"+bm;
     }
-
+    @Override
+    public  Result getcomlog(Date jyrq, String yq, String ybh){
+        ComLog comLog=new ComLog();
+        comLog.setJyrq(jyrq);
+        comLog.setYq(yq);
+        comLog.setYbh(ybh);
+        List<ComLog> comLoglist=commonUtil.getComLog(comLog);
+        return new Result("0","成功",comLoglist);
+    }
+    @Override
+    public Result getmedgroup(String mbmc){
+        XmMedgroup xmMedgroup=new XmMedgroup();
+        xmMedgroup.setYwzmc(mbmc);
+        return new Result("0","成功",xmMedgroupMapper.query(xmMedgroup));
+    }
+    @Override
+    public Result savemedresult(LabResultMed labResultmed) {
+        commonUtil.insertLabResultMed(labResultmed);
+        return new Result("0","成功");
+    }
+    @Override
+    public Result savemedresultall(List<LabResultMed> labResultmedlist){
+        commonUtil.insertLabResultMedAll(labResultmedlist);
+        return new Result("0","成功");
+    }
+    @Override
+    public Result deletemedresult(LabResultMed labResultmed) {
+        Date jyrq=labResultmed.getJyrq();
+        String yq=labResultmed.getYq();
+        String ybh=labResultmed.getYbh();
+        String xmdh=labResultmed.getXmdh();
+        commonUtil.delLabResultMed(jyrq,yq,ybh,xmdh);
+        return new Result("0","成功");
+    }
 }