微生物模块

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

@@ -3,11 +3,9 @@ package com.czlis.liswork.controller.work;
 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.LabPat;
+import com.czlis.common.core.domain.entity.lis.*;
-import com.czlis.common.core.domain.entity.lis.LabResult;
-import com.czlis.common.core.domain.entity.lis.LabResultMed;
-import com.czlis.common.core.domain.entity.lis.XmMed;
 import com.czlis.common.core.page.TableDataInfo;
+import com.czlis.common.core.text.Convert;
 import com.czlis.common.enums.BusinessType;
 import com.czlis.interfaceCommon.constants.SysLogConstants;
 import com.czlis.liswork.mapper.LisWorkGermMapper;
@@ -109,6 +107,33 @@ public class LisWorkGermController extends BaseController {
     public Result getmedium(Date jyrq, String yq, String ybh){
         return lisWorkGermService.getmedium(jyrq, yq, ybh);
     }
+    @ApiOperation("新增培养基")
+    @PostMapping("/insertmedium")
+    public Result insertmedium(@RequestBody LabGermsheetNew labGermsheet){
+        return lisWorkGermService.insertmediumnew(labGermsheet);
+    }
+    @ApiOperation("修改培养基")
+    @PostMapping("/updatemedium")
+    public Result updatemedium(@RequestBody LabGermsheetNew labGermsheet){
+        return lisWorkGermService.updatemediumnew(labGermsheet);
+    }
+    @ApiOperation("保存培养基")
+    @PostMapping("/savemedium")
+    public Result savemedium(@RequestBody List<LabGermsheetNew> labGermsheetlist){
+        return lisWorkGermService.savemedium(labGermsheetlist);
+    }
+    @ApiOperation("删除培养基")
+    @DeleteMapping("/deletemedium/{gsids}")
+    public Result deletemedium(@PathVariable String gsids){
+        Long[] userIdArray = Convert.toLongArray(gsids);
+        return lisWorkGermService.deletemediumlist(userIdArray);
+    }
+    @ApiOperation("删除培养基#")
+    @DeleteMapping("/deletemedium")
+    public Result deletemediums(@RequestBody List<Long> gsid){
+        Long[] userIdArray = gsid.toArray(new Long[0]);
+        return lisWorkGermService.deletemediumlist(userIdArray);
+    }
     @ApiOperation("获取操作记录")
     @GetMapping("/getcomlog")
     public Result getcomlog(Date jyrq, String yq, String ybh){

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

@@ -17,6 +17,9 @@ public interface LisWorkGermMapper {
     String getmediumnox(String yblx);
     List<BactMediumgroupdet> getBactMediumgroupdet(String mediumno);
     int insertmedium(LabGermsheetNew labGermsheetNew);
+    int deletemedium(Long gsid);
+    int deletemediums(Long[] gsids);
+    int updatemedium(LabGermsheetNew labGermsheetNew);
     List<XmMedDetail> getXmMedDetailNew(@Param("yq") String yq,@Param("xmdh") String xmdh,@Param("ywdh") String ywdh);
     List<XmMedDetail> getXmMedDetail(@Param("yq") String yq,@Param("xmdh") String xmdh,@Param("ywdh") String ywdh);
     String getXmMedDetailBZ(@Param("yq") String yq,@Param("xmdh") String xmdh);

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

@@ -1,6 +1,7 @@
 package com.czlis.liswork.service;
 
 import com.czlis.common.core.domain.Result;
+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.core.domain.entity.lis.LabResultMed;
@@ -13,6 +14,11 @@ public interface LisWorkGermService {
     Result getresultinfo(Date jyrq, String yq, String ybh);
     Result getInstrid(String yq);
     Result getmedium(Date jyrq, String yq, String ybh);
+    Result savemedium(List<LabGermsheetNew> labGermsheetlist);
+    Result insertmediumnew(LabGermsheetNew labGermsheet);
+    Result updatemediumnew(LabGermsheetNew labGermsheet);
+    Result deletemediumnew(Long gsid);
+    Result deletemediumlist(Long[] gsids);
     Result getcomlog(Date jyrq, String yq, String ybh);
     Result savemedresult(LabResultMed labResultmed);
     Result savemedresultall(List<LabResultMed> labResultmedlist);

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

@@ -154,10 +154,55 @@ public class LisWorkGermServiceImpl implements LisWorkGermService {
     private List<BactMediumgroupdet> getmediumgroup(String mediumno){
         return lisWorkGermMapper.getBactMediumgroupdet(mediumno);
     }
+
+    @Override
+    public Result insertmediumnew(LabGermsheetNew labGermsheet){
+        insertmedium(labGermsheet);
+        return new Result("0","成功");
+    }
     @Transactional(rollbackFor = Exception.class)
     public void insertmedium(LabGermsheetNew labGermsheet){
         lisWorkGermMapper.insertmedium(labGermsheet);
     }
+    @Transactional(rollbackFor = Exception.class)
+    public void deletemedium(Long gsid){
+        lisWorkGermMapper.deletemedium(gsid);
+    }
+    @Transactional(rollbackFor = Exception.class)
+    public void deletemediums(Long[] gsids){
+        lisWorkGermMapper.deletemediums(gsids);
+    }
+    @Transactional(rollbackFor = Exception.class)
+    public void updatemedium(LabGermsheetNew labGermsheet){
+        lisWorkGermMapper.updatemedium(labGermsheet);
+    }
+    @Override
+    public Result deletemediumnew(Long gsid){
+        deletemedium(gsid);
+        return new Result("0","成功");
+    }
+    @Override
+    public Result deletemediumlist(Long[] gsids){
+        deletemediums(gsids);
+        return new Result("0","成功");
+    }
+    @Override
+    public Result updatemediumnew(LabGermsheetNew labGermsheet){
+        updatemedium(labGermsheet);
+        return new Result("0","成功");
+    }
+    @Override
+    public Result savemedium(List<LabGermsheetNew> labGermsheetlist){
+        for(LabGermsheetNew labGermsheet : labGermsheetlist) {
+            Integer gsid=labGermsheet.getGsid();
+            if(gsid!=null){
+                updatemedium(labGermsheet);
+            }else{
+                insertmedium(labGermsheet);
+            }
+        }
+        return new Result("0","成功");
+    }
     /**初级报告仪器ID**/
     private  String getFirstInstrid(String yq){
         if(yq==null)return null;

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

@@ -46,7 +46,8 @@
         </where>
     </select>
     <select id="getmedium" resultType="com.czlis.liswork.pojo.DTO.MediumDTO">
-        SELECT lab_germsheet_new.jyrq,
+        SELECT lab_germsheet_new.gsid,
+            lab_germsheet_new.jyrq,
                lab_germsheet_new.yq,
                lab_germsheet_new.ybh,
                lab_germsheet_new.mediumno,
@@ -75,9 +76,43 @@
         SELECT * FROM bact_mediumgroupdet WHERE mediumgroupno = #{mediumno}
     </select>
     <insert id="insertmedium" parameterType="com.czlis.common.core.domain.entity.lis.LabGermsheetNew">
-        insert into lab_germsheet_new (jyrq, yq, ybh,mediumno,sheetdate,sheetuser,medium)
+        insert into lab_germsheet_new (jyrq, yq,
-        values (#{jyrq},#{yq},#{ybh},#{mediumno},#{sheetdate},#{sheetuser},#{medium})
+                                       ybh, mediumno, sheetdate,
+                                       sheetuser, medium, condtions,
+                                       smear, dyeing, colonyresult,
+                                       colonynum, otherresult)
+        values (#{jyrq}, #{yq},
+                #{ybh}, #{mediumno}, #{sheetdate},
+                #{sheetuser}, #{medium}, #{condtions},
+                #{smear}, #{dyeing}, #{colonyresult},
+                #{colonynum}, #{otherresult})
     </insert>
+    <update id="updatemedium" parameterType="com.czlis.common.core.domain.entity.lis.LabGermsheetNew">
+        update lab_germsheet_new
+        set jyrq = #{jyrq},
+            yq = #{yq},
+            ybh = #{ybh},
+            mediumno = #{mediumno},
+            sheetdate = #{sheetdate},
+            sheetuser = #{sheetuser},
+            medium = #{medium},
+            condtions = #{condtions},
+            smear = #{smear},
+            dyeing = #{dyeing},
+            colonyresult = #{colonyresult},
+            colonynum = #{colonynum},
+            otherresult = #{otherresult}
+        where gsid = #{gsid}
+    </update>
+    <delete id="deletemedium" parameterType="Long">
+        delete from lab_germsheet_new where gsid = #{gsid}
+    </delete>
+    <delete id="deletemediums" parameterType="Long[]">
+        DELETE FROM lab_germsheet_new WHERE gsid IN
+        <foreach collection="array" item="gsid" open="(" separator="," close=")">
+            #{gsid}
+        </foreach>
+    </delete>
     <select id="getXmMedDetail" resultType="com.czlis.common.core.domain.entity.lis.XmMedDetail">
         SELECT * FROM xm_meddetail
         where ywzmc = '细菌' and yq = #{yq} and xmdh = #{xmdh}