上传命名规则调整

sinake

2 天以前 d6e936e3dcb645658fa7e0c3e02c1daa30bfeb68

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoController.java

@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.project;

import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.config.RuoYiConfig;
@@ -13,9 +14,12 @@
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.config.ServerConfig;
import com.ruoyi.project.common.CalculateDateUtils;
import com.ruoyi.project.domain.ServiceDonatebaseinfo;
import com.ruoyi.project.domain.ServiceDonationwitness;
import com.ruoyi.project.domain.vo.TimeVO;
import com.ruoyi.project.service.IServiceDonatebaseinfoService;
import com.ruoyi.project.service.IServiceDonationwitnessService;
import com.ruoyi.project.service.IServiceExternalpersonService;
import com.ruoyi.system.mapper.SysDeptMapper;
import freemarker.template.Configuration;
@@ -23,14 +27,16 @@
import freemarker.template.TemplateException;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;

import java.io.*;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.ZoneId;
import java.util.*;

//import javafx.scene.input.DataFormat;


/**
@@ -39,6 +45,7 @@
 * @author ruoyi
 * @date 2021-11-10
 */
@Slf4j
@Api("潜在捐献信息管理")
@RestController
@RequestMapping("/project/donatebaseinfo")
@@ -47,10 +54,10 @@
    private IServiceDonatebaseinfoService serviceDonatebaseinfoService;

    @Autowired
    private IServiceExternalpersonService serviceExternalpersonService;
    private IServiceDonationwitnessService serviceDonationwitnessService;

    @Autowired
    private ServerConfig serverConfig;
    private IServiceExternalpersonService serviceExternalpersonService;

    @Autowired
    private SysDeptMapper sysDeptMapper;
@@ -67,32 +74,45 @@
     * 查询捐献基础列表
     */
    @ApiOperation("潜在捐献信息列表")
    //@PreAuthorize("@ss.hasPermi('project:donatebaseinfo:list')")
    //// @PreAuthorize("@ss.hasPermi('project:donatebaseinfo:list')")
    @GetMapping("/list")
    public TableDataInfo list(ServiceDonatebaseinfo serviceDonatebaseinfo) {
        log.info("潜在捐献信息列表：{}", serviceDonatebaseinfo);
        startPage();
        //List<ServiceDonatebaseinfo> list = serviceDonatebaseinfoService.queryList(serviceDonatebaseinfo);
        List<ServiceDonatebaseinfo> list = serviceDonatebaseinfoService.selectServiceDonatebaseinfoList(serviceDonatebaseinfo);
        return getDataTable(list);
    }

    /**
     * 查询潜在捐献患者信息列表不与base_organization关联
     */
    @ApiOperation("潜在捐献患者信息列表")
    //// @PreAuthorize("@ss.hasPermi('project:donatebaseinfo:list')")
    @GetMapping("/getpatname")
    public TableDataInfo getPatName(ServiceDonatebaseinfo serviceDonatebaseinfo) {
        log.info("潜在捐献患者信息列表：{}", serviceDonatebaseinfo);
        List<ServiceDonatebaseinfo> list = serviceDonatebaseinfoService.getPatName(serviceDonatebaseinfo);
        return getDataTable(list);
    }

    @ApiOperation("小程序端潜在捐献信息列表")
    @GetMapping("/listForSearch")
    public TableDataInfo listForSearch(ServiceDonatebaseinfo serviceDonatebaseinfo) {
        log.info("小程序端潜在捐献信息列表：{}", serviceDonatebaseinfo);
        startPage();
        List<ServiceDonatebaseinfo> list = serviceDonatebaseinfoService.listForSearch(serviceDonatebaseinfo);
        return getDataTable(list);
    }


    /**
     * 导出捐献基础列表
     */
    @ApiOperation("导出潜在捐献信息列表")
    //@PreAuthorize("@ss.hasPermi('project:donatebaseinfo:export')")
    //// @PreAuthorize("@ss.hasPermi('project:donatebaseinfo:export')")
    @Log(title = "捐献基础", businessType = BusinessType.EXPORT)
    @GetMapping("/export")
    public AjaxResult export(ServiceDonatebaseinfo serviceDonatebaseinfo) {
        log.info("导出潜在捐献信息列表：{}", serviceDonatebaseinfo);
        List<ServiceDonatebaseinfo> list = serviceDonatebaseinfoService.queryList(serviceDonatebaseinfo);
        ExcelUtil<ServiceDonatebaseinfo> util = new ExcelUtil<ServiceDonatebaseinfo>(ServiceDonatebaseinfo.class);
        return util.exportExcel(list, "捐献基础数据");
@@ -102,36 +122,57 @@
     * 获取捐献基础详细信息
     */
    @ApiOperation("通过id获得潜在捐献信息")
    //@PreAuthorize("@ss.hasPermi('project:donatebaseinfo:query')")
    //// @PreAuthorize("@ss.hasPermi('project:donatebaseinfo:query')")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id) {
        return AjaxResult.success(serviceDonatebaseinfoService.getById(id));
        log.info("通过id获得潜在捐献信息：{}", id);
        ServiceDonatebaseinfo serviceDonatebaseinfo = serviceDonatebaseinfoService.getById(id);
        if (serviceDonatebaseinfo.getBirthday() != null) {
            Map<String, String> map = CalculateDateUtils.calculateAge(serviceDonatebaseinfo.getBirthday().toInstant().atZone(ZoneId.systemDefault()).toLocalDate(), LocalDate.now());
            serviceDonatebaseinfo.setAge(org.apache.commons.lang3.ObjectUtils.isNotEmpty(map.get("age")) ? Long.valueOf(map.get("age")) : null);
            serviceDonatebaseinfo.setAgeunit(map.get("ageUnit"));
            serviceDonatebaseinfo.setAge2(org.apache.commons.lang3.ObjectUtils.isNotEmpty(map.get("age2")) ? Long.valueOf(map.get("age2")) : null);
            serviceDonatebaseinfo.setAgeunit2(map.get("ageUnit2"));
        }

        serviceDonatebaseinfo.setAgeunit("-");
        serviceDonatebaseinfo.setAge(null);
        serviceDonatebaseinfo.setAge2(null);

        //获取死亡时间，如果获取见证里有死亡时间，则进行计算他的年龄
        ServiceDonationwitness sdw = new ServiceDonationwitness();
        sdw.setInfoid(serviceDonatebaseinfo.getId());
        List<ServiceDonationwitness> serviceDonationwitnessList = serviceDonationwitnessService.selectServiceDonationwitnessList(sdw);
        if (!CollectionUtils.isEmpty(serviceDonationwitnessList) && serviceDonatebaseinfo.getBirthday() != null) {
            Date deathtime = serviceDonationwitnessList.get(0).getDeathtime();
            if (ObjectUtils.isNotEmpty(deathtime)) {
                Map<String, String> map = CalculateDateUtils.calculateAge(serviceDonatebaseinfo.getBirthday().toInstant().atZone(ZoneId.systemDefault()).toLocalDate(), deathtime.toInstant().atZone(ZoneId.systemDefault()).toLocalDate());
                if (Objects.isNull(map)) {
                    log.error("serviceDonatebaseinfo出生日期：{},serviceDonatebaseinfo死亡日期：{}", serviceDonatebaseinfo.getBirthday(), deathtime);
                }
                serviceDonatebaseinfo.setAge(org.apache.commons.lang3.ObjectUtils.isNotEmpty(map.get("age")) ? Long.valueOf(map.get("age")) : null);
                serviceDonatebaseinfo.setAgeunit(map.get("ageUnit"));
                serviceDonatebaseinfo.setAge2(org.apache.commons.lang3.ObjectUtils.isNotEmpty(map.get("age2")) ? Long.valueOf(map.get("age2")) : null);
                serviceDonatebaseinfo.setAgeunit2(map.get("ageUnit2"));
            }
        }


        return AjaxResult.success(serviceDonatebaseinfo);
    }

    /**
     * 新增捐献基础
     */
    @ApiOperation("新增潜在捐献信息")
    //@PreAuthorize("@ss.hasPermi('project:donatebaseinfo:add')")
    //// @PreAuthorize("@ss.hasPermi('project:donatebaseinfo:add')")
    @Log(title = "捐献基础", businessType = BusinessType.INSERT)
    @PostMapping
    @PostMapping("/add")
    @RepeatSubmit
    public AjaxResult add(@RequestBody ServiceDonatebaseinfo serviceDonatebaseinfo) {
        log.info("新增潜在捐献信息：{}", serviceDonatebaseinfo);
        SysUser user = SecurityUtils.getLoginUser().getUser();

        String bh = "";
        bh = serviceDonatebaseinfoService.getDonateNumber(serviceDonatebaseinfo);
        if (bh == "") {
            return AjaxResult.error("新增时生成的编号为空,创建失败!");
        } else {
            ServiceDonatebaseinfo serviceDonatebaseinfo1 = new ServiceDonatebaseinfo();
            serviceDonatebaseinfo1.setDonorno(bh);
            List<ServiceDonatebaseinfo> listrecord = serviceDonatebaseinfoService.queryList(serviceDonatebaseinfo1);
            if (listrecord.size() > 0) {
                return AjaxResult.error("新增时生成的编号" + bh + "已存在,无法保存!");
            }

        }
        String idcardno = serviceDonatebaseinfo.getIdcardno();
        ServiceDonatebaseinfo serviceDonatebaseinfo2 = new ServiceDonatebaseinfo();
        serviceDonatebaseinfo2.setIdcardno(idcardno);
@@ -140,7 +181,7 @@
            return AjaxResult.error("新增时身份证" + idcardno + "已存在,无法保存!");
        }

        serviceDonatebaseinfo.setDonorno(bh);
        //  serviceDonatebaseinfo.setDonorno(bh);
        serviceDonatebaseinfo.setDeptid(user.getDeptId());
        serviceDonatebaseinfo.setDeptname(sysDeptMapper.getDeptNameByDeptId(user.getDeptId()));
        serviceDonatebaseinfoService.save(serviceDonatebaseinfo);
