From 9a04f1c97ec0e11767cf878069b37f411abd2e1f Mon Sep 17 00:00:00 2001 From: litao Date: Wed, 31 Aug 2022 19:41:06 +0800 Subject: [PATCH] =?UTF-8?q?2022=E5=B9=B48=E6=9C=8831=E6=97=A519:40:36?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/springblade/lims/entry/Examine.java | 6 ++ .../springblade/lims/entry/ExamineItem.java | 3 +- .../springblade/lims/entry/ExamineResult.java | 3 + .../goods/controller/ApplyController.java | 10 ++- .../goods/controller/GoodsController.java | 32 +++---- .../lims/controller/EntrustController.java | 71 +++++++++------- .../controller/ExamineBasisController.java | 18 +++- .../lims/controller/ExamineController.java | 33 +++++-- .../controller/ExamineItemController.java | 26 ++++-- .../controller/ExamineResultController.java | 12 +-- .../lims/controller/ExamineWayController.java | 16 +++- .../org/springblade/lims/excel/PCR2Excel.java | 11 +++ .../org/springblade/lims/excel/PCRExcel.java | 6 +- .../lims/service/IExamineResultService.java | 3 +- .../lims/service/impl/EntrustServiceImpl.java | 30 +++++-- .../impl/ExamineResultServiceImpl.java | 85 +++++++++---------- .../user/controller/UserController.java | 38 ++++++--- 17 files changed, 267 insertions(+), 136 deletions(-) create mode 100644 lab-service/lab-lims/src/main/java/org/springblade/lims/excel/PCR2Excel.java diff --git a/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/Examine.java b/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/Examine.java index 5235999..28a7526 100644 --- a/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/Examine.java +++ b/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/Examine.java @@ -212,4 +212,10 @@ public class Examine extends BaseEntity implements Serializable { // 模板类型 private String templateType; + /** + * 输入方式 + */ + @TableField(exist = false) + private String inputMode; + } \ No newline at end of file diff --git a/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/ExamineItem.java b/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/ExamineItem.java index b812204..c86dfda 100644 --- a/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/ExamineItem.java +++ b/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/ExamineItem.java @@ -86,5 +86,4 @@ public class ExamineItem extends BaseEntity implements Serializable { * 使用次数 */ private Integer useCount; - -} \ No newline at end of file +} diff --git a/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/ExamineResult.java b/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/ExamineResult.java index a6592a8..3355b78 100644 --- a/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/ExamineResult.java +++ b/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/ExamineResult.java @@ -154,4 +154,7 @@ public class ExamineResult extends BaseEntity implements Serializable { // 图片路径 private String picturePath; + @TableField(exist = false) + private List path; + } \ No newline at end of file diff --git a/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/ApplyController.java b/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/ApplyController.java index d01de7c..5eb5ff0 100644 --- a/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/ApplyController.java +++ b/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/ApplyController.java @@ -61,7 +61,15 @@ public class ApplyController extends BladeController { apply.setCreateDept(Long.valueOf(AuthUtil.getDeptId())); } LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(apply); - wrapper.eq(Apply::getStatus, 1).or().eq(Apply::getStatus, 3).or().eq(Apply::getStatus, 4); +// wrapper.eq(Apply::getStatus, 1).or() +// .eq(Apply::getStatus, 3).or() +// .eq(Apply::getStatus, 4); + if ("1".equals(apply.getIsGetAll())) { + if (apply.getStatus() == null) { + wrapper.in(Apply::getStatus, 1, 3, 4); + } + } + if (temp != null && !"".equals(temp)) { wrapper.and(qw -> qw .like(Apply::getApplyUser, temp).or() diff --git a/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/GoodsController.java b/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/GoodsController.java index e1ecd77..c3b2c91 100644 --- a/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/GoodsController.java +++ b/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/GoodsController.java @@ -148,7 +148,7 @@ public class GoodsController extends BladeController { if (userList != null) { for (User user : userList) { messageClient.event(SysTypeEnum.INFORM.getValue(), "质检入库", - "你有新的物品待质检,请及时处理", 1, 5, user.getId().toString(),"/capital/productstoreList"); + "你有新的物品待质检,请及时处理", 1, 5, user.getId().toString(), "/capital/productstoreList"); } } return goodsService.save(goods); @@ -321,7 +321,7 @@ public class GoodsController extends BladeController { if (userList != null) { for (User user : userList) { messageClient.event(SysTypeEnum.INFORM.getValue(), "质检入库", - "你有新的物品待质检,请及时处理", 1, 5, user.getId().toString(),"/capital/productstoreList"); + "你有新的物品待质检,请及时处理", 1, 5, user.getId().toString(), "/capital/productstoreList"); } } } @@ -355,7 +355,7 @@ public class GoodsController extends BladeController { // 周一出库数量 LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(ApplyDetail::getIsCk, 1); - wrapper.between(ApplyDetail::getCkTime,mondayStart,mondayEnd); + wrapper.between(ApplyDetail::getCkTime, mondayStart, mondayEnd); List applyDetails1 = applyDetailService.list(wrapper); int mondayOut = 0; for (ApplyDetail applyDetail : applyDetails1) { @@ -364,7 +364,7 @@ public class GoodsController extends BladeController { // 周一入库数量 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(ProductStoreDetial::getStatus, 1); - queryWrapper.between(ProductStoreDetial::getUpdateTime,mondayStart,mondayEnd); + queryWrapper.between(ProductStoreDetial::getUpdateTime, mondayStart, mondayEnd); List storeDetials1 = productStoreDetialService.list(queryWrapper); int mondayIn = 0; for (ProductStoreDetial storeDetial : storeDetials1) { @@ -382,7 +382,7 @@ public class GoodsController extends BladeController { // 周二出库数量 wrapper.clear(); wrapper.eq(ApplyDetail::getIsCk, 1); - wrapper.between(ApplyDetail::getCkTime,tuesdayStart,tuesdayEnd); + wrapper.between(ApplyDetail::getCkTime, tuesdayStart, tuesdayEnd); List applyDetails2 = applyDetailService.list(wrapper); int tuesdayOut = 0; for (ApplyDetail applyDetail : applyDetails2) { @@ -391,7 +391,7 @@ public class GoodsController extends BladeController { // 周二入库数量 queryWrapper.clear(); queryWrapper.eq(ProductStoreDetial::getStatus, 1); - queryWrapper.between(ProductStoreDetial::getUpdateTime,tuesdayStart,tuesdayEnd); + queryWrapper.between(ProductStoreDetial::getUpdateTime, tuesdayStart, tuesdayEnd); List storeDetials2 = productStoreDetialService.list(queryWrapper); int tuesdayIn = 0; for (ProductStoreDetial storeDetial : storeDetials2) { @@ -409,7 +409,7 @@ public class GoodsController extends BladeController { // 周三出库数量 wrapper.clear(); wrapper.eq(ApplyDetail::getIsCk, 1); - wrapper.between(ApplyDetail::getCkTime,wednedayStart,wednedayEnd); + wrapper.between(ApplyDetail::getCkTime, wednedayStart, wednedayEnd); List applyDetails3 = applyDetailService.list(wrapper); int wednedayOut = 0; for (ApplyDetail applyDetail : applyDetails3) { @@ -418,7 +418,7 @@ public class GoodsController extends BladeController { // 周三入库数量 queryWrapper.clear(); queryWrapper.eq(ProductStoreDetial::getStatus, 1); - queryWrapper.between(ProductStoreDetial::getUpdateTime,wednedayStart,wednedayEnd); + queryWrapper.between(ProductStoreDetial::getUpdateTime, wednedayStart, wednedayEnd); List storeDetials3 = productStoreDetialService.list(queryWrapper); int wednedayIn = 0; for (ProductStoreDetial storeDetial : storeDetials3) { @@ -436,7 +436,7 @@ public class GoodsController extends BladeController { // 周四出库数量 wrapper.clear(); wrapper.eq(ApplyDetail::getIsCk, 1); - wrapper.between(ApplyDetail::getCkTime,thursdayStart,thursdayEnd); + wrapper.between(ApplyDetail::getCkTime, thursdayStart, thursdayEnd); List applyDetails4 = applyDetailService.list(wrapper); int thursdayOut = 0; for (ApplyDetail applyDetail : applyDetails4) { @@ -445,7 +445,7 @@ public class GoodsController extends BladeController { // 周四入库数量 queryWrapper.clear(); queryWrapper.eq(ProductStoreDetial::getStatus, 1); - queryWrapper.between(ProductStoreDetial::getUpdateTime,thursdayStart,thursdayEnd); + queryWrapper.between(ProductStoreDetial::getUpdateTime, thursdayStart, thursdayEnd); List storeDetials4 = productStoreDetialService.list(queryWrapper); int thursdayIn = 0; for (ProductStoreDetial storeDetial : storeDetials4) { @@ -463,7 +463,7 @@ public class GoodsController extends BladeController { // 周五出库数量 wrapper.clear(); wrapper.eq(ApplyDetail::getIsCk, 1); - wrapper.between(ApplyDetail::getCkTime,fridayStart,fridayEnd); + wrapper.between(ApplyDetail::getCkTime, fridayStart, fridayEnd); List applyDetails5 = applyDetailService.list(wrapper); int fridayOut = 0; for (ApplyDetail applyDetail : applyDetails5) { @@ -472,7 +472,7 @@ public class GoodsController extends BladeController { // 周五入库数量 queryWrapper.clear(); queryWrapper.eq(ProductStoreDetial::getStatus, 1); - queryWrapper.between(ProductStoreDetial::getUpdateTime,fridayStart,fridayEnd); + queryWrapper.between(ProductStoreDetial::getUpdateTime, fridayStart, fridayEnd); List storeDetials5 = productStoreDetialService.list(queryWrapper); int fridayIn = 0; for (ProductStoreDetial storeDetial : storeDetials5) { @@ -490,7 +490,7 @@ public class GoodsController extends BladeController { // 周六出库数量 wrapper.clear(); wrapper.eq(ApplyDetail::getIsCk, 1); - wrapper.between(ApplyDetail::getCkTime,saturdayStart,saturdayEnd); + wrapper.between(ApplyDetail::getCkTime, saturdayStart, saturdayEnd); List applyDetails6 = applyDetailService.list(wrapper); int saturdayOut = 0; for (ApplyDetail applyDetail : applyDetails6) { @@ -499,7 +499,7 @@ public class GoodsController extends BladeController { // 周六入库数量 queryWrapper.clear(); queryWrapper.eq(ProductStoreDetial::getStatus, 1); - queryWrapper.between(ProductStoreDetial::getUpdateTime,saturdayStart,saturdayEnd); + queryWrapper.between(ProductStoreDetial::getUpdateTime, saturdayStart, saturdayEnd); List storeDetials6 = productStoreDetialService.list(queryWrapper); int saturdayIn = 0; for (ProductStoreDetial storeDetial : storeDetials6) { @@ -517,7 +517,7 @@ public class GoodsController extends BladeController { // 周日出库数量 wrapper.clear(); wrapper.eq(ApplyDetail::getIsCk, 1); - wrapper.between(ApplyDetail::getCkTime,sundayStart,sundayEnd); + wrapper.between(ApplyDetail::getCkTime, sundayStart, sundayEnd); List applyDetails7 = applyDetailService.list(wrapper); int sundayOut = 0; for (ApplyDetail applyDetail : applyDetails7) { @@ -526,7 +526,7 @@ public class GoodsController extends BladeController { // 周日入库数量 queryWrapper.clear(); queryWrapper.eq(ProductStoreDetial::getStatus, 1); - queryWrapper.between(ProductStoreDetial::getUpdateTime,sundayStart,sundayEnd); + queryWrapper.between(ProductStoreDetial::getUpdateTime, sundayStart, sundayEnd); List storeDetials7 = productStoreDetialService.list(queryWrapper); int sundayIn = 0; for (ProductStoreDetial storeDetial : storeDetials7) { diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/EntrustController.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/EntrustController.java index 7ffc801..e981abd 100644 --- a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/EntrustController.java +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/EntrustController.java @@ -461,6 +461,7 @@ public class EntrustController extends BladeController { @GetMapping("/getEntrust") public R> getEntrust(String id, String roleId, String deptId, String userId) { HashMap map = new HashMap<>(); + // TODO 查看详情需要改动 //科室主任 if ("1123598816738675203".equals(roleId)) { //委托单 @@ -1149,6 +1150,7 @@ public class EntrustController extends BladeController { if (byId != null) { examine.setExamineItemName(byId.getName()); } + examine.setInputMode(byId.getInputMode()); } } if (examine.getExamineWayId() != null) { @@ -1172,35 +1174,42 @@ public class EntrustController extends BladeController { QueryWrapper resultQueryWrapper = new QueryWrapper<>(); resultQueryWrapper.eq("examine_id", examine.getId()); // resultQueryWrapper.eq("status", 1); - List examineResults = examineResultService.list(resultQueryWrapper); - for (ExamineResult examineResult : examineResults) { - if (examineResult != null) { - Long examineBasisId = examine.getExamineBasisId(); - if (examineBasisId != null) { - ExamineBasis examineBasis = examineBasisService.getById(Long.valueOf(examineBasisId)); - if (examineBasis != null) { - examineResult.setContent(examineBasis.getContent()); - } + ExamineResult examineResult = examineResultService.getOne(resultQueryWrapper); + if (examineResult != null) { + Long examineBasisId = examine.getExamineBasisId(); + if (examineBasisId != null) { + ExamineBasis examineBasis = examineBasisService.getById(Long.valueOf(examineBasisId)); + if (examineBasis != null) { + examineResult.setContent(examineBasis.getContent()); } - String reagentId = examineResult.getReagentId(); - if (reagentId != null) { - Reagent reagent = reagentService.getById(reagentId); - if (reagent != null) { - examineResult.setReagentName(reagent.getName()); - examineResult.setReagentManufacturerName(reagent.getManufacturer()); - examineResult.setReagentBatchNo(reagent.getBatchNo()); - } + } + String reagentId = examineResult.getReagentId(); + if (reagentId != null) { + Reagent reagent = reagentService.getById(reagentId); + if (reagent != null) { + examineResult.setReagentName(reagent.getName()); + examineResult.setReagentManufacturerName(reagent.getManufacturer()); + examineResult.setReagentBatchNo(reagent.getBatchNo()); } - String instrumentId = examineResult.getInstrumentId(); - if (instrumentId != null) { - Instrument instrument = instrumentService.getById(instrumentId); - if (instrument != null) { - examineResult.setInstrumentName(instrument.getName()); - examineResult.setInstrumentNo(instrument.getCode()); - } + } + String instrumentId = examineResult.getInstrumentId(); + if (instrumentId != null) { + Instrument instrument = instrumentService.getById(instrumentId); + if (instrument != null) { + examineResult.setInstrumentName(instrument.getName()); + examineResult.setInstrumentNo(instrument.getCode()); + } + } + List path = new ArrayList<>(); + String picturePath = examineResult.getPicturePath(); + if (picturePath != null && !"".equals(picturePath)) { + String[] split = picturePath.split(","); + for (String s : split) { + path.add(s); } - examine.setExamineResult(examineResult); + examineResult.setPath(path); } + examine.setExamineResult(examineResult); } } return R.data(examine); @@ -1293,12 +1302,12 @@ public class EntrustController extends BladeController { map.put("examineList", examineList); //样品信息 - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("entrust_id", id); - wrapper.eq("is_distribution", 0); - wrapper.eq("status", 1); - List simpleList = simpleService.list(wrapper); - map.put("simpleList", simpleList); +// QueryWrapper wrapper = new QueryWrapper<>(); +// wrapper.eq("entrust_id", id); +// wrapper.eq("is_distribution", 0); +// wrapper.eq("status", 1); +// List simpleList = simpleService.list(wrapper); +// map.put("simpleList", simpleList); return map; } diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ExamineBasisController.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ExamineBasisController.java index 282cec5..0b71f06 100644 --- a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ExamineBasisController.java +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ExamineBasisController.java @@ -62,8 +62,22 @@ public class ExamineBasisController extends BladeController { return R.data(page); } + // TODO 加一个分页查接口 + @GetMapping("/page") + public R page(ExamineBasis entry, Query query) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + //根据name模糊查询 + if (entry.getName() != null && !"".equals(entry.getName())) { + wrapper.like(ExamineBasis::getName, entry.getName()).or() + .like(ExamineBasis::getRemark, entry.getName()); + } + wrapper.orderByDesc(ExamineBasis::getCreateTime); + IPage page = service.page(Condition.getPage(query), wrapper); + return R.data(page); + } + /** - * + * 修改 */ @PostMapping("/update") @ApiOperation(value = "更改", notes = "更改") @@ -72,7 +86,7 @@ public class ExamineBasisController extends BladeController { } /** - * + * 新增 */ @PostMapping("/insert") @ApiOperation(value = "新增", notes = "新增") diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ExamineController.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ExamineController.java index 57a4ea4..f22dd09 100644 --- a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ExamineController.java +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ExamineController.java @@ -22,10 +22,7 @@ import org.springblade.system.user.entity.User; import org.springblade.system.user.feign.IUserClient; import org.springframework.web.bind.annotation.*; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * @author swj @@ -124,6 +121,7 @@ public class ExamineController extends BladeController { if (examineItem != null) { //检验项目名称 examine.setExamineItemName(examineItem.getName()); + examine.setInputMode(examineItem.getInputMode()); } if (examineWay != null) { @@ -139,6 +137,7 @@ public class ExamineController extends BladeController { //检验依据名称 examine.setExamineBasisName(examineBasis.getName()); } + } LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(ExamineResult::getExamineId, id); @@ -146,12 +145,36 @@ public class ExamineController extends BladeController { // wrapper.eq(ExamineResult::getStatus, 0); wrapper.isNull(ExamineResult::getInstrumentId); ExamineResult examineResult = examineResultService.getOne(wrapper); - examine.setExamineResult(examineResult); + if (examineResult != null) { + String picturePath = examineResult.getPicturePath(); + if (picturePath != null && !"".equals(picturePath)) { + List path = new ArrayList<>(); + String[] split = picturePath.split(","); + for (String s : split) { + path.add(s); + } + examineResult.setPath(path); + } + examine.setExamineResult(examineResult); + } } else { // wrapper.eq(ExamineResult::getStatus, 1); // 获取批次号最大的数据 // wrapper.orderByDesc(ExamineResult::getBatch).last("limit 1"); List resultList = examineResultService.list(wrapper); + if (resultList != null && resultList.size() > 0) { + for (ExamineResult result : resultList) { + String picturePath = result.getPicturePath(); + if (picturePath != null && !"".equals(picturePath)) { + List path = new ArrayList<>(); + String[] split = picturePath.split(","); + for (String s : split) { + path.add(s); + } + result.setPath(path); + } + } + } map.put("resultList", resultList); } map.put("examine", examine); diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ExamineItemController.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ExamineItemController.java index d6a2eef..b1b5831 100644 --- a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ExamineItemController.java +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ExamineItemController.java @@ -63,6 +63,20 @@ public class ExamineItemController extends BladeController { return R.data(page); } + // TODO 加一个分页查接口 + @GetMapping("/page") + public R page(ExamineItem entry, Query query) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + //根据name模糊查询 + if (entry.getName() != null && !"".equals(entry.getName())) { + wrapper.like(ExamineItem::getName, entry.getName()).or() + .like(ExamineItem::getRemark, entry.getName()); + } + wrapper.orderByDesc(ExamineItem::getCreateTime); + IPage page = service.page(Condition.getPage(query), wrapper); + return R.data(page); + } + /** * 更改 */ @@ -101,12 +115,14 @@ public class ExamineItemController extends BladeController { @GetMapping("/getReagent") public List getReagent(String id) { ExamineItem examineItem = service.getById(id); - String reagentId = examineItem.getReagentId(); - String[] split = reagentId.split(","); List reagentList = new ArrayList<>(); - for (String s : split) { - Reagent reagent = reagentService.getById(s); - reagentList.add(reagent); + if (examineItem != null) { + String reagentId = examineItem.getReagentId(); + String[] split = reagentId.split(","); + for (String s : split) { + Reagent reagent = reagentService.getById(s); + reagentList.add(reagent); + } } return reagentList; } diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ExamineResultController.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ExamineResultController.java index a6ddce5..9444aa5 100644 --- a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ExamineResultController.java +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ExamineResultController.java @@ -1364,9 +1364,9 @@ public class ExamineResultController extends BladeController { * PCRExcel解析数据 */ private R pcrExcel(MultipartFile file, String examineId) { - List read = ExcelUtil.read(file, PCRExcel.class); + List read = ExcelUtil.read(file, PCR2Excel.class); if (read != null && read.size() > 0) { - for (PCRExcel pcrExcel : read) { + for (PCR2Excel pcrExcel : read) { if ("".equals(pcrExcel.getCtValue()) || pcrExcel.getCtValue() == null) { pcrExcel.setCtValue("/"); pcrExcel.setValue("阴性"); @@ -1374,12 +1374,12 @@ public class ExamineResultController extends BladeController { pcrExcel.setValue("阳性"); } } - PCRExcel pcrExcel1 = new PCRExcel(); + PCR2Excel pcrExcel1 = new PCR2Excel(); pcrExcel1.setExperieNum("阴性 对照"); pcrExcel1.setCtValue(""); pcrExcel1.setValue("阴性"); read.add(pcrExcel1); - PCRExcel pcrExcel2 = new PCRExcel(); + PCR2Excel pcrExcel2 = new PCR2Excel(); pcrExcel2.setExperieNum("阳性 对照"); pcrExcel2.setCtValue(""); pcrExcel2.setValue("阳性"); @@ -1619,7 +1619,7 @@ public class ExamineResultController extends BladeController { * 上传检测结果照片 */ @PostMapping("/resultPicture") - public R resultPicture(@RequestParam String picturePath) { - return R.data(service.resultPicture(picturePath)); + public R resultPicture(@RequestParam MultipartFile file) { + return R.data(service.resultPicture(file)); } } \ No newline at end of file diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ExamineWayController.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ExamineWayController.java index a570539..168a16b 100644 --- a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ExamineWayController.java +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ExamineWayController.java @@ -66,6 +66,20 @@ public class ExamineWayController extends BladeController { return R.data(page); } + // TODO 加一个分页查接口 + @GetMapping("/page") + public R page(ExamineWay entry, Query query) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + //根据name模糊查询 + if (entry.getName() != null && !"".equals(entry.getName())) { + wrapper.like(ExamineWay::getName, entry.getName()).or() + .like(ExamineWay::getRemark, entry.getName()); + } + wrapper.orderByDesc(ExamineWay::getCreateTime); + IPage page = service.page(Condition.getPage(query), wrapper); + return R.data(page); + } + /** * 修改 */ @@ -87,8 +101,8 @@ public class ExamineWayController extends BladeController { if (entry.getInstrumentId() != null) { Instrument instrument = instrumentService.getById(entry.getInstrumentId()); entry.setInstrumentName(instrument.getName()); - entry.setUseCount(0); } + entry.setUseCount(0); return service.save(entry); } diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/excel/PCR2Excel.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/excel/PCR2Excel.java new file mode 100644 index 0000000..cbfb763 --- /dev/null +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/excel/PCR2Excel.java @@ -0,0 +1,11 @@ +package org.springblade.lims.excel; + +import lombok.Data; + +@Data +public class PCR2Excel extends PCRExcel { + + // 检测结果 + private String value; + +} diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/excel/PCRExcel.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/excel/PCRExcel.java index 83c3b80..34f80b4 100644 --- a/lab-service/lab-lims/src/main/java/org/springblade/lims/excel/PCRExcel.java +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/excel/PCRExcel.java @@ -19,8 +19,8 @@ public class PCRExcel implements Serializable { @ExcelProperty("CT值") private String ctValue; - @ColumnWidth(20) - @ExcelProperty("检测结果") - private String value; +// @ColumnWidth(20) +// @ExcelProperty("检测结果") +// private String value; } diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/IExamineResultService.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/IExamineResultService.java index f26d6d3..ea29570 100644 --- a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/IExamineResultService.java +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/IExamineResultService.java @@ -5,6 +5,7 @@ package org.springblade.lims.service; import org.springblade.core.mp.base.BaseService; import org.springblade.lims.entry.Entrust; import org.springblade.lims.entry.ExamineResult; +import org.springframework.web.multipart.MultipartFile; /** * 委托单表 服务类 @@ -18,5 +19,5 @@ public interface IExamineResultService extends BaseService { void resultCommit(ExamineResult examineResult) throws Exception; - String resultPicture(String picturePath); + String resultPicture(MultipartFile file); } diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/EntrustServiceImpl.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/EntrustServiceImpl.java index 8e518d5..3d1e206 100644 --- a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/EntrustServiceImpl.java +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/EntrustServiceImpl.java @@ -13,6 +13,7 @@ import org.checkerframework.checker.units.qual.A; import org.springblade.core.tool.api.R; import org.springblade.lims.entry.*; import org.springblade.lims.excel.ExamineTemplate2Excel; +import org.springblade.lims.excel.PCR2Excel; import org.springblade.lims.excel.PCRExcel; import org.springblade.lims.mapper.EntrustMapper; import org.springblade.lims.service.*; @@ -777,7 +778,7 @@ public class EntrustServiceImpl extends BaseServiceImpl } // PCR检测 else if ("4".equals(byId.getInputMode())) { - List list = JSON.parseArray(examineResult.getExamineDataArr(), PCRExcel.class); + List list = JSON.parseArray(examineResult.getExamineDataArr(), PCR2Excel.class); if (list.size() > 0) { if (list.size() % 2 == 0) { for (int i = 0; i < list.size() / 2; i++) { @@ -805,12 +806,31 @@ public class EntrustServiceImpl extends BaseServiceImpl } } if (examineResult.getPicturePath() != null && !"".equals(examineResult.getPicturePath())) { - + String[] sp = examineResult.getPicturePath().split(","); + for (String s2 : sp) { + Map map = new HashMap<>(); + ImageEntity farView1 = new ImageEntity(); + farView1.setHeight(400);//设置高度 + farView1.setWidth(700);//设置宽度 + farView1.setType(ImageEntity.Data);//类型 + + String s1 = path + s2; + FileInputStream fis = null; + try { + fis = new FileInputStream(new File(s1)); + byte[] bytes = readInputStream(fis); + farView1.setData(bytes); + } catch (Exception e) { + e.printStackTrace(); + } + map.put("picture", farView1); + resultList2.add(map); + } } - - result.put("list", resultList1); - url = PCRreportPrint; } + result.put("list1", resultList2); + result.put("list", resultList1); + url = PCRreportPrint; } // 普通和口蹄疫检测 else { diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/ExamineResultServiceImpl.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/ExamineResultServiceImpl.java index 0c3ef47..6293ea7 100644 --- a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/ExamineResultServiceImpl.java +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/ExamineResultServiceImpl.java @@ -16,6 +16,7 @@ import org.springblade.system.user.entity.User; import org.springblade.system.user.feign.IUserClient; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; import java.io.*; import java.util.*; @@ -164,63 +165,25 @@ public class ExamineResultServiceImpl extends BaseServiceImpl path = entry.getPath(); + if (path != null && path.size() > 0) { + String picturePath = ""; + if (path.size() > 1) { + for (String s : path) { + String s1 = s + ","; + picturePath += s1; + } + } else { + picturePath = path.get(0); + } + entry.setPicturePath(picturePath); + } return this.updateById(entry); } // 提交修改实验结果 else { + // 上传图片文件名 + List path = entry.getPath(); + if (path != null && path.size() > 0) { + String picturePath = ""; + if (path.size() > 1) { + for (String s : path) { + String s1 = s + ","; + picturePath += s1; + } + } else { + picturePath = path.get(0); + } + entry.setPicturePath(picturePath); + } return this.updateById(entry); } } diff --git a/lab-service/lab-user/src/main/java/org/springblade/system/user/controller/UserController.java b/lab-service/lab-user/src/main/java/org/springblade/system/user/controller/UserController.java index bf630d8..c42fea1 100644 --- a/lab-service/lab-user/src/main/java/org/springblade/system/user/controller/UserController.java +++ b/lab-service/lab-user/src/main/java/org/springblade/system/user/controller/UserController.java @@ -140,19 +140,36 @@ public class UserController { /** * 自定义用户列表 */ +// @GetMapping("/page") +// @ApiImplicitParams({ +// @ApiImplicitParam(name = "account", value = "账号名", paramType = "query", dataType = "string"), +// @ApiImplicitParam(name = "realName", value = "姓名", paramType = "query", dataType = "string") +// }) +// @ApiOperationSupport(order = 3) +// @ApiOperation(value = "列表", notes = "传入account和realName") +// //@PreAuth(RoleConstant.HAS_ROLE_ADMIN) +// public R> page(@ApiIgnore User user, Query query, Long deptId, BladeUser bladeUser) { +// IPage pages = userService.selectUserPage(Condition.getPage(query), user, deptId, (bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID) ? StringPool.EMPTY : bladeUser.getTenantId())); +// return R.data(UserWrapper.build().pageVO(pages)); +// } + @GetMapping("/page") - @ApiImplicitParams({ - @ApiImplicitParam(name = "account", value = "账号名", paramType = "query", dataType = "string"), - @ApiImplicitParam(name = "realName", value = "姓名", paramType = "query", dataType = "string") - }) - @ApiOperationSupport(order = 3) - @ApiOperation(value = "列表", notes = "传入account和realName") - //@PreAuth(RoleConstant.HAS_ROLE_ADMIN) - public R> page(@ApiIgnore User user, Query query, Long deptId, BladeUser bladeUser) { - IPage pages = userService.selectUserPage(Condition.getPage(query), user, deptId, (bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID) ? StringPool.EMPTY : bladeUser.getTenantId())); - return R.data(UserWrapper.build().pageVO(pages)); + public R> newPage(User user, Query query) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + if (AuthUtil.getUserId() != 1530823299437965313L) { + wrapper.ne(User::getId, 1530823299437965313L); + } + if (user.getDeptId() != null && !"".equals(user.getDeptId())) { + wrapper.eq(User::getDeptId, user.getDeptId()); + } + wrapper.eq(User::getTenantId, AuthUtil.getTenantId()); + wrapper.orderByDesc(User::getCreateTime); + IPage page = userService.page(Condition.getPage(query), wrapper); + return R.data(UserWrapper.build().pageVO(page)); +// return R.data(userService.page(Condition.getPage(query), wrapper)); } + /** * 新增或修改 */ @@ -181,7 +198,6 @@ public class UserController { } - /** * 删除 */