代码提交

liusheng

2023-11-20 0305121daab27b4bff4d906a01b9ca3ce08a5f04

代码提交

 ruoyi-admin/pom.xml

@@ -8,8 +8,8 @@
        <version>3.7.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <packaging>war</packaging>
<!--    <packaging>jar</packaging>-->
<!--    <packaging>war</packaging>-->
    <packaging>jar</packaging>
    <artifactId>ruoyi-admin</artifactId>

    <description>

 ruoyi-common/pom.xml

@@ -139,6 +139,10 @@
            <groupId>org.apache.httpcomponents</groupId>
            <artifactId>httpclient</artifactId>
        </dependency>
        <dependency>
            <groupId>org.aspectj</groupId>
            <artifactId>aspectjweaver</artifactId>
        </dependency>
    </dependencies>

</project>

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

@@ -55,7 +55,7 @@
    private IServiceRelativesconfirmationService serviceRelativesconfirmationService;

    @Autowired
    private IServiceEthicalreviewopinionsService serviceEthicalreviewopinionsService;
    private IServiceDonateflowchartService iServiceDonateflowchartService;

    @Autowired
    private IServiceOrganallocationService serviceOrganallocationService;
@@ -314,19 +314,19 @@


        //封装伦理审查
        Map<String, String> ethicalreviewopinions = new HashMap<>();
        Map<String, String> donateflowcharts = new HashMap<>();
        if (serviceDonatebaseinfo.getWorkflow() >= 3) {
            ServiceEthicalreviewopinions serviceEthicalreviewopinions = new ServiceEthicalreviewopinions();
            serviceEthicalreviewopinions.setInfoid(id);
            List<ServiceEthicalreviewopinions> serviceEthicalreviewopinionsList = serviceEthicalreviewopinionsService.queryList(serviceEthicalreviewopinions);
            if (!CollectionUtils.isEmpty(serviceEthicalreviewopinionsList)) {
                ethicalreviewopinions.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceEthicalreviewopinionsList.get(0).getCreateTime()));
                ethicalreviewopinions.put("updatetime", serviceEthicalreviewopinionsList.get(0).getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceEthicalreviewopinionsList.get(0).getUpdateTime()) : "");
                ethicalreviewopinions.put("process", "");
            ServiceDonateflowchart serviceDonateflowchart = new ServiceDonateflowchart();
            serviceDonateflowchart.setInfoid(id);
            List<ServiceDonateflowchart> serviceDonateflowcharts = iServiceDonateflowchartService.queryList(serviceDonateflowchart);
            if (!CollectionUtils.isEmpty(serviceDonateflowcharts)) {
                donateflowcharts.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonateflowcharts.get(0).getCreateTime()));
                donateflowcharts.put("updatetime", serviceDonateflowcharts.get(0).getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonateflowcharts.get(0).getUpdateTime()) : "");
                donateflowcharts.put("process", "");
            }
        }
        //封装伦理审查返回数据
        map.put("ethicalreviewopinions", ethicalreviewopinions);
        map.put("donateflowcharts", donateflowcharts);

        //封装器官分配
        Map<String, String> donateorgansService = new HashMap<>();

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

@@ -111,6 +111,7 @@
            <if test="endtime != null ">  and `service_medicalevaluation`.CoreTeamAssessTime &lt;= #{endtime}</if>
            <if test="reporterno != null  and reporterno != ''"> and `service_donatebaseinfo`.ReporterNo = #{reporterno}</if>
            <if test="city != null and city != ''"> and `base_organization`.`City` = #{city}</if>
            service_medicalevaluation.del_flag != 1
    </where>

        order by `service_medicalevaluation`.`create_time` desc,