@@ -153,11 +194,12 @@
     * 修改捐献基础
     */
    @ApiOperation("修改潜在捐献信息")
    //@PreAuthorize("@ss.hasPermi('project:donatebaseinfo:edit')")
    //// @PreAuthorize("@ss.hasPermi('project:donatebaseinfo:edit')")
    @Log(title = "捐献基础", businessType = BusinessType.UPDATE)
    @PostMapping("/edit")
    @RepeatSubmit
    public AjaxResult edit(@RequestBody ServiceDonatebaseinfo serviceDonatebaseinfo) {
        log.info("修改潜在捐献信息：{}", serviceDonatebaseinfo);
        return toAjax(serviceDonatebaseinfoService.updateById(serviceDonatebaseinfo));
    }

@@ -165,16 +207,18 @@
     * 删除捐献基础
     */
    @ApiOperation("删除潜在捐献信息")
    //@PreAuthorize("@ss.hasPermi('project:donatebaseinfo:remove')")
    //// @PreAuthorize("@ss.hasPermi('project:donatebaseinfo:remove')")
    @Log(title = "捐献基础", businessType = BusinessType.DELETE)
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids) {
        log.info("删除潜在捐献信息：{}", ids);
        return toAjax(serviceDonatebaseinfoService.removeByIds(Arrays.asList(ids)));
    }

    @ApiOperation("获取捐献编号")
    @GetMapping("/donatenumber")
    public AjaxResult getDonateNumber(ServiceDonatebaseinfo serviceDonatebaseinfo) {
    @PostMapping("/donatenumber")
    public AjaxResult getDonateNumber(@RequestBody ServiceDonatebaseinfo serviceDonatebaseinfo) {
        log.info("获取捐献编号：{}", serviceDonatebaseinfo);
        return AjaxResult.success(serviceDonatebaseinfoService.getDonateNumber(serviceDonatebaseinfo));
    }

@@ -182,11 +226,13 @@
    @ApiOperation("获取捐献报告人")
    @GetMapping("/reportName/{usertype}")
    public AjaxResult getReportName(@PathVariable("usertype") String usertype) {
        log.info("获取捐献报告人：{}", usertype);
        return AjaxResult.success(serviceExternalpersonService.getReportName(usertype));
    }

    @GetMapping(value = "/updateS1S2S3S4/{id}")
    public AjaxResult updateS1S2S3S4(@PathVariable Long id) {
        log.info("updateS1S2S3S4的入参：{}", id);
        return AjaxResult.success(serviceDonatebaseinfoService.updateS1S2S3S4(id));
    }

@@ -196,6 +242,7 @@
    @ApiOperation("通过id下载人体器官潜在捐献者登记表")
    @GetMapping(value = "/download/{id}")
    public Map downloadInfo(@PathVariable("id") Long id) throws IOException {
        log.info("通过id下载人体器官潜在捐献者登记表：{}", id);
        Map dataMap = new HashMap();
        getData(dataMap, id);
        String filePath = getClass().getResource("/template/").getPath();
@@ -215,21 +262,20 @@

        //输出文档路径及名称
        File outFile = new File(RuoYiConfig.getProfile() + "/download/wordtemplate/" + name + ".doc");
        Writer out = null;

        try {
            out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(outFile), "utf-8"));

        } catch (FileNotFoundException e1) {
            e1.printStackTrace();
        if (t == null) {
            throw new ServiceException("模板加载失败，请检查模板文件是否存在", HttpStatus.NO_CONTENT);
        }
        try {

        // Writer 必须关闭/刷新：BufferedWriter 带缓冲，不关闭会导致生成的 doc 内容不完整
        try (Writer out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(outFile), "utf-8"))) {
            t.process(dataMap, out);
        } catch (TemplateException e) {
            e.printStackTrace();
        } catch (TemplateException | IOException e) {
            log.error("生成模板文档失败, name={}", name, e);
            throw new ServiceException("生成文档失败", HttpStatus.ERROR);
        }
        Map<String, Object> map = new HashMap<>();
        map.put("downloadUrl", "/profile/download/wordtemplate/" + name + ".doc");
        map.put("downloadName", name + ".doc");
        return map;
    }

