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

@@ -50,7 +50,7 @@
     */
    @ApiOperation("获取序列号")
    @GetMapping("/getSequence")
    public AjaxResult getSequence( String businessType, String orgId) {
    public AjaxResult getSequence(String businessType, String orgId) {

        return AjaxResult.success(baseOnlyvalueService.getSequence(businessType, orgId));
    }

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

@@ -22,6 +22,7 @@
import com.ruoyi.project.domain.dto.ReviewInitiateBaseInfoDTO;
import com.ruoyi.project.domain.vo.DonatebaseinfoProgressVO;
import com.ruoyi.project.domain.vo.TimeVO;
import com.ruoyi.project.domain.vo.WorkFlowVO;
import com.ruoyi.project.service.IServiceDonatebaseinfoService;
import com.ruoyi.project.service.IServiceDonationwitnessService;
import com.ruoyi.project.service.IServiceExternalpersonService;
@@ -1002,9 +1003,9 @@
     */
    @ApiOperation("获取捐献工作流")
    @GetMapping(value = "/getWorkFlow/{id}")
    public AjaxResult getWorkFlow(@PathVariable("id") Long id) {
    public WorkFlowVO getWorkFlow(@PathVariable("id") Long id) {
        log.info("获取捐献工作流：{}", id);
        return AjaxResult.success(serviceDonatebaseinfoService.getWorkFlow(id));
        return serviceDonatebaseinfoService.getWorkFlow(id);
    }

}

 ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDeathinfo.java

@@ -108,5 +108,12 @@
    @ApiModelProperty("扩展")
    @Excel(name = "扩展")
    private String extContent;

    /**
     * çŠ¶æ€1待利用，2进行中，3捐献完成，4放弃
     */
    @ApiModelProperty("状态1待利用，2进行中，3捐献完成，4放弃")
    @Excel(name = "状态1待利用，2进行中，3捐献完成，4放弃")
    private String state;
}


 ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfo.java

@@ -640,5 +640,8 @@
    @Excel(name = "协调员姓名", readConverterExp = "协调员姓名")
    private String coordinatorName;


    @ApiModelProperty("入院时间")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date  entryTime;
}

 ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfoReport.java

@@ -13,6 +13,7 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

/**
 * æçŒ®ä¸ŠæŠ¥åŸºç¡€å¯¹è±¡ service_donatebaseinfo_report
@@ -425,5 +426,10 @@
    @Excel(name = "确认时间", readConverterExp = "确认时间")
    private Date confirmTime;

    @ApiModelProperty("入院时间")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date  entryTime;

}


 ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatemaintenanceVO.java

@@ -81,5 +81,12 @@
    @Excel(name = "项目维护详情，json结构")
    private JSONObject itemDesc;

    /**
     * çŠ¶æ€1待利用，2进行中，3捐献完成，4放弃
     */
    @ApiModelProperty("状态1待利用，2进行中，3捐献完成，4放弃")
    @Excel(name = "状态1待利用，2进行中，3捐献完成，4放弃")
    private String state;

}


 ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceRelativesconfirmation.java

@@ -301,5 +301,12 @@
     */
    @ApiModelProperty("亲属证件号")
    private String relativeidcardno;

    /**
     * çŠ¶æ€1待利用，2进行中，3捐献完成，4放弃
     */
    @ApiModelProperty("状态1待利用，2进行中，3捐献完成，4放弃")
    @Excel(name = "状态1待利用，2进行中，3捐献完成，4放弃")
    private String state;
}


 ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DeathBaseInfoDTO.java

@@ -204,5 +204,12 @@
    @Excel(name = "扩展内容")
    private String extracontent;

    /**
     * çŠ¶æ€1待利用，2进行中，3捐献完成，4放弃
     */
    @ApiModelProperty("状态1待利用，2进行中，3捐献完成，4放弃")
    @Excel(name = "状态1待利用，2进行中，3捐献完成，4放弃")
    private String state;

}


 ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/MaintenanceBaseInfoDTO.java

@@ -190,5 +190,11 @@
    @Excel(name = "项目维护详情，json结构")
    private JSONObject itemDesc;

    /**
     * çŠ¶æ€1待利用，2进行中，3捐献完成，4放弃
     */
    @ApiModelProperty("状态1待利用，2进行中，3捐献完成，4放弃")
    @Excel(name = "状态1待利用，2进行中，3捐献完成，4放弃")
    private String state;
}


 ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/RelativeConfirmationBaseInfoDTO.java

