diff --git a/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkController.java b/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkController.java index f64f8ca..a8115b3 100644 --- a/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkController.java +++ b/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) { diff --git a/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkGermController.java b/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkGermController.java index 40f1a66..3ac9c47 100644 --- a/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkGermController.java +++ b/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") diff --git a/liswork/src/main/java/com/czlis/liswork/mapper/LisWorkGermMapper.java b/liswork/src/main/java/com/czlis/liswork/mapper/LisWorkGermMapper.java index e8f9ec8..9fad69d 100644 --- a/liswork/src/main/java/com/czlis/liswork/mapper/LisWorkGermMapper.java +++ b/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 getLabResultMedInfo(LabResultMed labResultMed); List 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); diff --git a/liswork/src/main/java/com/czlis/liswork/mapper/LisWorkMapper.java b/liswork/src/main/java/com/czlis/liswork/mapper/LisWorkMapper.java index 3058cb2..21495fe 100644 --- a/liswork/src/main/java/com/czlis/liswork/mapper/LisWorkMapper.java +++ b/liswork/src/main/java/com/czlis/liswork/mapper/LisWorkMapper.java @@ -10,7 +10,6 @@ import java.util.Map; public interface LisWorkMapper { List getLabPatList(LabPat labPat); - List getLabResultMedInfo(LabResultMed labResultMed); SysUser getSysUser(String userName); LabPatBk getLabPatBk(@Param("jyrq") Date jyrq, @Param("yq") String yq, @Param("ybh")String ybh); List getLabResultBk(@Param("jyrq") Date jyrq, @Param("yq") String yq, @Param("ybh")String ybh); diff --git a/liswork/src/main/java/com/czlis/liswork/service/LisWorkGermService.java b/liswork/src/main/java/com/czlis/liswork/service/LisWorkGermService.java index 929447e..8c3bd96 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/LisWorkGermService.java +++ b/liswork/src/main/java/com/czlis/liswork/service/LisWorkGermService.java @@ -16,4 +16,5 @@ public interface LisWorkGermService { Result savemedresult(LabResultMed labResultmed); Result savemedresultall(List labResultmedlist); Result deletemedresult(LabResultMed labResultmed); + Result sampleMedInfo(Date jyrq, String yq, String ybh); } diff --git a/liswork/src/main/java/com/czlis/liswork/service/LisWorkService.java b/liswork/src/main/java/com/czlis/liswork/service/LisWorkService.java index 7b690ff..ac47c27 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/LisWorkService.java +++ b/liswork/src/main/java/com/czlis/liswork/service/LisWorkService.java @@ -16,7 +16,6 @@ public interface LisWorkService { List 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); } diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkGermServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkGermServiceImpl.java index d0f45fa..fdce515 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkGermServiceImpl.java +++ b/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 labResultList = commonUtil.getLabResultList(jyrq, yq, ybh); + LabResultMed labResultMed = new LabResultMed(); + labResultMed.setJyrq(jyrq); + labResultMed.setYq(yq); + labResultMed.setYbh(ybh); + List labResultMedInfoList = lisWorkGermMapper.getLabResultMedInfo(labResultMed); + List> queryList = new ArrayList<>(); + Map map = new HashMap<>(); + map.put("labResultList", labResultList); + map.put("labResultMedInfoList", labResultMedInfoList); + queryList.add(map); + return new Result("0", "获取微生物数据成功！", queryList); + } /** * 保存专家评语 * @param labResult diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkServiceImpl.java index 162be34..653a7b2 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkServiceImpl.java +++ b/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 labResultList = commonUtil.getLabResultList(jyrq, yq, ybh); - LabResultMed labResultMed = new LabResultMed(); - labResultMed.setJyrq(jyrq); - labResultMed.setYq(yq); - labResultMed.setYbh(ybh); - List labResultMedInfoList = lisWorkMapper.getLabResultMedInfo(labResultMed); - List> queryList = new ArrayList<>(); - Map 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 map=new HashMap<>(); LabPatBk labPatBk=lisWorkMapper.getLabPatBk(jyrq, yq, ybh); diff --git a/liswork/src/main/resources/mapper/LisWorkGermMapper.xml b/liswork/src/main/resources/mapper/LisWorkGermMapper.xml index 5b4d456..e5e4347 100644 --- a/liswork/src/main/resources/mapper/LisWorkGermMapper.xml +++ b/liswork/src/main/resources/mapper/LisWorkGermMapper.xml @@ -2,6 +2,13 @@ + - - - select * from sys_user where user_name = #{userName} and del_flag = '0'