From 2eb4fadb17166f1d7f1671910551a3d0dd5fbf65 Mon Sep 17 00:00:00 2001 From: jiangs <373297395@qq.com> Date: Tue, 14 Oct 2025 17:36:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E7=95=8C=E9=9D=A2=E5=90=84=E4=B8=AAta?= =?UTF-8?q?b=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../czlis/common/utils/file/ImageUtils.java | 2 +- .../controller/system/SysLoginController.java | 4 + .../work/LisWorkPageInfoController.java | 23 +++- .../liswork/mapper/LisWorkPageInfoMapper.java | 14 ++- .../com/czlis/liswork/pojo/HistoryResult.java | 24 ++++ .../service/LisWorkPageInfoService.java | 6 + .../impl/LisWorkPageInfoServiceImpl.java | 103 +++++++++++++++--- .../mapper/LisWorkPageInfoMapper.xml | 48 ++++++++ 8 files changed, 202 insertions(+), 22 deletions(-) create mode 100644 liswork/src/main/java/com/czlis/liswork/pojo/HistoryResult.java diff --git a/lis-common/src/main/java/com/czlis/common/utils/file/ImageUtils.java b/lis-common/src/main/java/com/czlis/common/utils/file/ImageUtils.java index 6e5264a..4659780 100644 --- a/lis-common/src/main/java/com/czlis/common/utils/file/ImageUtils.java +++ b/lis-common/src/main/java/com/czlis/common/utils/file/ImageUtils.java @@ -151,7 +151,7 @@ public class ImageUtils bos.flush(); } - System.out.println("图片已生成到static目录：" + targetFile.getAbsolutePath()); + log.info("图片已生成到static目录：" + targetFile.getAbsolutePath()); return targetFile; } diff --git a/lis-system/src/main/java/com/czlis/system/web/controller/system/SysLoginController.java b/lis-system/src/main/java/com/czlis/system/web/controller/system/SysLoginController.java index f3c5727..eab36aa 100644 --- a/lis-system/src/main/java/com/czlis/system/web/controller/system/SysLoginController.java +++ b/lis-system/src/main/java/com/czlis/system/web/controller/system/SysLoginController.java @@ -11,6 +11,8 @@ import com.czlis.system.service.ISysMenuService; import com.czlis.system.web.service.SysLoginService; import com.czlis.system.web.service.SysPermissionService; import com.czlis.interfaceCommon.service.TokenService; +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.PostMapping; @@ -25,6 +27,7 @@ import java.util.Set; * * @author admin */ +@Api(tags = "登录验证") @RestController public class SysLoginController { @Autowired @@ -45,6 +48,7 @@ public class SysLoginController { * @param loginBody 登录信息 * @return 结果 */ + @ApiOperation("登录") @PostMapping("/login") public AjaxResult login(@RequestBody LoginBody loginBody) { AjaxResult ajax = AjaxResult.success(); 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 3ce4627..1dd224f 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 @@ -1,5 +1,6 @@ package com.czlis.liswork.controller.work; +import com.czlis.common.core.controller.BaseController; import com.czlis.common.core.domain.Result; import com.czlis.liswork.service.LisWorkPageInfoService; import io.swagger.annotations.Api; @@ -14,7 +15,7 @@ import java.util.Date; @Api(tags = "主界面-获取检验tab页面信息") @RestController @RequestMapping("/lisworkpageinfo") -public class LisWorkPageInfoController { +public class LisWorkPageInfoController extends BaseController { @Autowired private LisWorkPageInfoService lisWorkPageInfoService; @@ -39,22 +40,40 @@ public class LisWorkPageInfoController { @ApiOperation("获取其他仪器结果") @GetMapping("/otherinstr") - public Result getOtherinstr(Date jyrq,String yq,String ybh){ + public Result getOtherinstr(Date jyrq, String yq, String ybh){ return lisWorkPageInfoService.getOtherinstr(jyrq,yq,ybh); } + @ApiOperation("获取其他仪器结果明细") + @GetMapping("/otherinstrdetail") + public Result getOtherinstrDetail(String brdh,String yq,Date jyrq){ + return lisWorkPageInfoService.getOtherinstrDetail(brdh,yq,jyrq); + } + @ApiOperation("获取收费信息") @GetMapping("/reqdetail") 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); + } + @ApiOperation("获取标本流转信息") @GetMapping("/reqinfo") public Result getReqInfo(Date jyrq,String yq,String ybh){ return lisWorkPageInfoService.getReqInfo(jyrq,yq,ybh); } + @ApiOperation("获取组合项目模板") + @GetMapping("/inputmdl") + 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 d2be83f..7dd30a7 100644 --- a/liswork/src/main/java/com/czlis/liswork/mapper/LisWorkPageInfoMapper.java +++ b/liswork/src/main/java/com/czlis/liswork/mapper/LisWorkPageInfoMapper.java @@ -1,10 +1,8 @@ package com.czlis.liswork.mapper; import cn.hutool.core.date.DateTime; -import com.czlis.common.core.domain.entity.lis.LabGraph; -import com.czlis.common.core.domain.entity.lis.LabGraphUnit; -import com.czlis.common.core.domain.entity.lis.LabOldGraph; -import com.czlis.common.core.domain.entity.lis.LabResultRe; +import com.czlis.common.core.domain.entity.lis.*; +import com.czlis.liswork.pojo.HistoryResult; import org.apache.ibatis.annotations.Param; import java.util.Date; @@ -19,4 +17,12 @@ public interface LisWorkPageInfoMapper { List> getReqdetail(String sqh); List> getOtherinstr(@Param("dayStart") Date dayStart,@Param("dayEnd") DateTime dayEnd,@Param("brdh") String brdh,@Param("brxm") String brxm); List> getReqInfo(@Param("jyrq") Date jyrq,@Param("yq") String yq,@Param("ybh") String ybh); + + List> getOtherinstrDetail(@Param("brdh") String brdh, @Param("yq") String yq,@Param("jyrq") Date jyrq); + + List getHisResult(Map map); + + List> getbgxm(@Param("yq") String yq,@Param("sqxmdh") String sqxmdh); + + List getInputmdl(String yq); } diff --git a/liswork/src/main/java/com/czlis/liswork/pojo/HistoryResult.java b/liswork/src/main/java/com/czlis/liswork/pojo/HistoryResult.java new file mode 100644 index 0000000..9fe8793 --- /dev/null +++ b/liswork/src/main/java/com/czlis/liswork/pojo/HistoryResult.java @@ -0,0 +1,24 @@ +package com.czlis.liswork.pojo; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class HistoryResult { + private Date jyrq; + private String xmdh; + private String xmmc; + private String csjg; + private String ybh; + private String yq; + private String brxb; + private String nl; + private String yqdl; + private String brdh; + +} 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 ec6071c..a0512f1 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/LisWorkPageInfoService.java +++ b/liswork/src/main/java/com/czlis/liswork/service/LisWorkPageInfoService.java @@ -11,4 +11,10 @@ public interface LisWorkPageInfoService { Result getReqdetail(Date jyrq, String yq, String ybh); Result getOtherinstr(Date jyrq, String yq, String ybh); Result getReqInfo(Date jyrq, String yq, String ybh); + + Result getOtherinstrDetail(String brdh, String yq, Date jyrq); + + Result getReqdetailMX(String yq, String sqxmdh); + + Result getInputmdl(String yq); } 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 2666124..13f11e7 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 @@ -1,21 +1,25 @@ package com.czlis.liswork.service.impl; +import cn.hutool.core.codec.Base64; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.StrUtil; 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.utils.file.FileUtils; +import com.czlis.common.utils.file.ImageUtils; +import com.czlis.interfaceCommon.utils.ReportUtil; import com.czlis.liswork.mapper.LisWorkPageInfoMapper; -import com.czlis.common.core.domain.entity.lis.LabGraph; -import com.czlis.common.core.domain.entity.lis.LabGraphUnit; -import com.czlis.common.core.domain.entity.lis.LabOldGraph; -import com.czlis.common.core.domain.entity.lis.LabResultRe; +import com.czlis.liswork.pojo.HistoryResult; import com.czlis.liswork.service.LisWorkPageInfoService; import com.czlis.interfaceCommon.utils.CommonUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.io.File; import java.util.*; +import java.util.stream.Collectors; @Service @Slf4j @@ -25,18 +29,23 @@ public class LisWorkPageInfoServiceImpl implements LisWorkPageInfoService { LisWorkPageInfoMapper lisWorkPageInfoMapper; @Autowired CommonUtil commonUtil; + @Autowired + ReportUtil reportUtil; @Override public Result resultGraph(Date jyrq, String yq, String ybh) { - List labGraphList = lisWorkPageInfoMapper.getLabGraphList(jyrq,yq,ybh); - List labGraphUnitList = lisWorkPageInfoMapper.getLabGraphUnitList(yq,""); - List labOldGraphList = lisWorkPageInfoMapper.getLabOldGraphList(jyrq, yq, ybh); - List> queryList = new ArrayList<>(); - Map map = new HashMap<>(); - map.put("labGraphList",labGraphList); - map.put("labGraphUnitList",labGraphUnitList); - map.put("labOldGraphList",labOldGraphList); - queryList.add(map); + //List labGraphList = lisWorkPageInfoMapper.getLabGraphList(jyrq,yq,ybh); +// List labGraphUnitList = lisWorkPageInfoMapper.getLabGraphUnitList(yq,""); +// List labOldGraphList = lisWorkPageInfoMapper.getLabOldGraphList(jyrq, yq, ybh); + List queryList = new ArrayList<>(); + String[] picPath = reportUtil.getReportpic(jyrq, yq, ybh); + for (int i = 0; i < picPath.length; i++) { + String staticpath= ImageUtils.getStaticPath()+ File.separator; + String picFilePath =staticpath +"graphs"+File.separator + StrUtil.splitToArray(picPath[i], "graphs/")[1]; + File file = new File(picFilePath); + queryList.add(Base64.encode(file)); + FileUtils.deleteFile(picFilePath); + } return new Result("0","获取数据成功！",queryList); } @@ -48,9 +57,49 @@ public class LisWorkPageInfoServiceImpl implements LisWorkPageInfoService { @Override public Result getHistory(Date jyrq, String yq, String ybh) { - return null; + Map map = new HashMap<>(); + map.put("jyrq",jyrq); + map.put("yq",yq); + map.put("ybh",ybh); + //本次结果 + List hisResultThisList = lisWorkPageInfoMapper.getHisResult(map); + if(hisResultThisList.size()<=0) return new Result("-1","没有找到对应的结果信息！"); + //其他结果 + map.clear(); + map.put("yqdl", hisResultThisList.get(0).getYqdl()); + map.put("brdh",hisResultThisList.get(0).getBrdh()); + List hisResultList = lisWorkPageInfoMapper.getHisResult(map); + for (HistoryResult historyResult : hisResultThisList) { + List collect = hisResultList.stream().filter(historyResult1 -> + historyResult1.getXmdh().equals(historyResult.getXmdh()) && !historyResult1.getJyrq().equals(historyResult.getJyrq())).collect(Collectors.toList()); + if(!collect.isEmpty()) hisResultThisList.addAll(collect); + } + //排序 + hisResultThisList.sort(new Comparator() { + @Override + public int compare(HistoryResult o1, HistoryResult o2) { + String xmdh = o1.getXmdh(); + String xmdh2 = o2.getXmdh(); + int i = xmdh.compareTo(xmdh2); + if(i == 0) { + Date jyrq1 = o1.getJyrq(); + Date jyrq2 = o2.getJyrq(); + return jyrq1.compareTo(jyrq2); + }else{ + return i; + } + } + }); + return new Result("0","获取成功！",hisResultThisList); } + /** + * 获取收费信息 + * @param jyrq + * @param yq + * @param ybh + * @return + */ @Override public Result getReqdetail(Date jyrq, String yq, String ybh) { LabPat labPatOne = commonUtil.getLabPatOne(jyrq, yq, ybh); @@ -79,5 +128,29 @@ public class LisWorkPageInfoServiceImpl implements LisWorkPageInfoService { return new Result("0","获取标本流转数据成功！",reqInfoList); } + @Override + public Result getOtherinstrDetail(String brdh, String yq, Date jyrq) { + List> otherinstrDetailList = lisWorkPageInfoMapper.getOtherinstrDetail(brdh,yq,jyrq); + return new Result("0","查询成功！",otherinstrDetailList); + } + + /** + * 申请项目明细 + * @param yq + * @param sqxmdh + * @return + */ + @Override + public Result getReqdetailMX(String yq, String sqxmdh) { + List> bgxmList = lisWorkPageInfoMapper.getbgxm(yq, sqxmdh); + return new Result("0","获取数据成功！",bgxmList); + } + + @Override + public Result getInputmdl(String yq) { + List labInputmdlList = lisWorkPageInfoMapper.getInputmdl(yq); + return new Result("0","获取数据成功！",labInputmdlList); + } + } diff --git a/liswork/src/main/resources/mapper/LisWorkPageInfoMapper.xml b/liswork/src/main/resources/mapper/LisWorkPageInfoMapper.xml index 16e5ff6..0027ce8 100644 --- a/liswork/src/main/resources/mapper/LisWorkPageInfoMapper.xml +++ b/liswork/src/main/resources/mapper/LisWorkPageInfoMapper.xml @@ -63,4 +63,52 @@ WHERE lab_reqmain.sqh = lab_pat.sqh and lab_pat.jyrq = #{jyrq} and lab_pat.yq = #{yq} and lab_pat.ybh = #{ybh} + + + + + + + + +