diff --git a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/LabResultReMapper.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/LabResultReMapper.java new file mode 100644 index 0000000..9af64ae --- /dev/null +++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/LabResultReMapper.java @@ -0,0 +1,16 @@ +package com.czlis.interfaceCommon.mapper; + +import org.apache.ibatis.annotations.Param; +import com.czlis.common.core.domain.entity.lis.LabResultRe; +import java.util.Date; +import java.util.List; + +public interface LabResultReMapper { + List getLabResultRe(@Param("jyrq") Date jyrq, @Param("yq") String yq, @Param("ybh") String ybh, @Param("xmdh") String xmdh); + List getLabResultReAll(@Param("jyrq") Date jyrq, @Param("yq") String yq, @Param("ybh") String ybh); + int insertLabResultRe(LabResultRe labResultRe); + int updateLabResultRe(LabResultRe labResultRe); + + + +} diff --git a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/LisWorkUtils.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/LisWorkUtils.java index 06cfd86..f5614c9 100644 --- a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/LisWorkUtils.java +++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/LisWorkUtils.java @@ -1729,6 +1729,13 @@ public class LisWorkUtils { String xmdh = labResult.getXmdh(); if ("".equals(xmdh) || xmdh == null) return new Result("-1", "项目代号不能为空!"); LabPat labPat = commonUtil.getLabPatOne(jyrq, yq, ybh); + if(labPat==null){ + labPat=new LabPat(); + labPat.setJyrq(jyrq); + labPat.setYbh(ybh); + labPat.setYq(yq); + labPat.setJgbz("0"); + } if ("2".equals(labPat.getJgbz())) return new Result("-1", "结果已审核禁止修改!"); if ("5".equals(labPat.getJgbz())) return new Result("-1", "结果已锁定禁止修改!"); if ("1".equals(labPat.getJgbz())) return new Result("-1", "结果已初审禁止修改!"); diff --git a/lis-interfaceCommon/src/main/resources/mapper/LabResultReMapper.xml b/lis-interfaceCommon/src/main/resources/mapper/LabResultReMapper.xml new file mode 100644 index 0000000..74c21f2 --- /dev/null +++ b/lis-interfaceCommon/src/main/resources/mapper/LabResultReMapper.xml @@ -0,0 +1,78 @@ + + + + + + + insert into lab_result_re (jyrq, yq, ybh,xmdh,csjg) + values (#{jyrq},#{yq},#{ybh},#{xmdh},#{csjg}) + + + update lab_result_re + + + xmdh = #{xmdh}, + + + csjg = #{csjg}, + + + + + and jyrq = #{jyrq} + + + and yq = #{yq} + + + and ybh = #{ybh} + + + and xmdh = #{xmdh} + + + + \ No newline at end of file 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 cbc5fa5..cf4bfed 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 @@ -84,11 +84,7 @@ public class LisWorkController extends BaseController { public Result queryxmval(String yq,String xmdh) { return lisWorkService.getXmVal(yq,xmdh); } - @ApiOperation("获取微生物样本信息") - @GetMapping("/sampleMedInfo") - public Result sampleMedInfo(Date jyrq, String yq, String ybh) { - return lisWorkService.sampleMedInfo(jyrq, yq, ybh); - } + @ApiOperation("工号密码验证") @GetMapping("/checkuserid") public Result checkUser(String yhdh, String mm) { 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 new file mode 100644 index 0000000..42a9b74 --- /dev/null +++ b/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkGermController.java @@ -0,0 +1,51 @@ +package com.czlis.liswork.controller.work; + +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.page.TableDataInfo; +import com.czlis.liswork.service.LabResultService; +import com.czlis.liswork.service.LisWorkService; +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.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.Date; +import java.util.List; + +@RestController +@RequestMapping("/lisworkgerm") +@Slf4j +@Api(tags = "主界面-微生物报告输入") +public class LisWorkGermController extends BaseController { + @Autowired + private LisWorkService lisWorkService; + @Autowired + private LabResultService labResultService; + @ApiOperation("获取微生物样本信息") + @GetMapping("/sampleMedInfo") + public Result sampleMedInfo(Date jyrq, String yq, String ybh) { + return lisWorkService.sampleMedInfo(jyrq, yq, ybh); + } + @ApiOperation("获取样本列表") + @GetMapping("/samplelist") + public Result getSampleList(Date jyrq,String yq,Long days){ + return new Result("0", "获取样本数据成功！",lisWorkService.getSampleList(jyrq,yq,days)); + } + @ApiOperation("获取样本列表") + @GetMapping("/samplelistpage") + public TableDataInfo samplelistpage(Date jyrq, String yq, Long days) { + try { + startPage(); + startOrderBy(); + List labPatList = lisWorkService.getSampleList(jyrq, yq, days); + return getDataTable(labPatList); + } finally { + clearPage(); + } + } +} diff --git a/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkPageInfoController.java b/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkPageInfoController.java index 61c5d8f..3cc1156 100644 --- a/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkPageInfoController.java +++ b/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkPageInfoController.java @@ -3,13 +3,12 @@ package com.czlis.liswork.controller.work; import com.czlis.common.annotation.Anonymous; import com.czlis.common.core.controller.BaseController; import com.czlis.common.core.domain.Result; +import com.czlis.common.core.domain.entity.lis.LabResultRe; import com.czlis.liswork.service.LisWorkPageInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.Date; @@ -23,61 +22,73 @@ public class LisWorkPageInfoController extends BaseController { @ApiOperation("获取检验结果图片信息") @GetMapping("/resultgraph") - public Result resultGraph(Date jyrq,String yq,String ybh){ - return lisWorkPageInfoService.resultGraph(jyrq,yq,ybh); + public Result resultGraph(Date jyrq, String yq, String ybh) { + return lisWorkPageInfoService.resultGraph(jyrq, yq, ybh); } @ApiOperation("获取复查结果") @GetMapping("/redo") - public Result getRedo(Date jyrq,String yq,String ybh){ - return lisWorkPageInfoService.getRedo(jyrq,yq,ybh); + public Result getRedo(Date jyrq, String yq, String ybh) { + return lisWorkPageInfoService.getRedo(jyrq, yq, ybh); + } + + @ApiOperation("交换复查结果") + @PostMapping("/swapredo") + public Result swapredo(@RequestBody LabResultRe labResultRe) { + + return lisWorkPageInfoService.swapRedo(labResultRe); + } + + @ApiOperation("保存复查结果") + @PostMapping("/saveredo") + public Result saveredo(@RequestBody LabResultRe labResultRe) { + + return lisWorkPageInfoService.saveRedo(labResultRe); } @Anonymous @ApiOperation("获取历史结果") @GetMapping("/history") - public Result getHistory(Date jyrq,String yq,String ybh){ - return lisWorkPageInfoService.getHistory(jyrq,yq,ybh); + public Result getHistory(Date jyrq, String yq, String ybh) { + return lisWorkPageInfoService.getHistory(jyrq, yq, ybh); } @ApiOperation("获取其他仪器结果") @GetMapping("/otherinstr") - public Result getOtherinstr(Date jyrq, String yq, String ybh){ - return lisWorkPageInfoService.getOtherinstr(jyrq,yq,ybh); + public Result getOtherinstr(Date jyrq, String yq, String ybh) { + return lisWorkPageInfoService.getOtherinstr(jyrq, yq, ybh); } @Anonymous @ApiOperation("获取其他仪器结果明细") @GetMapping("/otherinstrdetail") - public Result getOtherinstrDetail(String brdh,String yq,Date jyrq,String ybh){ - return lisWorkPageInfoService.getOtherinstrDetail(brdh,yq,jyrq,ybh); + public Result getOtherinstrDetail(String brdh, String yq, Date jyrq, String ybh) { + return lisWorkPageInfoService.getOtherinstrDetail(brdh, yq, jyrq, ybh); } @ApiOperation("获取收费信息") @GetMapping("/reqdetail") - public Result getReqdetail(Date jyrq,String yq,String ybh){ - return lisWorkPageInfoService.getReqdetail(jyrq,yq,ybh); + public Result getReqdetail(Date jyrq, String yq, String ybh) { + return lisWorkPageInfoService.getReqdetail(jyrq, yq, ybh); } @ApiOperation("获取收费信息报告明细") @GetMapping("/reqdetailmx") - public Result getReqdetailMX(String yq,String sqxmdh){ - return lisWorkPageInfoService.getReqdetailMX(yq,sqxmdh); + public Result getReqdetailMX(String yq, String sqxmdh) { + return lisWorkPageInfoService.getReqdetailMX(yq, sqxmdh); } @ApiOperation("获取标本流转信息") @GetMapping("/reqinfo") - public Result getReqInfo(Date jyrq,String yq,String ybh){ - return lisWorkPageInfoService.getReqInfo(jyrq,yq,ybh); + public Result getReqInfo(Date jyrq, String yq, String ybh) { + return lisWorkPageInfoService.getReqInfo(jyrq, yq, ybh); } @ApiOperation("获取组合项目模板") @GetMapping("/inputmdl") - public Result getInputmdl(String yq){ + public Result getInputmdl(String yq) { return lisWorkPageInfoService.getInputmdl(yq); } - - } diff --git a/liswork/src/main/java/com/czlis/liswork/mapper/LisWorkPageInfoMapper.java b/liswork/src/main/java/com/czlis/liswork/mapper/LisWorkPageInfoMapper.java index 7dd30a7..866266f 100644 --- a/liswork/src/main/java/com/czlis/liswork/mapper/LisWorkPageInfoMapper.java +++ b/liswork/src/main/java/com/czlis/liswork/mapper/LisWorkPageInfoMapper.java @@ -25,4 +25,7 @@ public interface LisWorkPageInfoMapper { List> getbgxm(@Param("yq") String yq,@Param("sqxmdh") String sqxmdh); List getInputmdl(String yq); + int insertLabResultRe(LabResultRe labResultRe); + int updateLabResultRe(LabResultRe labResultRe); + LabResultRe getLabResultRe(@Param("jyrq") Date jyrq,@Param("yq") String yq,@Param("ybh") String ybh,@Param("xmdh") String xmdh); } diff --git a/liswork/src/main/java/com/czlis/liswork/service/LisWorkPageInfoService.java b/liswork/src/main/java/com/czlis/liswork/service/LisWorkPageInfoService.java index 383efbc..1d48a6e 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/LisWorkPageInfoService.java +++ b/liswork/src/main/java/com/czlis/liswork/service/LisWorkPageInfoService.java @@ -1,12 +1,15 @@ package com.czlis.liswork.service; import com.czlis.common.core.domain.Result; +import com.czlis.common.core.domain.entity.lis.LabResultRe; import java.util.Date; public interface LisWorkPageInfoService { Result resultGraph(Date jyrq, String yq, String ybh); Result getRedo(Date jyrq, String yq, String ybh); + Result swapRedo(LabResultRe labResultRe); + Result saveRedo(LabResultRe labResultRe); Result getHistory(Date jyrq, String yq, String ybh); Result getReqdetail(Date jyrq, String yq, String ybh); Result getOtherinstr(Date jyrq, String yq, String ybh); diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkPageInfoServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkPageInfoServiceImpl.java index 6743694..51f27b7 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkPageInfoServiceImpl.java +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkPageInfoServiceImpl.java @@ -5,6 +5,7 @@ import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import com.czlis.common.core.domain.Result; import com.czlis.common.core.domain.entity.lis.*; +import com.czlis.interfaceCommon.utils.LisWorkUtils; import com.czlis.interfaceCommon.utils.ReportUtil; import com.czlis.liswork.mapper.LisWorkPageInfoMapper; import com.czlis.liswork.pojo.DTO.HistoryResultDTO; @@ -14,6 +15,7 @@ import com.czlis.interfaceCommon.utils.CommonUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.*; import java.util.stream.Collectors; @@ -27,7 +29,7 @@ public class LisWorkPageInfoServiceImpl implements LisWorkPageInfoService { @Autowired CommonUtil commonUtil; @Autowired - ReportUtil reportUtil; + LisWorkUtils lisWorkUtils; @Override public Result resultGraph(Date jyrq, String yq, String ybh) { @@ -58,6 +60,49 @@ public class LisWorkPageInfoServiceImpl implements LisWorkPageInfoService { List labResultReList = lisWorkPageInfoMapper.getRedo(jyrq,yq,ybh); return new Result("0","获取数据成功！",labResultReList); } + @Override + @Transactional(rollbackFor = Exception.class) + public Result swapRedo(LabResultRe labResultRe) { + Date jyrq=labResultRe.getJyrq(); + String yq=labResultRe.getYq(); + String ybh=labResultRe.getYbh(); + String xmdh=labResultRe.getXmdh(); + String csjg=labResultRe.getCsjg(); + LabPat labPat=commonUtil.getLabPatOne(jyrq,yq,ybh); + if(labPat!=null){ + String jgbz=labPat.getJgbz(); + if(jgbz==null)jgbz="0"; + if("2".equals(jgbz)||"5".equals(jgbz)){ + return new Result("1","样本已审核禁止交换！"); + } + } + LabResult labResult=commonUtil.getLabResult(jyrq,yq,ybh,xmdh); + if(labResult==null){ + return new Result("1","当前结果为空无法交换！"); + } + String csjg0=labResult.getCsjg(); + labResultRe.setCsjg(csjg0); + labResult.setCsjg(csjg); + labResult.setRedo_flag("1"); + lisWorkUtils.changeresult(labResult); + lisWorkPageInfoMapper.updateLabResultRe(labResultRe); + return new Result("0","交换数据成功！",labResultRe); + } + @Override + @Transactional(rollbackFor = Exception.class) + public Result saveRedo(LabResultRe labResultRe) { + Date jyrq=labResultRe.getJyrq(); + String yq=labResultRe.getYq(); + String ybh=labResultRe.getYbh(); + String xmdh=labResultRe.getXmdh(); + LabResultRe labResultRe0 =lisWorkPageInfoMapper.getLabResultRe(jyrq,yq,ybh,xmdh); + if(labResultRe0==null){ + lisWorkPageInfoMapper.updateLabResultRe(labResultRe); + }else{ + lisWorkPageInfoMapper.insertLabResultRe(labResultRe); + } + return new Result("0","交换数据成功！",labResultRe); + } @Override public Result getHistory(Date jyrq, String yq, String ybh) { diff --git a/liswork/src/main/resources/mapper/LisWorkPageInfoMapper.xml b/liswork/src/main/resources/mapper/LisWorkPageInfoMapper.xml index a0b1e98..b561d47 100644 --- a/liswork/src/main/resources/mapper/LisWorkPageInfoMapper.xml +++ b/liswork/src/main/resources/mapper/LisWorkPageInfoMapper.xml @@ -17,9 +17,62 @@ - + + + insert into lab_result_re (jyrq, yq, ybh,xmdh,csjg) + values (#{jyrq},#{yq},#{ybh},#{xmdh},#{csjg}) + + + update lab_result_re + + + xmdh = #{xmdh}, + + + csjg = #{csjg}, + + + + + and jyrq = #{jyrq} + + + and yq = #{yq} + + + and ybh = #{ybh} + + + and xmdh = #{xmdh} + + +