@@ -292,4 +292,11 @@
     */
    @ApiModelProperty("亲属证件号")
    private String relativeidcardno;

    /**
     * çŠ¶æ€1待利用，2进行中，3捐献完成，4放弃
     */
    @ApiModelProperty("状态1待利用，2进行中，3捐献完成，4放弃")
    @Excel(name = "状态1待利用，2进行中，3捐献完成，4放弃")
    private String state;
}

 ruoyi-project/src/main/java/com/ruoyi/project/domain/entity/MaintenanceBaseInfoEntity.java

@@ -190,5 +190,12 @@
    @Excel(name = "项目维护详情，json结构")
    private String itemDesc;

    /**
     * çŠ¶æ€1待利用，2进行中，3捐献完成，4放弃
     */
    @ApiModelProperty("状态1待利用，2进行中，3捐献完成，4放弃")
    @Excel(name = "状态1待利用，2进行中，3捐献完成，4放弃")
    private String state;

}


 ruoyi-project/src/main/java/com/ruoyi/project/domain/entity/ServiceDonatemaintenanceEntity.java

@@ -82,5 +82,12 @@
    @Excel(name = "项目维护详情，json结构")
    private String itemDesc;

    /**
     * çŠ¶æ€1待利用，2进行中，3捐献完成，4放弃
     */
    @ApiModelProperty("状态1待利用，2进行中，3捐献完成，4放弃")
    @Excel(name = "状态1待利用，2进行中，3捐献完成，4放弃")
    private String state;

}


 ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/MaintenanceBaseInfoVO.java

@@ -169,5 +169,11 @@
    @Excel(name = "部门名称")
    private String deptname;

    /**
     * çŠ¶æ€1待利用，2进行中，3捐献完成，4放弃
     */
    @ApiModelProperty("状态1待利用，2进行中，3捐献完成，4放弃")
    @Excel(name = "状态1待利用，2进行中，3捐献完成，4放弃")
    private String state;
}


 ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/WorkFlowVO.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,72 @@
package com.ruoyi.project.domain.vo;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Map;

@Data
public class WorkFlowVO {

    /**
     * å°è£…潜在捐献数据
     */
    @ApiModelProperty("封装潜在捐献数据")
    Map<String, String> donatebaseinfo;

    /**
     * å°è£…医学评估
     */
    @ApiModelProperty("封装医学评估")
    Map<String, String> medicalevaluation;


    /**
     * å°è£…捐献确认
     */
    @ApiModelProperty("封装捐献确认")
    Map<String, String> relativesconfirmation;


    /**
     * å°è£…伦理审查
     */
    @ApiModelProperty("封装伦理审查")
    Map<String, String> donateflowcharts;


    /**
     * å°è£…器官分配
     */
    @ApiModelProperty("封装器官分配")
    Map<String, String> donateorgansService;


    /**
     * å°è£…获取见证
     */
    @ApiModelProperty("封装获取见证")
    Map<String, String> donationwitness;


    /**
     * å°è£…完成登记
     */
    @ApiModelProperty("封装完成登记")
    Map<String, String> donatecompletioninfo;

    /**
     * ä¾›ä½“维护记录
     */
    @ApiModelProperty("供体维护记录")
    Map<String, String> donatemaintenance;


    /**
     * æ‚£è€…死亡信息
     */
    @ApiModelProperty("患者死亡信息")
    Map<String, String>  deathinfo;


}

 ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonatebaseinfoService.java

@@ -7,10 +7,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.project.domain.ServiceDonatebaseinfo;
import com.ruoyi.project.domain.dto.DonatebaseinfoProgressDTO;
import com.ruoyi.project.domain.vo.DonatebaseinfoProgressVO;
import com.ruoyi.project.domain.vo.RelativeConfirmationBaseInfoVO;
import com.ruoyi.project.domain.vo.TimeVO;
import com.ruoyi.project.domain.vo.countByRecordStateVO;
import com.ruoyi.project.domain.vo.*;
import org.apache.xmlbeans.impl.xb.xsdschema.Public;

