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 2550baa..3cf36d9 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 @@ -3023,14 +3023,14 @@ public class ExamineResultController extends BladeController { if (i == (read.size() - 1)) { read.get(i).setCtValue(length + ctValue); - read.get(i).setResult(" 阳性"); + read.get(i).setResult(" 阳性"); } else { if ("".equals(read.get(i).getCtValue()) || read.get(i).getCtValue() == null) { read.get(i).setCtValue("/"); read.get(i).setResult("阴性"); } else { read.get(i).setCtValue(length + ctValue); - read.get(i).setResult(" 阳性"); + read.get(i).setResult(" 阳性"); } } } diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ReagentController.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ReagentController.java index 78de346..b6665c0 100644 --- a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ReagentController.java +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ReagentController.java @@ -90,14 +90,14 @@ public class ReagentController extends BladeController { @PostMapping("/update") @ApiOperation(value = "更改", notes = "更改") public R update(@RequestBody Reagent entry) throws Exception { - List list = service.list(); - if (list != null && list.size() > 0) { - for (Reagent reagent : list) { - if (entry.getName().equals(reagent.getName()) && entry.getManufacturer().equals(reagent.getManufacturer())) { - throw new Exception("名称重复"); - } - } - } +// List list = service.list(); +// if (list != null && list.size() > 0) { +// for (Reagent reagent : list) { +// if (entry.getName().equals(reagent.getName()) && entry.getManufacturer().equals(reagent.getManufacturer())) { +// throw new Exception("名称重复"); +// } +// } +// } List operationList = entry.getOperationList(); if (operationList != null && operationList.size() > 0) { entry.setTypeAndOperation(JSON.toJSONString(operationList)); 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 6f5a4d1..b200632 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 @@ -1007,8 +1007,10 @@ public class EntrustServiceImpl extends BaseServiceImpl // 获取该仪器对象 Instrument instrument = instrumentService.getById(s); // 拼接仪器编号及名称 - instrumentName += instrument.getCode() + " " + instrument.getName() + "\r"; + instrumentName += instrument.getName() + " " + instrument.getCode() + ","; } + + String replace = instrumentName.replace(",", "\r"); result1.put("code", instrumentName); result1.put("experieDate", format3.format(taskBlueprint.getCreateTime())); result1.put("remark", entrust.getRemark()); @@ -1016,59 +1018,59 @@ public class EntrustServiceImpl extends BaseServiceImpl // 图片路劲 String path = sysClient.getParamValue("electronic_signature_real_path").getData(); // 编制人签名 - if (StringUtil.isNotBlank(entrust.getOrganizationBy())) { - User user = userClient.userInfoById(Long.parseLong(entrust.getOrganizationBy())).getData(); - ImageEntity farView = new ImageEntity(); - farView.setHeight(50);//设置高度 - farView.setWidth(90);//设置宽度 - farView.setType(ImageEntity.Data);//类型 - String s1 = path + user.getElectronicSignature(); - FileInputStream fis = null; - try { - fis = new FileInputStream(new File(s1)); - byte[] bytes = readInputStream(fis); - farView.setData(bytes); - } catch (Exception e) { - e.printStackTrace(); - } - result1.put("1", farView); - } +// if (StringUtil.isNotBlank(entrust.getOrganizationBy())) { +// User user = userClient.userInfoById(Long.parseLong(entrust.getOrganizationBy())).getData(); +// ImageEntity farView = new ImageEntity(); +// farView.setHeight(50);//设置高度 +// farView.setWidth(90);//设置宽度 +// farView.setType(ImageEntity.Data);//类型 +// String s1 = path + user.getElectronicSignature(); +// FileInputStream fis = null; +// try { +// fis = new FileInputStream(new File(s1)); +// byte[] bytes = readInputStream(fis); +// farView.setData(bytes); +// } catch (Exception e) { +// e.printStackTrace(); +// } +// result1.put("1", farView); +// } // 审核人签名 - if (StringUtil.isNotBlank(entrust.getVerifyBy())) { - User user = userClient.userInfoById(Long.parseLong(entrust.getVerifyBy())).getData(); - ImageEntity farView = new ImageEntity(); - farView.setHeight(50);//设置高度 - farView.setWidth(90);//设置宽度 - farView.setType(ImageEntity.Data);//类型 - String s1 = path + user.getElectronicSignature(); - FileInputStream fis = null; - try { - fis = new FileInputStream(new File(s1)); - byte[] bytes = readInputStream(fis); - farView.setData(bytes); - } catch (Exception e) { - e.printStackTrace(); - } - result1.put("2", farView); - } +// if (StringUtil.isNotBlank(entrust.getVerifyBy())) { +// User user = userClient.userInfoById(Long.parseLong(entrust.getVerifyBy())).getData(); +// ImageEntity farView = new ImageEntity(); +// farView.setHeight(50);//设置高度 +// farView.setWidth(90);//设置宽度 +// farView.setType(ImageEntity.Data);//类型 +// String s1 = path + user.getElectronicSignature(); +// FileInputStream fis = null; +// try { +// fis = new FileInputStream(new File(s1)); +// byte[] bytes = readInputStream(fis); +// farView.setData(bytes); +// } catch (Exception e) { +// e.printStackTrace(); +// } +// result1.put("2", farView); +// } // 审批人签名 - if (StringUtil.isNotBlank(entrust.getApprovalBy())) { - User user = userClient.userInfoById(Long.parseLong(entrust.getApprovalBy())).getData(); - ImageEntity farView = new ImageEntity(); - farView.setHeight(50);//设置高度 - farView.setWidth(90);//设置宽度 - farView.setType(ImageEntity.Data);//类型 - String s1 = path + user.getElectronicSignature(); - FileInputStream fis = null; - try { - fis = new FileInputStream(new File(s1)); - byte[] bytes = readInputStream(fis); - farView.setData(bytes); - } catch (Exception e) { - e.printStackTrace(); - } - result1.put("3", farView); - } +// if (StringUtil.isNotBlank(entrust.getApprovalBy())) { +// User user = userClient.userInfoById(Long.parseLong(entrust.getApprovalBy())).getData(); +// ImageEntity farView = new ImageEntity(); +// farView.setHeight(50);//设置高度 +// farView.setWidth(90);//设置宽度 +// farView.setType(ImageEntity.Data);//类型 +// String s1 = path + user.getElectronicSignature(); +// FileInputStream fis = null; +// try { +// fis = new FileInputStream(new File(s1)); +// byte[] bytes = readInputStream(fis); +// farView.setData(bytes); +// } catch (Exception e) { +// e.printStackTrace(); +// } +// result1.put("3", farView); +// } // 盖章图片 // ImageEntity farView = new ImageEntity(); // farView.setHeight(80);//设置高度 @@ -1133,9 +1135,23 @@ public class EntrustServiceImpl extends BaseServiceImpl } } } - String s = yangNum + "份为阳性," + yinNum + "份为阴性"; - if (keyiNum > 0) { - s += "," + keyiNum + "份为可疑"; + String s = "共" + examine.getSimpleCount() + "份样品,"; + if (yangNum == examine.getSimpleCount()) { + s += "均为阳性"; + } else if (yinNum == examine.getSimpleCount()) { + s += "均为阴性"; + } else if (keyiNum == examine.getSimpleCount()) { + s += "均为可疑"; + } else { + if (yangNum > 0) { + s += yangNum + "份为阳性 "; + } + if (yinNum > 0) { + s += yinNum + "份为阴性 "; + } + if (keyiNum > 0) { + s += keyiNum + "份为可疑"; + } } map.put("examineResult", s); ItemAndAllList.add(map); @@ -1255,10 +1271,10 @@ public class EntrustServiceImpl extends BaseServiceImpl if (i == (split2.length - 1)) { instrumentName += s2; } else { - instrumentName += s2 + "\r"; + instrumentName += s2 + ","; } } - result.put("9", instrumentName); + result.put("9", instrumentName.replace(",", "\r")); // String value = DictBizCache.getValue(DictBizEnum.SIMPLE_STATUS, examineResult.getSimpleStatus()); result.put("10", examineResult.getSimpleStatus()); result.put("11", "温度" + examineResult.getTemperature() + "℃; " + "湿度" + examineResult.getHumidity() + "%RH"); @@ -1896,7 +1912,7 @@ public class EntrustServiceImpl extends BaseServiceImpl Map map = new HashMap<>(); if (j == 0) { map.put("1", s + "(" + startNum + "-" + endNum + ")"); - map.put("0", "布板图"); + map.put("13", "布板图"); } else if (j == 1) { map.put("0", " "); map.put("1", "1"); @@ -2006,7 +2022,7 @@ public class EntrustServiceImpl extends BaseServiceImpl ExamineDataArrVO examineDataArrVO = new ExamineDataArrVO(); examineDataArrVO.setNum("临界值"); examineDataArrVO.setValue(""); - examineDataArrVO.setResult(format2); + examineDataArrVO.setLog2(format2); list1.add(examineDataArrVO); for (int j = 0; j < 96; j++) { ExamineDataArrVO vo = list.get((i * 96) + j); @@ -2181,7 +2197,7 @@ public class EntrustServiceImpl extends BaseServiceImpl Map map = new HashMap<>(); if (j == 0) { map.put("1", s + "(" + startNum + "-" + endNum + ")"); - map.put("0", "布板图"); + map.put("13", "布板图"); } else if (j == 1) { map.put("0", " "); map.put("1", "1"); @@ -2291,7 +2307,7 @@ public class EntrustServiceImpl extends BaseServiceImpl ExamineDataArrVO examineDataArrVO = new ExamineDataArrVO(); examineDataArrVO.setNum("临界值"); examineDataArrVO.setValue(""); - examineDataArrVO.setResult(format2); + examineDataArrVO.setLog2(format2); list1.add(examineDataArrVO); for (int j = 0; j < 96; j++) { ExamineDataArrVO vo = list.get((i * 96) + j); @@ -2466,7 +2482,7 @@ public class EntrustServiceImpl extends BaseServiceImpl Map map = new HashMap<>(); if (j == 0) { map.put("1", s + "(" + startNum + "-" + endNum + ")"); - map.put("0", "布板图"); + map.put("13", "布板图"); } else if (j == 1) { map.put("0", " "); map.put("1", "1"); @@ -2723,12 +2739,12 @@ public class EntrustServiceImpl extends BaseServiceImpl } } } - for (int j = 0; j < 10; j++) { int x = 0; Map map = new HashMap<>(); if (j == 0) { map.put("1", s + "(" + startNum + "-" + endNum + ")"); + map.put("13", "布板图"); } else if (j == 1) { map.put("0", " "); map.put("1", "1"); @@ -2871,7 +2887,7 @@ public class EntrustServiceImpl extends BaseServiceImpl Map map = new HashMap<>(); if (j == 0) { map.put("1", s + "(" + startNum + "-" + endNum + ")"); - map.put("0", "布板图"); + map.put("13", "布板图"); } else if (j == 1) { map.put("0", " "); map.put("1", "1");