ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoReportController.java
@@ -138,9 +138,10 @@ @RepeatSubmit public AjaxResult add(@RequestBody ServiceDonatebaseinfoReport serviceDonatebaseinfoReport) { //生成案例上报ID String caseNo = String.valueOf(IdGeneratorUtils.nextId()); serviceDonatebaseinfoReport.setCaseNo(caseNo); if(ObjectUtils.isEmpty(serviceDonatebaseinfoReport.getCaseNo())) { String caseNo = String.valueOf(IdGeneratorUtils.nextId()); serviceDonatebaseinfoReport.setCaseNo(caseNo); } //获取协调员信息 LoginUser loginUser = SecurityUtils.getLoginUser(); String userName = loginUser.getUser().getUserName(); ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceTransportController.java
@@ -63,14 +63,14 @@ @ApiOperation("转运登记状态统计") // @PreAuthorize("@ss.hasPermi('system:transport:list')") @PostMapping("/totalServiceTransportState") public List<Map<String,Object>> totalState(@RequestBody ServiceTransport serviceTransport) { public AjaxResult totalState(@RequestBody ServiceTransport serviceTransport) { Long userId= getUserId(); SysUser user = userService.selectUserById(userId); if(user!=null&&user.getUserType()!=null&&!user.getUserType().equals("00")){ serviceTransport.setNotAdminId(user.getUserName()); } return serviceTransportService.totalState(serviceTransport); return AjaxResult.success(serviceTransportService.totalState(serviceTransport)); } /** ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoReportServiceImpl.java
@@ -141,6 +141,8 @@ serviceDonatebaseinfo1.setRegisterprovincename(serviceDonatebaseinfoReport.getRegisterprovincename()); serviceDonatebaseinfo1.setRegistercityname(serviceDonatebaseinfoReport.getRegistercityname()); serviceDonatebaseinfo1.setRegistertown(serviceDonatebaseinfoReport.getRegistertownname()); serviceDonatebaseinfo1.setReportHospital(serviceDonatebaseinfoReport.getToHospital()); serviceDonatebaseinfo1.setFirstDept(serviceDonatebaseinfoReport.getDeptName()); //先通过caseNo查询是否存在 ServiceDonatebaseinfo serviceDonatebaseinfo = new ServiceDonatebaseinfo(); serviceDonatebaseinfo.setCaseNo(serviceDonatebaseinfoReport.getCaseNo());