/**
@@ -60,7 +57,7 @@

    String getDonateNameById(Long infoid);

    Map<String, Object> getWorkFlow(Long id);
    WorkFlowVO getWorkFlow(Long id);


}

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

@@ -17,8 +17,10 @@
import com.ruoyi.project.common.CalculateDateUtils;
import com.ruoyi.project.domain.*;
import com.ruoyi.project.domain.dto.DonatebaseinfoProgressDTO;
import com.ruoyi.project.domain.entity.ServiceDonatemaintenanceEntity;
import com.ruoyi.project.domain.vo.DonatebaseinfoProgressVO;
import com.ruoyi.project.domain.vo.TimeVO;
import com.ruoyi.project.domain.vo.WorkFlowVO;
import com.ruoyi.project.domain.vo.countByRecordStateVO;
import com.ruoyi.project.mapper.*;
import com.ruoyi.project.service.*;
@@ -84,6 +86,10 @@
    private IServiceDonatecompletioninfoService serviceDonatecompletioninfoService;
    @Autowired
    private SysUserMapper sysUserMapper;
    @Autowired
    IServiceDonatemaintenanceService serviceDonatemaintenanceService;
    @Autowired
    IServiceDeathinfoService serviceDeathinfoService;


    /**
@@ -284,11 +290,9 @@
    }

    @Override
    public Map<String, Object> getWorkFlow(Long id) {
    public WorkFlowVO getWorkFlow(Long id) {
        log.info("getWorkFlow的入参ID为：{}", id);
        //用于返回
        Map<String, Object> map = new ConcurrentHashMap<>();

        WorkFlowVO map1=new WorkFlowVO();
        ServiceDonatebaseinfo serviceDonatebaseinfo = getById(id);

        if (ObjectUtils.isEmpty(serviceDonatebaseinfo)) {
@@ -316,12 +320,11 @@
        donatebaseinfo.put("process", "");
        //封装serviceDonateorgan潜在捐献返回数据
        log.info("检查封装潜在捐献返回数据donatebaseinfo的值为：{}", donatebaseinfo);
        map.put("donatebaseinfo", donatebaseinfo);

        map1.setDonatebaseinfo(donatebaseinfo);
        //封装医学评估
        log.info("检查serviceDonatebaseinfo.getWorkflow()的值为：{}", serviceDonatebaseinfo.getWorkflow());
        Map<String, String> medicalevaluation = new HashMap<>();
        if (serviceDonatebaseinfo.getWorkflow() >= 1) {
        //if (serviceDonatebaseinfo.getWorkflow() >= 1) {
            ServiceMedicalevaluation serviceMedicalevaluation = new ServiceMedicalevaluation();
            serviceMedicalevaluation.setInfoid(id);
            List<ServiceMedicalevaluation> serviceMedicalevaluations = serviceMedicalevaluationService.queryList(serviceMedicalevaluation);
@@ -346,14 +349,14 @@
                }
                medicalevaluation.put("process", "");
            }
        }
        //}
        //封装医学评估返回数据
        log.info("检查封装医学评估返回数据medicalevaluation的值为：{}", medicalevaluation);
        map.put("medicalevaluation", medicalevaluation);
        map1.setMedicalevaluation(medicalevaluation);

        //封装捐献确认
        Map<String, String> relativesconfirmation = new HashMap<>();
        if (serviceDonatebaseinfo.getWorkflow() >= 2) {
        //if (serviceDonatebaseinfo.getWorkflow() >= 2) {
            ServiceRelativesconfirmation serviceRelativesconfirmation = new ServiceRelativesconfirmation();
            serviceRelativesconfirmation.setInfoid(id);
            List<ServiceRelativesconfirmation> serviceRelativesconfirmations = serviceRelativesconfirmationService.queryList(serviceRelativesconfirmation);
@@ -378,15 +381,14 @@
                }
                relativesconfirmation.put("process", "");
            }
        }
        //}
        //封装捐献确认返回数据
        log.info("检查封装捐献确认返回数据relativesconfirmation的值为：{}", relativesconfirmation);
        map.put("relativesconfirmation", relativesconfirmation);

        map1.setRelativesconfirmation(relativesconfirmation);

        //封装伦理审查
        Map<String, String> donateflowcharts = new HashMap<>();
        if (serviceDonatebaseinfo.getWorkflow() >= 3) {
        //if (serviceDonatebaseinfo.getWorkflow() >= 3) {
            ServiceEthicalreviewopinions serviceDonateflowchart = new ServiceEthicalreviewopinions();
            serviceDonateflowchart.setInfoid(id);
            List<ServiceEthicalreviewopinions> serviceEthicalreviewopinionsList = iServiceEthicalreviewopinionsService.queryList(serviceDonateflowchart);
@@ -412,14 +414,14 @@
                }
                donateflowcharts.put("process", "");
            }
        }
        //}
        //封装伦理审查返回数据
        log.info("检查封装伦理审查返回数据donateflowcharts的值为：{}", donateflowcharts);
        map.put("donateflowcharts", donateflowcharts);
        map1.setDonateflowcharts(donateflowcharts);

        //封装器官分配
        Map<String, String> donateorgansService = new HashMap<>();
        if (serviceDonatebaseinfo.getWorkflow() >= 4) {
       // if (serviceDonatebaseinfo.getWorkflow() >= 4) {
            ServiceDonateorgan serviceDonateorgan = new ServiceDonateorgan();
            serviceDonateorgan.setInfoid(id);
            List<ServiceDonateorgan> serviceDonateorgans = serviceDonateorganService.queryList(serviceDonateorgan);
@@ -445,14 +447,14 @@
                }
                donateorgansService.put("process", "");
            }
        }
        //}
        log.info("检查封装器官分配返回数据donateorgansService的值为：{}", donateorgansService);
        //封装器官分配返回数据
        map.put("donateorgansService", donateorgansService);
        map1.setDonateorgansService(donateorgansService);

        //封装获取见证
        Map<String, String> donationwitness = new HashMap<>();
        if (serviceDonatebaseinfo.getWorkflow() >= 5) {
        //if (serviceDonatebaseinfo.getWorkflow() >= 5) {
            ServiceDonationwitness serviceDonationwitness = serviceDonationwitnessService.getByInfoId(id);
            log.info("检查serviceDonationwitness的值为：{}", serviceDonationwitness);
            if (!ObjectUtils.isEmpty(serviceDonationwitness)) {
@@ -476,14 +478,14 @@

                donationwitness.put("process", "");
            }
        }
        //}
        log.info("检查封装获取见证返回数据donationwitness的值为：{}", donationwitness);
        //封装获取见证返回数据
        map.put("donationwitness", donationwitness);
        map1.setDonationwitness(donationwitness);

        //封装完成登记
        Map<String, String> donatecompletioninfo = new HashMap<>();
        if (serviceDonatebaseinfo.getWorkflow() >= 6) {
       // if (serviceDonatebaseinfo.getWorkflow() >= 6) {
            ServiceDonatecompletioninfo serviceDonatecompletioninfo = new ServiceDonatecompletioninfo();
            serviceDonatecompletioninfo.setInfoid(id);
            List<ServiceDonatecompletioninfo> serviceDonatecompletioninfos = serviceDonatecompletioninfoService.queryList(serviceDonatecompletioninfo);
@@ -509,13 +511,69 @@

                donatecompletioninfo.put("process", "");
            }
        }
        //}
        log.info("检查封装完成登记返回数据donatecompletioninfo的值为：{}", donatecompletioninfo);
        //封装完成登记返回数据
        map.put("donatecompletioninfo", donatecompletioninfo);
        map1.setDonatecompletioninfo(donatecompletioninfo);

        //供体维护记录
        Map<String, String> donatemaintenance = new HashMap<>();
        ServiceDonatemaintenanceEntity serviceDonatemaintenanceEntity=new ServiceDonatemaintenanceEntity();
        serviceDonatemaintenanceEntity.setInfoid(id);
        List<ServiceDonatemaintenanceEntity> donatemaintenanceEntityList= serviceDonatemaintenanceService.queryList(serviceDonatemaintenanceEntity).getRecords();
        if(donatemaintenanceEntityList.size()>0){
            donatemaintenance.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", donatemaintenanceEntityList.get(0).getCreateTime()));
            donatemaintenance.put("updatetime", donatemaintenanceEntityList.get(0).getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", donatemaintenanceEntityList.get(0).getUpdateTime()) : "");

            donatemaintenance.put("createperson", null);
            if (StringUtils.isNotBlank(donatemaintenanceEntityList.get(0).getCreateBy())) {
                SysUser sysUser = sysUserMapper.selectUserByUserName(donatemaintenanceEntityList.get(0).getCreateBy());
                if (!ObjectUtils.isEmpty(sysUser)) {
                    donatemaintenance.put("createperson", sysUser.getNickName());
                }
            }
            donatemaintenance.put("updateperson", null);
            if (StringUtils.isNotBlank(donatemaintenanceEntityList.get(0).getUpdateBy())) {
                SysUser sysUser = sysUserMapper.selectUserByUserName(donatemaintenanceEntityList.get(0).getUpdateBy());
                if (!ObjectUtils.isEmpty(sysUser)) {
                    donatemaintenance.put("updateperson", sysUser.getNickName());
                }
            }

            donatemaintenance.put("process", "");
        }
        map1.setDonatemaintenance(donatemaintenance);

        //患者死亡信息
        Map<String, String> deathinfo = new HashMap<>();
        ServiceDeathinfo serviceDeathinfo =new ServiceDeathinfo();
        serviceDeathinfo.setInfoid(id);
        List<ServiceDeathinfo> serviceDeathinfoList= serviceDeathinfoService.queryList(serviceDeathinfo).getRecords();
        if(serviceDeathinfoList.size()>0){
            deathinfo.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDeathinfoList.get(0).getCreateTime()));
            deathinfo.put("updatetime", serviceDeathinfoList.get(0).getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", donatemaintenanceEntityList.get(0).getUpdateTime()) : "");

            deathinfo.put("createperson", null);
            if (StringUtils.isNotBlank(serviceDeathinfoList.get(0).getCreateBy())) {
                SysUser sysUser = sysUserMapper.selectUserByUserName(serviceDeathinfoList.get(0).getCreateBy());
                if (!ObjectUtils.isEmpty(sysUser)) {
                    deathinfo.put("createperson", sysUser.getNickName());
                }
            }
            deathinfo.put("updateperson", null);
            if (StringUtils.isNotBlank(serviceDeathinfoList.get(0).getUpdateBy())) {
                SysUser sysUser = sysUserMapper.selectUserByUserName(serviceDeathinfoList.get(0).getUpdateBy());
                if (!ObjectUtils.isEmpty(sysUser)) {
                    deathinfo.put("updateperson", sysUser.getNickName());
                }
            }

            deathinfo.put("process", "");
        }
        map1.setDeathinfo(deathinfo);

        //将数据封闭，并返回
        return map;
        return map1;
    }



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

@@ -49,7 +49,8 @@
               update_by,
               update_time,
               judgment_description,
               ext_content
               ext_content,
               state
        from service_deathinfo
    </sql>

@@ -109,7 +110,8 @@
        sdi.IsRestoreRemains as isrestoreremains,
        sdi.RememberAnnex as rememberannex,
        sdi.ResponsibleUserID as responsibleuserid,
        sdi.ResponsibleUserName as responsibleusername
        sdi.ResponsibleUserName as responsibleusername,
        sdi.state
        FROM
        service_donatebaseinfo sd
        LEFT JOIN service_deathinfo sdi ON sd.ID = sdi.InfoID

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

@@ -96,6 +96,7 @@
        <result property="currentHospital" column="current_hospital"/>
        <result property="terminationType" column="termination_type"/>
        <result property="extracontent" column="extracontent"/>
        <result property="entryTime" column="entry_time"/>
    </resultMap>

    <sql id="selectServiceDonatebaseinfoVo">

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

@@ -63,6 +63,7 @@
        <result property="coordinatorNo" column="coordinator_no"/>
        <result property="infoName" column="info_name"/>
        <result property="infoNo" column="info_no"/>
        <result property="entryTime" column="entry_time"/>
    </resultMap>

    <sql id="selectServiceDonatebaseinfoReportVo">
@@ -123,7 +124,8 @@
               user_name,
               dept_no,
               dept_name,
               is_transport
               is_transport,
               entry_time
        from service_donatebaseinfo_report
    </sql>


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

@@ -63,7 +63,8 @@
        sdm.item_name as itemName,
        sdm.item_time as itemTime,
        sdt.DeathTime as deathTime,
        sdm.item_desc as itemDesc
        sdm.item_desc as itemDesc,
        sdm.state
        FROM
        service_donatebaseinfo sd
        LEFT JOIN service_donatemaintenance sdm ON sd.ID = sdm.InfoID

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

@@ -307,7 +307,8 @@
        sr.assessannex as assessannex,
        sr.education as education,
        sr.relativeconfirmationsignname,
        sr.relativeidcardno
        sr.relativeidcardno,
        sr.state
        FROM service_donatebaseinfo sd
        LEFT JOIN service_relativesconfirmation sr ON sd.ID = sr.InfoID and sd.del_flag = 0
        AND sr.del_flag = 0