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 8664574..9090611 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 @@ -1686,7 +1686,7 @@ public class ExamineResultController extends BladeController { * 上传检测结果照片 */ @PostMapping("/resultPicture") - public R resultPicture(@RequestParam MultipartFile file, @RequestParam String examineId) { + public R resultPicture(@RequestParam MultipartFile file, @RequestParam(required=false) String examineId) { return R.data(service.resultPicture(file, examineId)); } } \ No newline at end of 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 623cd85..8c1e593 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 @@ -977,7 +977,7 @@ public class EntrustServiceImpl extends BaseServiceImpl // 图片路劲 String path = sysClient.getParamValue("electronic_signature_real_path").getData(); // 编制人签名 - if (StringUtil.isBlank(entrust.getOrganizationBy())) { + if (StringUtil.isNotBlank(entrust.getOrganizationBy())) { User user = userClient.userInfoById(Long.parseLong(entrust.getOrganizationBy())).getData(); ImageEntity farView = new ImageEntity(); farView.setHeight(50);//设置高度 @@ -995,7 +995,7 @@ public class EntrustServiceImpl extends BaseServiceImpl result1.put("1", farView); } // 审核人签名 - if (StringUtil.isBlank(entrust.getVerifyBy())) { + if (StringUtil.isNotBlank(entrust.getVerifyBy())) { User user = userClient.userInfoById(Long.parseLong(entrust.getVerifyBy())).getData(); ImageEntity farView = new ImageEntity(); farView.setHeight(50);//设置高度 @@ -1013,7 +1013,7 @@ public class EntrustServiceImpl extends BaseServiceImpl result1.put("2", farView); } // 审批人签名 - if (StringUtil.isBlank(entrust.getApprovalBy())) { + if (StringUtil.isNotBlank(entrust.getApprovalBy())) { User user = userClient.userInfoById(Long.parseLong(entrust.getApprovalBy())).getData(); ImageEntity farView = new ImageEntity(); farView.setHeight(50);//设置高度