@@ -244,44 +290,56 @@
            throw new ServiceException("下载失败，用户信息出错", HttpStatus.NO_CONTENT);
        }

        // 以下字段在数据库中均可为空，统一取空串兜底，避免拼装模板时抛空指针异常
        String diseasetype = serviceDonatebaseinfo.getDiseasetype() == null ? "" : serviceDonatebaseinfo.getDiseasetype();
        String infectious = serviceDonatebaseinfo.getInfectious() == null ? "" : serviceDonatebaseinfo.getInfectious();
        String infosources = serviceDonatebaseinfo.getInfosources() == null ? "" : serviceDonatebaseinfo.getInfosources();
        String selfwill = serviceDonatebaseinfo.getSelfwill() == null ? "" : serviceDonatebaseinfo.getSelfwill();
        String othercases = serviceDonatebaseinfo.getOthercases() == null ? "" : serviceDonatebaseinfo.getOthercases();
        String kinship = serviceDonatebaseinfo.getKinship() == null ? "" : serviceDonatebaseinfo.getKinship();
        String patientstate = serviceDonatebaseinfo.getPatientstate() == null ? "" : serviceDonatebaseinfo.getPatientstate();

        dataMap.put("JXBH", serviceDonatebaseinfo.getDonorno() == null ? "" : serviceDonatebaseinfo.getDonorno());
        dataMap.put("SZYLJG", serviceDonatebaseinfo.getTreatmenthospitalname() == null ? "" : serviceDonatebaseinfo.getTreatmenthospitalname());
        dataMap.put("KS", serviceDonatebaseinfo.getTreatmentdeptname() == null ? "" : serviceDonatebaseinfo.getTreatmentdeptname());
        dataMap.put("XM", serviceDonatebaseinfo.getName() == null ? "" : serviceDonatebaseinfo.getName());
        if (serviceDonatebaseinfo.getSex().equals("0")) {
        if ("0".equals(serviceDonatebaseinfo.getSex())) {
            dataMap.put("XB", "未知的性别");
        } else if (serviceDonatebaseinfo.getSex().equals("1")) {
        } else if ("1".equals(serviceDonatebaseinfo.getSex())) {
            dataMap.put("XB", "男");
        } else if (serviceDonatebaseinfo.getSex().equals("2")) {
        } else if ("2".equals(serviceDonatebaseinfo.getSex())) {
            dataMap.put("XB", "女");
        }
        Date dt = serviceDonatebaseinfo.getBirthday();
        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        String date = formatter.format(dt);
        String time = date.substring(0, 10);
        dataMap.put("CSRQ", serviceDonatebaseinfo.getBirthday() == null ? "" : time);
        String csrq = "";
        if (serviceDonatebaseinfo.getBirthday() != null) {
            csrq = formatter.format(serviceDonatebaseinfo.getBirthday()).substring(0, 10);
        }
        dataMap.put("CSRQ", csrq);
        dataMap.put("GJ", serviceDonatebaseinfo.getNationality() == null ? "" : serviceDonatebaseinfo.getNationality());
        if (serviceDonatebaseinfo.getIdcardtype() == 1) {
        // idcardtype 为包装类型 Long，数据库中可为 NULL；先取值再判断，避免自动拆箱抛空指针
        Long idcardtype = serviceDonatebaseinfo.getIdcardtype();
        if (idcardtype != null && idcardtype == 1) {
            dataMap.put("ZJLX", "身份证");
        } else if (serviceDonatebaseinfo.getIdcardtype() == 2) {
        } else if (idcardtype != null && idcardtype == 2) {
            dataMap.put("ZJLX", "军人证");
        } else if (serviceDonatebaseinfo.getIdcardtype() == 3) {
        } else if (idcardtype != null && idcardtype == 3) {
            dataMap.put("ZJLX", "护照");
        } else if (serviceDonatebaseinfo.getIdcardtype() == 4) {
        } else if (idcardtype != null && idcardtype == 4) {
            dataMap.put("ZJLX", "户口本");
        } else if (serviceDonatebaseinfo.getIdcardtype() == 5) {
        } else if (idcardtype != null && idcardtype == 5) {
            dataMap.put("ZJLX", "外国人永久居住证");
        } else if (serviceDonatebaseinfo.getIdcardtype() == 6) {
        } else if (idcardtype != null && idcardtype == 6) {
            dataMap.put("ZJLX", "武警证");
        } else if (serviceDonatebaseinfo.getIdcardtype() == 10) {
        } else if (idcardtype != null && idcardtype == 10) {
            dataMap.put("ZJLX", "学生证");
        } else if (serviceDonatebaseinfo.getIdcardtype() == 11) {
        } else if (idcardtype != null && idcardtype == 11) {
            dataMap.put("ZJLX", "士兵证");
        } else if (serviceDonatebaseinfo.getIdcardtype() == 16) {
        } else if (idcardtype != null && idcardtype == 16) {
            dataMap.put("ZJLX", "港澳居民来往内地通行证");
        } else if (serviceDonatebaseinfo.getIdcardtype() == 17) {
        } else if (idcardtype != null && idcardtype == 17) {
            dataMap.put("ZJLX", "台湾居民来往大陆通行证");
        } else if (serviceDonatebaseinfo.getIdcardtype() == 18) {
        } else if (idcardtype != null && idcardtype == 18) {
            dataMap.put("ZJLX", "其他证件类型");
        }
        dataMap.put("ZJHM", serviceDonatebaseinfo.getIdcardno() == null ? "" : serviceDonatebaseinfo.getIdcardno());
@@ -298,28 +356,28 @@

        dataMap.put("ZYH", serviceDonatebaseinfo.getInpatientno() == null ? "" : serviceDonatebaseinfo.getInpatientno());

        if (serviceDonatebaseinfo.getBloodtype().equals("1")) {
        if ("1".equals(serviceDonatebaseinfo.getBloodtype())) {
            dataMap.put("XXA", (char) 8730);
            dataMap.put("XXB", "□");
            dataMap.put("XXO", "□");
            dataMap.put("XXAB", "□");
        } else if (serviceDonatebaseinfo.getBloodtype().equals("2")) {
        } else if ("2".equals(serviceDonatebaseinfo.getBloodtype())) {
            dataMap.put("XXA", "□");
            dataMap.put("XXB", (char) 8730);
            dataMap.put("XXO", "□");
            dataMap.put("XXAB", "□");
        } else if (serviceDonatebaseinfo.getBloodtype().equals("3")) {
        } else if ("3".equals(serviceDonatebaseinfo.getBloodtype())) {
            dataMap.put("XXA", "□");
            dataMap.put("XXB", "□");
            dataMap.put("XXO", (char) 8730);
            dataMap.put("XXAB", "□");
        } else if (serviceDonatebaseinfo.getBloodtype().equals("4")) {
        } else if ("4".equals(serviceDonatebaseinfo.getBloodtype())) {
            dataMap.put("XXA", "□");
            dataMap.put("XXB", "□");
            dataMap.put("XXO", "□");
            dataMap.put("XXAB", (char) 8730);
        }
        if (serviceDonatebaseinfo.getRhyin().equals("1")) {
        if ("1".equals(serviceDonatebaseinfo.getRhyin())) {
            dataMap.put("YX", (char) 8730);
        } else {
            dataMap.put("YX", "□");
@@ -328,22 +386,22 @@
        dataMap.put("JBZD", serviceDonatebaseinfo.getDiagnosisname() == null ? "" : serviceDonatebaseinfo.getDiagnosisname());

        //疾病类型
        if (serviceDonatebaseinfo.getDiseasetype().contains("0")) {
        if (diseasetype.contains("0")) {
            dataMap.put("NXGYW", (char) 8730);
            if (serviceDonatebaseinfo.getDiseasetype().contains("1")) {
            if (diseasetype.contains("1")) {
                dataMap.put("NWS", (char) 8730);
                if (serviceDonatebaseinfo.getDiseasetype().contains("2")) {
                if (diseasetype.contains("2")) {
                    dataMap.put("QXQY", (char) 8730);
                    if (serviceDonatebaseinfo.getDiseasetype().contains("3")) {
                    if (diseasetype.contains("3")) {
                        dataMap.put("NZL", (char) 8730);
                        if (serviceDonatebaseinfo.getDiseasetype().contains("4")) {
                        if (diseasetype.contains("4")) {
                            dataMap.put("XXGJB", (char) 8730);
                        } else {
                            dataMap.put("XXGJB", "□");
                        }
                    } else {
                        dataMap.put("NZL", "□");
                        if (serviceDonatebaseinfo.getDiseasetype().contains("4")) {
                        if (diseasetype.contains("4")) {
                            dataMap.put("XXGJB", (char) 8730);
                        } else {
                            dataMap.put("XXGJB", "□");
@@ -351,16 +409,16 @@
                    }
                } else {
                    dataMap.put("QXQY", "□");
                    if (serviceDonatebaseinfo.getDiseasetype().contains("3")) {
                    if (diseasetype.contains("3")) {
                        dataMap.put("NZL", (char) 8730);
                        if (serviceDonatebaseinfo.getDiseasetype().contains("4")) {
                        if (diseasetype.contains("4")) {
                            dataMap.put("XXGJB", (char) 8730);
                        } else {
                            dataMap.put("XXGJB", "□");
                        }
                    } else {
                        dataMap.put("NZL", "□");
                        if (serviceDonatebaseinfo.getDiseasetype().contains("4")) {
                        if (diseasetype.contains("4")) {
                            dataMap.put("XXGJB", (char) 8730);
                        } else {
                            dataMap.put("XXGJB", "□");
@@ -369,18 +427,18 @@
                }
            } else {
                dataMap.put("NWS", "□");
                if (serviceDonatebaseinfo.getDiseasetype().contains("2")) {
                if (diseasetype.contains("2")) {
                    dataMap.put("QXQY", (char) 8730);
                    if (serviceDonatebaseinfo.getDiseasetype().contains("3")) {
                    if (diseasetype.contains("3")) {
                        dataMap.put("NZL", (char) 8730);
                        if (serviceDonatebaseinfo.getDiseasetype().contains("4")) {
                        if (diseasetype.contains("4")) {
                            dataMap.put("XXGJB", (char) 8730);
                        } else {
                            dataMap.put("XXGJB", "□");
                        }
                    } else {
                        dataMap.put("NZL", "□");
                        if (serviceDonatebaseinfo.getDiseasetype().contains("4")) {
                        if (diseasetype.contains("4")) {
                            dataMap.put("XXGJB", (char) 8730);
                        } else {
                            dataMap.put("XXGJB", "□");
@@ -388,16 +446,16 @@
                    }
                } else {
                    dataMap.put("QXQY", "□");
                    if (serviceDonatebaseinfo.getDiseasetype().contains("3")) {
                    if (diseasetype.contains("3")) {
                        dataMap.put("NZL", (char) 8730);
                        if (serviceDonatebaseinfo.getDiseasetype().contains("4")) {
                        if (diseasetype.contains("4")) {
                            dataMap.put("XXGJB", (char) 8730);
                        } else {
                            dataMap.put("XXGJB", "□");
                        }
                    } else {
                        dataMap.put("NZL", "□");
                        if (serviceDonatebaseinfo.getDiseasetype().contains("4")) {
                        if (diseasetype.contains("4")) {
                            dataMap.put("XXGJB", (char) 8730);
                        } else {
                            dataMap.put("XXGJB", "□");
@@ -407,20 +465,20 @@
            }
        } else {
            dataMap.put("NXGYW", "□");
            if (serviceDonatebaseinfo.getDiseasetype().contains("1")) {
            if (diseasetype.contains("1")) {
                dataMap.put("NWS", (char) 8730);
                if (serviceDonatebaseinfo.getDiseasetype().contains("2")) {
                if (diseasetype.contains("2")) {
                    dataMap.put("QXQY", (char) 8730);
                    if (serviceDonatebaseinfo.getDiseasetype().contains("3")) {
                    if (diseasetype.contains("3")) {
                        dataMap.put("NZL", (char) 8730);
                        if (serviceDonatebaseinfo.getDiseasetype().contains("4")) {
                        if (diseasetype.contains("4")) {
                            dataMap.put("XXGJB", (char) 8730);
                        } else {
                            dataMap.put("XXGJB", "□");
                        }
                    } else {
                        dataMap.put("NZL", "□");
                        if (serviceDonatebaseinfo.getDiseasetype().contains("4")) {
                        if (diseasetype.contains("4")) {
                            dataMap.put("XXGJB", (char) 8730);
                        } else {
                            dataMap.put("XXGJB", "□");
@@ -428,16 +486,16 @@
                    }
                } else {
                    dataMap.put("QXQY", "□");
                    if (serviceDonatebaseinfo.getDiseasetype().contains("3")) {
                    if (diseasetype.contains("3")) {
                        dataMap.put("NZL", (char) 8730);
                        if (serviceDonatebaseinfo.getDiseasetype().contains("4")) {
                        if (diseasetype.contains("4")) {
                            dataMap.put("XXGJB", (char) 8730);
                        } else {
                            dataMap.put("XXGJB", "□");
                        }
                    } else {
                        dataMap.put("NZL", "□");
                        if (serviceDonatebaseinfo.getDiseasetype().contains("4")) {
                        if (diseasetype.contains("4")) {
                            dataMap.put("XXGJB", (char) 8730);
                        } else {
                            dataMap.put("XXGJB", "□");
@@ -446,18 +504,18 @@
                }
            } else {
                dataMap.put("NWS", "□");
                if (serviceDonatebaseinfo.getDiseasetype().contains("2")) {
                if (diseasetype.contains("2")) {
                    dataMap.put("QXQY", (char) 8730);
                    if (serviceDonatebaseinfo.getDiseasetype().contains("3")) {
                    if (diseasetype.contains("3")) {
                        dataMap.put("NZL", (char) 8730);
                        if (serviceDonatebaseinfo.getDiseasetype().contains("4")) {
                        if (diseasetype.contains("4")) {
                            dataMap.put("XXGJB", (char) 8730);
                        } else {
                            dataMap.put("XXGJB", "□");
                        }
                    } else {
                        dataMap.put("NZL", "□");
                        if (serviceDonatebaseinfo.getDiseasetype().contains("4")) {
                        if (diseasetype.contains("4")) {
                            dataMap.put("XXGJB", (char) 8730);
                        } else {
                            dataMap.put("XXGJB", "□");
@@ -465,16 +523,16 @@
                    }
                } else {
                    dataMap.put("QXQY", "□");
                    if (serviceDonatebaseinfo.getDiseasetype().contains("3")) {
                    if (diseasetype.contains("3")) {
                        dataMap.put("NZL", (char) 8730);
                        if (serviceDonatebaseinfo.getDiseasetype().contains("4")) {
                        if (diseasetype.contains("4")) {
                            dataMap.put("XXGJB", (char) 8730);
                        } else {
                            dataMap.put("XXGJB", "□");
                        }
                    } else {
                        dataMap.put("NZL", "□");
                        if (serviceDonatebaseinfo.getDiseasetype().contains("4")) {
                        if (diseasetype.contains("4")) {
                            dataMap.put("XXGJB", (char) 8730);
                        } else {
                            dataMap.put("XXGJB", "□");
@@ -488,20 +546,20 @@


        //传染病情况
        if (serviceDonatebaseinfo.getInfectious().contains("1")) {
        if (infectious.contains("1")) {
            dataMap.put("YG", (char) 8730);
            if (serviceDonatebaseinfo.getInfectious().contains("2")) {
            if (infectious.contains("2")) {
                dataMap.put("BG", (char) 8730);
                if (serviceDonatebaseinfo.getInfectious().contains("3")) {
                if (infectious.contains("3")) {
                    dataMap.put("MD", (char) 8730);
                    if (serviceDonatebaseinfo.getInfectious().contains("4")) {
                    if (infectious.contains("4")) {
                        dataMap.put("AZB", (char) 8730);
                    } else {
                        dataMap.put("AZB", "□");
                    }
                } else {
                    dataMap.put("MD", "□");
                    if (serviceDonatebaseinfo.getInfectious().contains("4")) {
                    if (infectious.contains("4")) {
                        dataMap.put("AZB", (char) 8730);
                    } else {
                        dataMap.put("AZB", "□");
@@ -509,16 +567,16 @@
                }
            } else {
                dataMap.put("BG", "□");
                if (serviceDonatebaseinfo.getInfectious().contains("3")) {
                if (infectious.contains("3")) {
                    dataMap.put("MD", (char) 8730);
                    if (serviceDonatebaseinfo.getInfectious().contains("4")) {
                    if (infectious.contains("4")) {
                        dataMap.put("AZB", (char) 8730);
                    } else {
                        dataMap.put("AZB", "□");
                    }
                } else {
                    dataMap.put("MD", "□");
                    if (serviceDonatebaseinfo.getInfectious().contains("4")) {
                    if (infectious.contains("4")) {
                        dataMap.put("AZB", (char) 8730);
                    } else {
                        dataMap.put("AZB", "□");
@@ -527,18 +585,18 @@
            }
        } else {
            dataMap.put("YG", "□");
            if (serviceDonatebaseinfo.getInfectious().contains("2")) {
            if (infectious.contains("2")) {
                dataMap.put("BG", (char) 8730);
                if (serviceDonatebaseinfo.getInfectious().contains("3")) {
                if (infectious.contains("3")) {
                    dataMap.put("MD", (char) 8730);
                    if (serviceDonatebaseinfo.getInfectious().contains("4")) {
                    if (infectious.contains("4")) {
                        dataMap.put("AZB", (char) 8730);
                    } else {
                        dataMap.put("AZB", "□");
                    }
                } else {
                    dataMap.put("MD", "□");
                    if (serviceDonatebaseinfo.getInfectious().contains("4")) {
                    if (infectious.contains("4")) {
                        dataMap.put("AZB", (char) 8730);
                    } else {
                        dataMap.put("AZB", "□");
@@ -546,16 +604,16 @@
                }
            } else {
                dataMap.put("BG", "□");
                if (serviceDonatebaseinfo.getInfectious().contains("3")) {
                if (infectious.contains("3")) {
                    dataMap.put("MD", (char) 8730);
                    if (serviceDonatebaseinfo.getInfectious().contains("4")) {
                    if (infectious.contains("4")) {
                        dataMap.put("AZB", (char) 8730);
                    } else {
                        dataMap.put("AZB", "□");
                    }
                } else {
                    dataMap.put("MD", "□");
                    if (serviceDonatebaseinfo.getInfectious().contains("4")) {
                    if (infectious.contains("4")) {
                        dataMap.put("AZB", (char) 8730);
                    } else {
                        dataMap.put("AZB", "□");
@@ -565,16 +623,16 @@
        }
        dataMap.put("CRBQT", serviceDonatebaseinfo.getInfectiousOther() == null ? "" : serviceDonatebaseinfo.getInfectiousOther());
        //病人状况
        if (serviceDonatebaseinfo.getPatientstate().contains("0")) {
        if (patientstate.contains("0")) {
            dataMap.put("SDHM", (char) 8730);
            if (serviceDonatebaseinfo.getPatientstate().contains("1")) {
            if (patientstate.contains("1")) {
                dataMap.put("WZZHX", (char) 8730);
            } else {
                dataMap.put("WZZHX", "□");
            }
        } else {
            dataMap.put("SDHM", "□");
            if (serviceDonatebaseinfo.getPatientstate().contains("1")) {
            if (patientstate.contains("1")) {
                dataMap.put("WZZHX", (char) 8730);
            } else {
                dataMap.put("WZZHX", "□");
@@ -582,20 +640,20 @@
        }

        //其他情况
        if (serviceDonatebaseinfo.getOthercases().contains("0")) {
        if (othercases.contains("0")) {
            dataMap.put("JTSG", (char) 8730);
            if (serviceDonatebaseinfo.getOthercases().contains("1")) {
            if (othercases.contains("1")) {
                dataMap.put("XSAJ", (char) 8730);
                if (serviceDonatebaseinfo.getOthercases().contains("2")) {
                if (othercases.contains("2")) {
                    dataMap.put("GSSG", (char) 8730);
                    if (serviceDonatebaseinfo.getOthercases().contains("3")) {
                    if (othercases.contains("3")) {
                        dataMap.put("QTYWSG", (char) 8730);
                    } else {
                        dataMap.put("QTYWSG", "□");
                    }
                } else {
                    dataMap.put("GSSG", "□");
                    if (serviceDonatebaseinfo.getOthercases().contains("3")) {
                    if (othercases.contains("3")) {
                        dataMap.put("QTYWSG", (char) 8730);
                    } else {
                        dataMap.put("QTYWSG", "□");
@@ -603,16 +661,16 @@
                }
            } else {
                dataMap.put("XSAJ", "□");
                if (serviceDonatebaseinfo.getOthercases().contains("2")) {
                if (othercases.contains("2")) {
                    dataMap.put("GSSG", (char) 8730);
                    if (serviceDonatebaseinfo.getOthercases().contains("3")) {
                    if (othercases.contains("3")) {
                        dataMap.put("QTYWSG", (char) 8730);
                    } else {
                        dataMap.put("QTYWSG", "□");
                    }
                } else {
                    dataMap.put("GSSG", "□");
                    if (serviceDonatebaseinfo.getOthercases().contains("3")) {
                    if (othercases.contains("3")) {
                        dataMap.put("QTYWSG", (char) 8730);
                    } else {
                        dataMap.put("QTYWSG", "□");
@@ -621,18 +679,18 @@
            }
        } else {
            dataMap.put("JTSG", "□");
            if (serviceDonatebaseinfo.getOthercases().contains("1")) {
            if (othercases.contains("1")) {
                dataMap.put("XSAJ", (char) 8730);
                if (serviceDonatebaseinfo.getOthercases().contains("2")) {
                if (othercases.contains("2")) {
                    dataMap.put("GSSG", (char) 8730);
                    if (serviceDonatebaseinfo.getOthercases().contains("3")) {
                    if (othercases.contains("3")) {
                        dataMap.put("QTYWSG", (char) 8730);
                    } else {
                        dataMap.put("QTYWSG", "□");
                    }
                } else {
                    dataMap.put("GSSG", "□");
                    if (serviceDonatebaseinfo.getOthercases().contains("3")) {
                    if (othercases.contains("3")) {
                        dataMap.put("QTYWSG", (char) 8730);
                    } else {
                        dataMap.put("QTYWSG", "□");
@@ -640,16 +698,16 @@
                }
            } else {
                dataMap.put("XSAJ", "□");
                if (serviceDonatebaseinfo.getOthercases().contains("2")) {
                if (othercases.contains("2")) {
                    dataMap.put("GSSG", (char) 8730);
                    if (serviceDonatebaseinfo.getOthercases().contains("3")) {
                    if (othercases.contains("3")) {
                        dataMap.put("QTYWSG", (char) 8730);
                    } else {
                        dataMap.put("QTYWSG", "□");
                    }
                } else {
                    dataMap.put("GSSG", "□");
                    if (serviceDonatebaseinfo.getOthercases().contains("3")) {
                    if (othercases.contains("3")) {
                        dataMap.put("QTYWSG", (char) 8730);
                    } else {
                        dataMap.put("QTYWSG", "□");
@@ -659,20 +717,20 @@
        }

        //情亲属关系情况
        if (serviceDonatebaseinfo.getKinship().contains("0")) {
        if (kinship.contains("0")) {
            dataMap.put("PE", (char) 8730);
            if (serviceDonatebaseinfo.getKinship().contains("1")) {
            if (kinship.contains("1")) {
                dataMap.put("ZN", (char) 8730);
                if (serviceDonatebaseinfo.getKinship().contains("2")) {
                if (kinship.contains("2")) {
                    dataMap.put("FQ", (char) 8730);
                    if (serviceDonatebaseinfo.getKinship().contains("3")) {
                    if (kinship.contains("3")) {
                        dataMap.put("MQ", (char) 8730);
                    } else {
                        dataMap.put("MQ", "□");
                    }
                } else {
                    dataMap.put("FQ", "□");
                    if (serviceDonatebaseinfo.getKinship().contains("3")) {
                    if (kinship.contains("3")) {
                        dataMap.put("MQ", (char) 8730);
                    } else {
                        dataMap.put("MQ", "□");
@@ -680,16 +738,16 @@
                }
            } else {
                dataMap.put("ZN", "□");
                if (serviceDonatebaseinfo.getKinship().contains("2")) {
                if (kinship.contains("2")) {
                    dataMap.put("FQ", (char) 8730);
                    if (serviceDonatebaseinfo.getKinship().contains("3")) {
                    if (kinship.contains("3")) {
                        dataMap.put("MQ", (char) 8730);
                    } else {
                        dataMap.put("MQ", "□");
                    }
                } else {
                    dataMap.put("FQ", "□");
                    if (serviceDonatebaseinfo.getKinship().contains("3")) {
                    if (kinship.contains("3")) {
                        dataMap.put("MQ", (char) 8730);
                    } else {
                        dataMap.put("MQ", "□");
@@ -698,18 +756,18 @@
            }
        } else {
            dataMap.put("PE", "□");
            if (serviceDonatebaseinfo.getKinship().contains("1")) {
            if (kinship.contains("1")) {
                dataMap.put("ZN", (char) 8730);
                if (serviceDonatebaseinfo.getKinship().contains("2")) {
                if (kinship.contains("2")) {
                    dataMap.put("FQ", (char) 8730);
                    if (serviceDonatebaseinfo.getKinship().contains("3")) {
                    if (kinship.contains("3")) {
                        dataMap.put("MQ", (char) 8730);
                    } else {
                        dataMap.put("MQ", "□");
                    }
                } else {
                    dataMap.put("FQ", "□");
                    if (serviceDonatebaseinfo.getKinship().contains("3")) {
                    if (kinship.contains("3")) {
                        dataMap.put("MQ", (char) 8730);
                    } else {
                        dataMap.put("MQ", "□");
@@ -717,16 +775,16 @@
                }
            } else {
                dataMap.put("ZN", "□");
                if (serviceDonatebaseinfo.getKinship().contains("2")) {
                if (kinship.contains("2")) {
                    dataMap.put("FQ", (char) 8730);
                    if (serviceDonatebaseinfo.getKinship().contains("3")) {
                    if (kinship.contains("3")) {
                        dataMap.put("MQ", (char) 8730);
                    } else {
                        dataMap.put("MQ", "□");
                    }
                } else {
                    dataMap.put("FQ", "□");
                    if (serviceDonatebaseinfo.getKinship().contains("3")) {
                    if (kinship.contains("3")) {
                        dataMap.put("MQ", (char) 8730);
                    } else {
                        dataMap.put("MQ", "□");
@@ -737,20 +795,20 @@
        dataMap.put("QSQT", serviceDonatebaseinfo.getKinshipOther() == null ? "" : serviceDonatebaseinfo.getKinshipOther());

        //本人捐献
        if (serviceDonatebaseinfo.getSelfwill().contains("0")) {
        if (selfwill.contains("0")) {
            dataMap.put("ZYDJ", (char) 8730);
            if (serviceDonatebaseinfo.getSelfwill().contains("1")) {
            if (selfwill.contains("1")) {
                dataMap.put("SMTY", (char) 8730);
                if (serviceDonatebaseinfo.getSelfwill().contains("2")) {
                if (selfwill.contains("2")) {
                    dataMap.put("KTTY", (char) 8730);
                    if (serviceDonatebaseinfo.getSelfwill().contains("3")) {
                    if (selfwill.contains("3")) {
                        dataMap.put("WBSBTY", (char) 8730);
                    } else {
                        dataMap.put("WBSBTY", "□");
                    }
                } else {
                    dataMap.put("KTTY", "□");
                    if (serviceDonatebaseinfo.getSelfwill().contains("3")) {
                    if (selfwill.contains("3")) {
                        dataMap.put("WBSBTY", (char) 8730);
                    } else {
                        dataMap.put("WBSBTY", "□");
@@ -758,16 +816,16 @@
                }
            } else {
                dataMap.put("SMTY", "□");
                if (serviceDonatebaseinfo.getSelfwill().contains("2")) {
                if (selfwill.contains("2")) {
                    dataMap.put("KTTY", (char) 8730);
                    if (serviceDonatebaseinfo.getSelfwill().contains("3")) {
                    if (selfwill.contains("3")) {
                        dataMap.put("WBSBTY", (char) 8730);
                    } else {
                        dataMap.put("WBSBTY", "□");
                    }
                } else {
                    dataMap.put("KTTY", "□");
                    if (serviceDonatebaseinfo.getSelfwill().contains("3")) {
                    if (selfwill.contains("3")) {
                        dataMap.put("WBSBTY", (char) 8730);
                    } else {
                        dataMap.put("WBSBTY", "□");
@@ -776,18 +834,18 @@
            }
        } else {
            dataMap.put("ZYDJ", "□");
            if (serviceDonatebaseinfo.getSelfwill().contains("1")) {
            if (selfwill.contains("1")) {
                dataMap.put("SMTY", (char) 8730);
                if (serviceDonatebaseinfo.getSelfwill().contains("2")) {
                if (selfwill.contains("2")) {
                    dataMap.put("KTTY", (char) 8730);
                    if (serviceDonatebaseinfo.getSelfwill().contains("3")) {
                    if (selfwill.contains("3")) {
                        dataMap.put("WBSBTY", (char) 8730);
                    } else {
                        dataMap.put("WBSBTY", "□");
                    }
                } else {
                    dataMap.put("KTTY", "□");
                    if (serviceDonatebaseinfo.getSelfwill().contains("3")) {
                    if (selfwill.contains("3")) {
                        dataMap.put("WBSBTY", (char) 8730);
                    } else {
                        dataMap.put("WBSBTY", "□");
@@ -795,16 +853,16 @@
                }
            } else {
                dataMap.put("SMTY", "□");
                if (serviceDonatebaseinfo.getSelfwill().contains("2")) {
                if (selfwill.contains("2")) {
                    dataMap.put("KTTY", (char) 8730);
                    if (serviceDonatebaseinfo.getSelfwill().contains("3")) {
                    if (selfwill.contains("3")) {
                        dataMap.put("WBSBTY", (char) 8730);
                    } else {
                        dataMap.put("WBSBTY", "□");
                    }
                } else {
                    dataMap.put("KTTY", "□");
                    if (serviceDonatebaseinfo.getSelfwill().contains("3")) {
                    if (selfwill.contains("3")) {
                        dataMap.put("WBSBTY", (char) 8730);
                    } else {
                        dataMap.put("WBSBTY", "□");
@@ -813,40 +871,47 @@
            }
        }
        dataMap.put("ZYQS", serviceDonatebaseinfo.getMajorrelatives() == null ? "" : serviceDonatebaseinfo.getMajorrelatives());
        dataMap.put("YJXZGX", serviceDonatebaseinfo.getFamilyrelations() == null ? "" : serviceDonatebaseinfo.getFamilyrelations());
//        dataMap.put("YJXZGX", serviceDonatebaseinfo.getFamilyrelations() == null ? "" : serviceDonatebaseinfo.getFamilyrelations());

        if (serviceDonatebaseinfo.getFamilyrelations() == null) {
            dataMap.put("YJXZGX", "");
        } else if (serviceDonatebaseinfo.getFamilyrelations().equals("0")) {
            dataMap.put("YJXZGX", "本人");
        } else if (serviceDonatebaseinfo.getFamilyrelations().equals("1")) {
        }  else if (serviceDonatebaseinfo.getFamilyrelations().equals("0")) {
            dataMap.put("YJXZGX", "配偶");
        } else if (serviceDonatebaseinfo.getFamilyrelations().equals("1")) {
            dataMap.put("YJXZGX", "父子");
        } else if (serviceDonatebaseinfo.getFamilyrelations().equals("2")) {
            dataMap.put("YJXZGX", "子");
            dataMap.put("YJXZGX", "父女");
        } else if (serviceDonatebaseinfo.getFamilyrelations().equals("3")) {
            dataMap.put("YJXZGX", "女");
            dataMap.put("YJXZGX", "母子");
        } else if (serviceDonatebaseinfo.getFamilyrelations().equals("4")) {
            dataMap.put("YJXZGX", "父母");
            dataMap.put("YJXZGX", "母女");
        } else if (serviceDonatebaseinfo.getFamilyrelations().equals("5")) {
            dataMap.put("YJXZGX", "爷爷");
        } else if (serviceDonatebaseinfo.getFamilyrelations().equals("6")) {
            dataMap.put("YJXZGX", "其他");
            dataMap.put("YJXZGX", "兄弟姐妹");
        }else if (serviceDonatebaseinfo.getFamilyrelations().equals("6")) {
            dataMap.put("YJXZGX", "姐妹");
        }else if (serviceDonatebaseinfo.getFamilyrelations().equals("7")) {
            dataMap.put("YJXZGX", "受委托人");
        }
        //信息来源
        if (serviceDonatebaseinfo.getInfosources().contains("医疗机构")) {
        if (infosources.contains("红十字会")) {
            dataMap.put("HSZH2", (char) 8730);  // 勾选符号
        } else {
            dataMap.put("HSZH2", "□");  // 方框符号
        }
        if (infosources.contains("医疗机构")) {
            dataMap.put("YLJG", (char) 8730);
            if (serviceDonatebaseinfo.getInfosources().contains("家属")) {
            if (infosources.contains("家属")) {
                dataMap.put("QS", (char) 8730);
                if (serviceDonatebaseinfo.getInfosources().contains("交通")) {
                if (infosources.contains("交通")) {
                    dataMap.put("JT", (char) 8730);
                    if (serviceDonatebaseinfo.getInfosources().contains("公安")) {
                    if (infosources.contains("公安")) {
                        dataMap.put("GA", (char) 8730);
                    } else {
                        dataMap.put("GA", "□");
                    }
                } else {
                    dataMap.put("JT", "□");
                    if (serviceDonatebaseinfo.getInfosources().contains("公安")) {
                    if (infosources.contains("公安")) {
                        dataMap.put("GA", (char) 8730);
                    } else {
                        dataMap.put("GA", "□");
@@ -854,16 +919,16 @@
                }
            } else {
                dataMap.put("QS", "□");
                if (serviceDonatebaseinfo.getInfosources().contains("交通")) {
                if (infosources.contains("交通")) {
                    dataMap.put("JT", (char) 8730);
                    if (serviceDonatebaseinfo.getInfosources().contains("公安")) {
                    if (infosources.contains("公安")) {
                        dataMap.put("GA", (char) 8730);
                    } else {
                        dataMap.put("GA", "□");
                    }
                } else {
                    dataMap.put("JT", "□");
                    if (serviceDonatebaseinfo.getInfosources().contains("公安")) {
                    if (infosources.contains("公安")) {
                        dataMap.put("GA", (char) 8730);
                    } else {
                        dataMap.put("GA", "□");
@@ -872,18 +937,18 @@
            }
        } else {
            dataMap.put("YLJG", "□");
            if (serviceDonatebaseinfo.getInfosources().contains("家属")) {
            if (infosources.contains("家属")) {
                dataMap.put("QS", (char) 8730);
                if (serviceDonatebaseinfo.getInfosources().contains("交通")) {
                if (infosources.contains("交通")) {
                    dataMap.put("JT", (char) 8730);
                    if (serviceDonatebaseinfo.getInfosources().contains("公安")) {
                    if (infosources.contains("公安")) {
                        dataMap.put("GA", (char) 8730);
                    } else {
                        dataMap.put("GA", "□");
                    }
                } else {
                    dataMap.put("JT", "□");
                    if (serviceDonatebaseinfo.getInfosources().contains("公安")) {
                    if (infosources.contains("公安")) {
                        dataMap.put("GA", (char) 8730);
                    } else {
                        dataMap.put("GA", "□");
@@ -891,16 +956,16 @@
                }
            } else {
                dataMap.put("QS", "□");
                if (serviceDonatebaseinfo.getInfosources().contains("交通")) {
                if (infosources.contains("交通")) {
                    dataMap.put("JT", (char) 8730);
                    if (serviceDonatebaseinfo.getInfosources().contains("公安")) {
                    if (infosources.contains("公安")) {
                        dataMap.put("GA", (char) 8730);
                    } else {
                        dataMap.put("GA", "□");
                    }
                } else {
                    dataMap.put("JT", "□");
                    if (serviceDonatebaseinfo.getInfosources().contains("公安")) {
                    if (infosources.contains("公安")) {
                        dataMap.put("GA", (char) 8730);
                    } else {
                        dataMap.put("GA", "□");
@@ -912,19 +977,35 @@
        dataMap.put("HSZH", serviceDonatebaseinfo.getRedorganname() == null ? "" : serviceDonatebaseinfo.getRedorganname());
        dataMap.put("LXR", serviceDonatebaseinfo.getContactperson() == null ? "" : serviceDonatebaseinfo.getContactperson());

        Date dt1 = serviceDonatebaseinfo.getContacttime();
        String date1 = formatter.format(dt1);
        String time1 = date1.substring(0, 16);
        dataMap.put("LXSJ", serviceDonatebaseinfo.getContacttime() == null ? "" : time1);
        String lxsj = "";
        if (serviceDonatebaseinfo.getContacttime() != null) {
            lxsj = formatter.format(serviceDonatebaseinfo.getContacttime()).substring(0, 16);
        }
        dataMap.put("LXSJ", lxsj);
        dataMap.put("HQZZ", serviceDonatebaseinfo.getAcquisitiontissuename() == null ? "" : serviceDonatebaseinfo.getAcquisitiontissuename());
        dataMap.put("BGR", serviceDonatebaseinfo.getReportername() == null ? "" : serviceDonatebaseinfo.getReportername());
        dataMap.put("BGRDH", serviceDonatebaseinfo.getReporterphone() == null ? "" : serviceDonatebaseinfo.getReporterphone());

        //获取报告时间
        String bgrq = null;
        if (serviceDonatebaseinfo.getReporttime() != null) {
            Date reportTime = serviceDonatebaseinfo.getReporttime();
            LocalDate localDate = reportTime.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();

            int year = localDate.getYear();
            int month = localDate.getMonthValue(); // 直接获取月份值（1-12）
            int day = localDate.getDayOfMonth();
            bgrq = year + "年" + month + "月" + day + "日";
        }

        dataMap.put("BGRQ", bgrq);

    }

    @ApiOperation("获取状态获取计数")
    @GetMapping("/countByRecordState")
    public AjaxResult countByRecordState(TimeVO timeVO) {
        log.info("获取状态获取计数：{}", timeVO);
        return AjaxResult.success(serviceDonatebaseinfoService.countByRecordState(timeVO));
    }

@@ -934,6 +1015,7 @@
    @ApiOperation("获取捐献工作流")
    @GetMapping(value = "/getWorkFlow/{id}")
    public AjaxResult getWorkFlow(@PathVariable("id") Long id) {
        log.info("获取捐献工作流：{}", id);
        return AjaxResult.success(serviceDonatebaseinfoService.getWorkFlow(id));
    }