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/domain/dto/DeathBaseInfoDTO.java

@@ -237,5 +237,12 @@
    @Excel(name = "心死亡证明附件")
    private String heartdeathjudgeannex;

    /**
     * 死亡扩展内容
     */
    @ApiModelProperty("死亡扩展内容")
    @Excel(name = "死亡扩展内容")
    private String extContent;

}


 ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoReportServiceImpl.java

@@ -141,6 +141,9 @@
        serviceDonatebaseinfo1.setRegisterprovincename(serviceDonatebaseinfoReport.getRegisterprovincename());
        serviceDonatebaseinfo1.setRegistercityname(serviceDonatebaseinfoReport.getRegistercityname());
        serviceDonatebaseinfo1.setRegistertown(serviceDonatebaseinfoReport.getRegistertownname());
        serviceDonatebaseinfo1.setReportHospital(serviceDonatebaseinfoReport.getToHospital());
        serviceDonatebaseinfo1.setFirstDept(serviceDonatebaseinfoReport.getDeptName());
        serviceDonatebaseinfo1.setCaseNo(null);
        //先通过caseNo查询是否存在
        ServiceDonatebaseinfo serviceDonatebaseinfo = new ServiceDonatebaseinfo();
        serviceDonatebaseinfo.setCaseNo(serviceDonatebaseinfoReport.getCaseNo());

 ruoyi-project/src/main/resources/mapper/project/ServiceDeathinfoMapper.xml

@@ -121,7 +121,8 @@
        sdi.heartDeathReason as heartdeathreason,
        sdi.heartDeathJudgeDoctO as heartdeathjudgedocto,
        sdi.heartDeathJudgeDoctT as heartdeathjudgedoctt,
        sdi.heartDeathJudgeAnnex as heartdeathjudgeannex
        sdi.heartDeathJudgeAnnex as heartdeathjudgeannex,
        sdi.ext_Content as extContent
        FROM
        service_donatebaseinfo sd
        LEFT JOIN service_deathinfo sdi ON sd.ID = sdi.InfoID