主程序

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

@@ -159,6 +159,11 @@ public class LisWorkController extends BaseController {
     public Result clearnotcomplete(Date jyrq, String yq,String ybh) {
         return lisWorkService.clearnotcomplete(jyrq,yq,ybh);
     }
+    @ApiOperation("清除打印标志")
+    @GetMapping("/clearprintflag")
+    public Result clearprintflag(Date jyrq, String yq,String ybh) {
+        return lisWorkService.clearprintflag(jyrq,yq,ybh);
+    }
     @ApiOperation("查看备份数据")
     @GetMapping("/viewbackup")
     public Result viewbackup(Date jyrq, String yq,String ybh) {

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

@@ -23,16 +23,12 @@ import java.util.List;
 @Slf4j
 @Api(tags = "主界面-微生物报告输入")
 public class LisWorkGermController extends BaseController {
-    @Autowired
-    private LisWorkService lisWorkService;
-    @Autowired
-    private LabResultService labResultService;
     @Autowired
     LisWorkGermService lisWorkGermService;
     @ApiOperation("获取微生物样本信息")
     @GetMapping("/sampleMedInfo")
     public Result sampleMedInfo(Date jyrq, String yq, String ybh) {
-        return lisWorkService.sampleMedInfo(jyrq, yq, ybh);
+        return lisWorkGermService.sampleMedInfo(jyrq, yq, ybh);
     }
     @ApiOperation("获取仪器ID")
     @GetMapping("/getinstrid")

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

@@ -2,12 +2,14 @@ package com.czlis.liswork.mapper;
 
 import com.czlis.common.core.domain.entity.lis.BactMediumgroupdet;
 import com.czlis.common.core.domain.entity.lis.LabGermsheetNew;
+import com.czlis.common.core.domain.entity.lis.LabResultMed;
 import com.czlis.liswork.pojo.DTO.MediumDTO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.Date;
 import java.util.List;
 public interface LisWorkGermMapper {
+    List<LabResultMed> getLabResultMedInfo(LabResultMed labResultMed);
     List<MediumDTO> getmedium(@Param("jyrq") Date jyrq, @Param("yq") String yq, @Param("ybh")String ybh);
     String getmediumno(@Param("sqh") String sqh,@Param("yblx") String yblx);
     String getmediumnox(String yblx);

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

@@ -10,7 +10,6 @@ import java.util.Map;
 
 public interface LisWorkMapper {
     List<LabPat> getLabPatList(LabPat labPat);
-    List<LabResultMed> getLabResultMedInfo(LabResultMed labResultMed);
     SysUser getSysUser(String userName);
     LabPatBk getLabPatBk(@Param("jyrq") Date jyrq, @Param("yq") String yq, @Param("ybh")String ybh);
     List<LabResultBk> getLabResultBk(@Param("jyrq") Date jyrq, @Param("yq") String yq, @Param("ybh")String ybh);

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

@@ -16,4 +16,5 @@ public interface LisWorkGermService {
     Result savemedresult(LabResultMed labResultmed);
     Result savemedresultall(List<LabResultMed> labResultmedlist);
     Result deletemedresult(LabResultMed labResultmed);
+    Result sampleMedInfo(Date jyrq, String yq, String ybh);
 }

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

@@ -16,7 +16,6 @@ public interface LisWorkService {
     List<LabPat> getSampleList(Date jyrq, String yq, Long days);
     Result getresultinfo(Date jyrq, String yq, String ybh);
     Result getLabPat(Date jyrq, String yq, String ybh);
-    Result sampleMedInfo(Date jyrq, String yq, String ybh);
     Result checkUser(String yhdh, String mm);
     Result getXmInfo(String yq);
     Result getXmVal(String yq,String xmdh);
@@ -31,4 +30,5 @@ public interface LisWorkService {
     Result viewbackup(Date jyrq, String yq,String ybh);
     Result getnoitemresult(Date jyrq, String yq,String ybh);
     Result setiteminter(Date jyrq, String yq,String ybh,String xmdh,String xmdh0);
+    Result clearprintflag(Date jyrq, String yq,String ybh);
 }

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

@@ -25,6 +25,21 @@ public class LisWorkGermServiceImpl implements LisWorkGermService {
     LisWorkGermMapper lisWorkGermMapper;
     @Autowired
     XmMedgroupMapper xmMedgroupMapper;
+    @Override
+    public Result sampleMedInfo(Date jyrq, String yq, String ybh) {
+        List<LabResult> labResultList = commonUtil.getLabResultList(jyrq, yq, ybh);
+        LabResultMed labResultMed = new LabResultMed();
+        labResultMed.setJyrq(jyrq);
+        labResultMed.setYq(yq);
+        labResultMed.setYbh(ybh);
+        List<LabResultMed> labResultMedInfoList = lisWorkGermMapper.getLabResultMedInfo(labResultMed);
+        List<Map<String, Object>> queryList = new ArrayList<>();
+        Map<String, Object> map = new HashMap<>();
+        map.put("labResultList", labResultList);
+        map.put("labResultMedInfoList", labResultMedInfoList);
+        queryList.add(map);
+        return new Result("0", "获取微生物数据成功！", queryList);
+    }
     /**
      * 保存专家评语
      * @param labResult

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

@@ -531,21 +531,7 @@ public class LisWorkServiceImpl implements LisWorkService {
         return new Result("0", "获取该样本数据成功！", labPat);
     }
 
-    @Override
+
-    public Result sampleMedInfo(Date jyrq, String yq, String ybh) {
-        List<LabResult> labResultList = commonUtil.getLabResultList(jyrq, yq, ybh);
-        LabResultMed labResultMed = new LabResultMed();
-        labResultMed.setJyrq(jyrq);
-        labResultMed.setYq(yq);
-        labResultMed.setYbh(ybh);
-        List<LabResultMed> labResultMedInfoList = lisWorkMapper.getLabResultMedInfo(labResultMed);
-        List<Map<String, Object>> queryList = new ArrayList<>();
-        Map<String, Object> map = new HashMap<>();
-        map.put("labResultList", labResultList);
-        map.put("labResultMedInfoList", labResultMedInfoList);
-        queryList.add(map);
-        return new Result("0", "获取微生物数据成功！", queryList);
-    }
 
     @Override
     public Result checkUser(String yhdh, String mm) {
@@ -616,6 +602,15 @@ public class LisWorkServiceImpl implements LisWorkService {
         return new Result("0", "成功！");
     }
     @Override
+    public Result clearprintflag(Date jyrq, String yq,String ybh){
+        String jgbz=commonUtil.getLabPatJgbz(jyrq, yq, ybh);
+        if("2".equals(jgbz)){
+            return new Result("-1", "已审核不允许修改打印标志！");
+        }
+        commonUtil.updateLabPatByColumn(jyrq, yq, ybh,"dybz","0");
+        return new Result("0", "成功！");
+    }
+    @Override
     public Result viewbackup(Date jyrq, String yq,String ybh){
         Map<String,Object> map=new HashMap<>();
         LabPatBk labPatBk=lisWorkMapper.getLabPatBk(jyrq, yq, ybh);

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

@@ -2,6 +2,13 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.czlis.liswork.mapper.LisWorkGermMapper">
+    <select id="getLabResultMedInfo" resultType="com.czlis.common.core.domain.entity.lis.LabResultMed">
+        select * from lab_resultmed where jyrq = #{jyrq} and yq = #{yq}
+        <if test="ybh != null and ybh !=''">and ybh = #{ybh}</if>
+        <if test="xmdh != null and xmdh !=''">and xmdh = #{xmdh}</if>
+        <if test="xh != null">and xh = #{xh}</if>
+        <if test="ywdh != null and ywdh != ''">and ywdh = #{ywdh}</if>
+    </select>
 
     <select id="getmedium" resultType="com.czlis.liswork.pojo.DTO.MediumDTO">
         SELECT lab_germsheet_new.jyrq,

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

@@ -62,15 +62,7 @@
             </if>
         </where>
     </select>
-    <select id="getLabResultMedInfo" resultType="com.czlis.common.core.domain.entity.lis.LabResultMed">
+     <select id="getSysUser" parameterType="String" resultMap="SysUserResult">
-        select * from lab_resultmed where jyrq = #{jyrq} and yq = #{yq}
-        <if test="ybh != null and ybh !=''">and ybh = #{ybh}</if>
-        <if test="xmdh != null and xmdh !=''">and xmdh = #{xmdh}</if>
-        <if test="xh != null">and xh = #{xh}</if>
-        <if test="ywdh != null and ywdh != ''">and ywdh = #{ywdh}</if>
-    </select>
-
-    <select id="getSysUser" parameterType="String" resultMap="SysUserResult">
         select * from sys_user
         where  user_name = #{userName} and  del_flag = '0'
     </select>