变动大幅度版本

heheng

2025-05-23 761bdc5b3f17df62aae1b424f2d2dabc11e844bc

变动大幅度版本

 src/main/java/com/gkhy/labRiskManage/api/controller/riskReport/dto/repDto/ReportQueryReqBO.java

@@ -37,6 +37,6 @@
     * 实验
     */
    private Long experimentId;

    private Boolean exportTag ;
}


 src/main/java/com/gkhy/labRiskManage/application/experiment/dto/dto/ExperimentInfoAppQueryDTO.java

@@ -4,6 +4,7 @@
import com.gkhy.labRiskManage.api.controller.experiment.dto.resp.ExperimentAndEmergencyRespDTO;
import com.gkhy.labRiskManage.domain.experiment.entity.ExperimentAndType;
import com.gkhy.labRiskManage.domain.experiment.entity.ExperimentAssessLog;
import com.gkhy.labRiskManage.domain.experiment.model.dto.ExperimentAndSiteDTO;
import com.gkhy.labRiskManage.domain.experiment.model.dto.ExperimentAndTypeDTO;
import lombok.Data;

@@ -224,7 +225,7 @@

    private List<ExperimentAndTypeDTO> types;

    private List<ExperimentAndSiteAppQueryDTO> sites;
    private List<ExperimentAndSiteDTO> sites;

    private List<ExperimentAndDeviceAppQueryDTO> devices;


 src/main/java/com/gkhy/labRiskManage/application/experiment/service/impl/ExperimentAppServiceImpl.java

@@ -488,12 +488,12 @@
            for (ExperimentInfoDTO experimentInfoDTO:experimentInfoDTOS){
                ExperimentInfoAppQueryDTO experimentInfoAppQueryDTO = new ExperimentInfoAppQueryDTO();
                BeanUtils.copyProperties(experimentInfoDTO,experimentInfoAppQueryDTO);
                //实验场所
                List<ExperimentAndSiteAppQueryDTO> siteAppQueryDTOs = new ArrayList<>();
                if(!ObjectUtils.isEmpty(experimentInfoDTO.getSites())){
                    siteAppQueryDTOs = BeanCopyUtils.copyBeanList(experimentInfoDTO.getSites(),ExperimentAndSiteAppQueryDTO.class);
                }
                experimentInfoAppQueryDTO.setSites(siteAppQueryDTOs);
//                //实验场所
//                List<ExperimentAndSiteAppQueryDTO> siteAppQueryDTOs = new ArrayList<>();
//                if(!ObjectUtils.isEmpty(experimentInfoDTO.getSites())){
//                    siteAppQueryDTOs = BeanCopyUtils.copyBeanList(experimentInfoDTO.getSites(),ExperimentAndSiteAppQueryDTO.class);
//                }
//                experimentInfoAppQueryDTO.setSites(siteAppQueryDTOs);
                //人员
                List<ExperimentAndPersonAppQueryDTO> personAppQueryDTOList = new ArrayList<>();
                if(!ObjectUtils.isEmpty(experimentInfoDTO.getPersons())){

 src/main/java/com/gkhy/labRiskManage/application/riskReport/dto/bo/ReportAppQueryBO.java

@@ -38,5 +38,10 @@
     */
    private Long experimentId;


    private Boolean exportTag ;



}


 src/main/java/com/gkhy/labRiskManage/application/riskReport/dto/dto/ReportAppQueryDTO.java

@@ -7,9 +7,12 @@
import com.gkhy.labRiskManage.api.controller.riskReport.dto.respDto.ReportSourceTypeQueryRespDTO;
import com.gkhy.labRiskManage.domain.basic.entity.OldRiskAssess;
import com.gkhy.labRiskManage.domain.experiment.entity.ExperimentAndType;
import com.gkhy.labRiskManage.domain.riskReport.model.bo.RiskPlanMethodBO;
import com.gkhy.labRiskManage.domain.riskReport.model.dto.*;
import lombok.Data;

import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;

/**
@@ -171,5 +174,8 @@
     * 附件
     */
    List<OldRiskAssessResDTO> oldRiskAssess;

    List<RiskPlanMethodBO> riskPlanMethodBO;

}


 src/main/java/com/gkhy/labRiskManage/domain/riskReport/model/bo/RiskPlanMethodBO.java

对比新文件
@@ -0,0 +1,43 @@
package com.gkhy.labRiskManage.domain.riskReport.model.bo;

import lombok.Data;

@Data
public class RiskPlanMethodBO {
    /**
     * 评估计划名称
     */
    private String assessPlanName;
    /***
     * 检查项目
     */
    private String checkItem;
    /**
     * 存在风险因素
     */
    private String riskFactor;
    /**
     * 可能存在后果
     */
    private String result;

    /**
     * 风险级别：1-低，2-一般，3-较大，4-重大
     */
    private Byte riskLevel;

    /**
     * 评价专家意见
     */
    private String evaluateDesc;

    /**
     * 辨识方法：1-PHA；2-JHA；3-SCL；4-HAZOP；5-类比法
     */
    private Byte identificationMethod;

    /**
     * 推荐评价方法：1-LEC；2-LS；3-MES；4-RS；
     */
    private Byte evaluateMethod;
}

 src/main/java/com/gkhy/labRiskManage/domain/riskReport/repository/jpa/RiskAssessPlanEvaluateLecRepository.java

@@ -44,5 +44,10 @@

    @Query(value = "select t from RiskAssessPlanEvaluateLec t where t.assessPlanId = :id and t.deleteStatus = 0")
    List<RiskAssessPlanEvaluateLec>  getLecByPlanId(Long id);


    @Query(value = "select t from RiskAssessPlanEvaluateLec t where t.assessPlanId = :assessPlanId and t.identificationId = :identificationId and t.identificationMethod = :identificationMethod and t.deleteStatus = 0")
    List<RiskAssessPlanEvaluateLec> getLecByByParam(Long assessPlanId,Long identificationId, Byte identificationMethod);

}


 src/main/java/com/gkhy/labRiskManage/domain/riskReport/repository/jpa/RiskAssessPlanEvaluateLsRepository.java

@@ -43,5 +43,9 @@

    @Query(value = "select t from RiskAssessPlanEvaluateLs t where t.assessPlanId = :id and t.deleteStatus = 0")
    List<RiskAssessPlanEvaluateLs> getLsByPlanId(Long id);

    @Query(value = "select t from RiskAssessPlanEvaluateLs t where t.assessPlanId = :assessPlanId and t.identificationId = :identificationId and t.identificationMethod = :identificationMethod and t.deleteStatus = 0")
    List<RiskAssessPlanEvaluateLs> getLsByParam(Long assessPlanId,Long identificationId, Byte identificationMethod);

}


 src/main/java/com/gkhy/labRiskManage/domain/riskReport/repository/jpa/RiskAssessPlanEvaluateMesRepository.java

@@ -43,5 +43,8 @@

    @Query(value = "select t from RiskAssessPlanEvaluateMes t where t.assessPlanId = :id and t.deleteStatus = 0")
    List<RiskAssessPlanEvaluateMes>  getMesByPlanId(Long id);

    @Query(value = "select t from RiskAssessPlanEvaluateMes t where t.assessPlanId = :assessPlanId and t.identificationId = :identificationId and t.identificationMethod = :identificationMethod and t.deleteStatus = 0")
    List<RiskAssessPlanEvaluateMes> listMesByParam(Long assessPlanId,Long identificationId, Byte identificationMethod);
}


 src/main/java/com/gkhy/labRiskManage/domain/riskReport/repository/jpa/RiskAssessPlanEvaluateRsRepository.java

@@ -43,5 +43,9 @@

    @Query(value = "select t from RiskAssessPlanEvaluateRs t where t.assessPlanId = :id and t.deleteStatus = 0")
    List<RiskAssessPlanEvaluateRs> getRsByPlanId(Long id);

    @Query(value = "select t from RiskAssessPlanEvaluateRs t where t.assessPlanId = :assessPlanId and  t.identificationId = :identificationId and t.identificationMethod = :identificationMethod and t.deleteStatus = 0")
    List<RiskAssessPlanEvaluateRs> listRsByParam(Long assessPlanId,Long identificationId, Byte identificationMethod);

}


 src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/RiskAssessPlanEvaluateLecService.java

@@ -43,4 +43,6 @@
    int deleteLecByPlan(Long id);

    RiskAssessPlanEvaluateLec getLecByIdentificationId(Long identificationId , Byte identificationMethod);

    List<RiskAssessPlanEvaluateLec> listLecByParam(Long id,Long identificationId,  Byte identificationMethod);
}

 src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/RiskAssessPlanEvaluateLsService.java

@@ -1,6 +1,7 @@
package com.gkhy.labRiskManage.domain.riskReport.service;

import com.gkhy.labRiskManage.api.controller.riskReport.dto.repDto.RiskAssessPlanEvaluateDeleteReqBO;
import com.gkhy.labRiskManage.domain.riskReport.entity.RiskAssessPlanEvaluateLec;
import com.gkhy.labRiskManage.domain.riskReport.entity.RiskAssessPlanEvaluateLs;
import com.gkhy.labRiskManage.domain.riskReport.model.bo.AssessLSInsertBO;
import com.gkhy.labRiskManage.domain.riskReport.model.dto.*;
@@ -40,4 +41,6 @@
    int deleteLsByPlan(Long id);

    RiskAssessPlanEvaluateLs getLsByIdentificationId(Long id, Byte identificationMethod);

    List<RiskAssessPlanEvaluateLs> listLsByParam(Long id, Long identificationId, Byte identificationMethod);
}

 src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/RiskAssessPlanEvaluateMesService.java

@@ -44,4 +44,6 @@
    int deleteMesByPlan(Long id);

    RiskAssessPlanEvaluateMes getMesByIdentificationId(Long id, Byte identificationMethod);

    List<RiskAssessPlanEvaluateMes> listMesByParam(Long assessPlanId,Long identificationId, Byte identificationMethod);
}

 src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/RiskAssessPlanEvaluateRsService.java

@@ -44,4 +44,6 @@
    int deleteRsByPlan(Long id);

    RiskAssessPlanEvaluateRs getRsByIdentificationId(Long id, Byte identificationMethod);

    List<RiskAssessPlanEvaluateRs> listRsByParam(Long assessPlanId,  Long identificationId, Byte identificationMethod);
}

 src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/impl/ReportRiskAssessInfoServiceImpl.java

@@ -39,6 +39,7 @@
import com.gkhy.labRiskManage.domain.experiment.service.ExperimentInfoService;
import com.gkhy.labRiskManage.domain.riskReport.entity.*;
import com.gkhy.labRiskManage.domain.riskReport.model.bo.ReportQueryBO;
import com.gkhy.labRiskManage.domain.riskReport.model.bo.RiskPlanMethodBO;
import com.gkhy.labRiskManage.domain.riskReport.model.bo.UpdateExperimentInfoBO;
import com.gkhy.labRiskManage.domain.riskReport.model.dto.*;
import com.gkhy.labRiskManage.domain.riskReport.repository.jpa.ReportRiskAssessInfoRepository;
@@ -117,6 +118,18 @@
    private OldRiskAssessService oldRiskAssessService;


    @Autowired
    private RiskAssessPlanIdentificationAnalogyService analogyService;
    @Autowired
    private RiskAssessPlanIdentificationHazopService hazopService;
    @Autowired
    private RiskAssessPlanIdentificationJhaService jhaService;
    @Autowired
    private RiskAssessPlanIdentificationPhaService phaService;
    @Autowired
    private RiskAssessPlanIdentificationSclService sclService;


    /**
     * 风险评估报告 - 查询
     */
@@ -136,6 +149,9 @@
        }
        if (queryBO.getExperimentName() == ""){
            queryBO.setExperimentName(null);
        }
        if (queryBO.getExportTag() == null){
            queryBO.setExportTag(false);
        }
        UserInfoDomainDTO user = userDomainService.getUserById(currentUserId);
        if (ObjectUtils.isEmpty(user)){
@@ -224,8 +240,14 @@
            }



            if (!ObjectUtils.isEmpty(assessPlanByExperimentId)){
                //导出  查询辨识方法塞入数据
                if (queryBO.getExportTag()){
                    reportQueryDTO.setRiskPlanMethodBO(getRiskPlanMethodBO(assessPlanByExperimentId));
                }
                for (AssessPlanQueryDTO assessPlan : assessPlanByExperimentId) {

                    if (assessPlan.getEvaluateTime() != null){
                        if (reportQueryDTO.getEvaluateTime().isBefore(assessPlan.getEvaluateTime())){
                            reportQueryDTO.setEvaluateTime(assessPlan.getEvaluateTime());
@@ -233,6 +255,7 @@
                    }

                }

            }

            if (!ObjectUtils.isEmpty(riskSourceByReportId)){
@@ -260,14 +283,13 @@
            reportQueryDTO.setExperimentCode(experimentById.getExperimentCode());

            for (UserInfoDomainDTO userInfo : userList) {
                if (userInfo.getId() == reportQueryDTO.getCreateByUserId()){
                if (Objects.equals(userInfo.getId(), reportQueryDTO.getCreateByUserId())){
                    reportQueryDTO.setCreateByUserName(userInfo.getRealName());
                }
                if (userInfo.getId() == reportQueryDTO.getUpdateByUserId()){
                if (Objects.equals(userInfo.getId(), reportQueryDTO.getUpdateByUserId())){
                    reportQueryDTO.setUpdateByUserName(userInfo.getRealName());
                }
            }



        }
@@ -277,7 +299,134 @@
        return searchResult;
    }

    
    private List<RiskPlanMethodBO> getRiskPlanMethodBO(List<AssessPlanQueryDTO> assessPlanByExperimentId) {

        List<RiskPlanMethodBO> riskPlanMethodBOList = new ArrayList<>();
        for (AssessPlanQueryDTO assessPlanQueryDTO : assessPlanByExperimentId) {
                //辨识方法 1-PHA；
            if (assessPlanQueryDTO.getIdentificationMethod() == 1) {
                List<PhaQueryDTO> phaQueryDTOS = phaService.listPhaByPlanId(assessPlanQueryDTO.getId());
                if (ObjectUtils.isEmpty(phaQueryDTOS)){
                    continue;
                }
                for (PhaQueryDTO phaQueryDTO : phaQueryDTOS) {
                    RiskPlanMethodBO riskPlanMethodBO = new RiskPlanMethodBO();
                    riskPlanMethodBO.setAssessPlanName(assessPlanQueryDTO.getAssessPlanName());
                    riskPlanMethodBO.setCheckItem(phaQueryDTO.getPhaCheckItem());
                    riskPlanMethodBO.setRiskFactor(phaQueryDTO.getPhaRiskFactor());
                    riskPlanMethodBO.setResult(phaQueryDTO.getPhaResult());
                    riskPlanMethodBO.setIdentificationMethod(assessPlanQueryDTO.getIdentificationMethod());
                    riskPlanMethodBO.setEvaluateMethod(assessPlanQueryDTO.getEvaluateMethod());
                    dealRiskPlanMethodBO(assessPlanQueryDTO,riskPlanMethodBO,phaQueryDTO.getId());
                    riskPlanMethodBOList.add(riskPlanMethodBO);
                }

                //辨识方法 2-JHA；
            } else if (assessPlanQueryDTO.getIdentificationMethod() == 2) {
                List<JhaQueryDTO> jhaQueryDTOS = jhaService.listJhaByPlanId(assessPlanQueryDTO.getId());
                if (ObjectUtils.isEmpty(jhaQueryDTOS)){
                    continue;
                }
                for (JhaQueryDTO jhaQueryDTO : jhaQueryDTOS) {
                    RiskPlanMethodBO riskPlanMethodBO = new RiskPlanMethodBO();
                    riskPlanMethodBO.setAssessPlanName(assessPlanQueryDTO.getAssessPlanName());
                    riskPlanMethodBO.setCheckItem(jhaQueryDTO.getJhaCheckItem());
                    riskPlanMethodBO.setRiskFactor(jhaQueryDTO.getJhaRiskFactor());
                    riskPlanMethodBO.setResult(jhaQueryDTO.getJhaResult());
                    riskPlanMethodBO.setIdentificationMethod(assessPlanQueryDTO.getIdentificationMethod());
                    riskPlanMethodBO.setEvaluateMethod(assessPlanQueryDTO.getEvaluateMethod());
                    dealRiskPlanMethodBO(assessPlanQueryDTO,riskPlanMethodBO,jhaQueryDTO.getId());
                    riskPlanMethodBOList.add(riskPlanMethodBO);
                }

                //辨识方法 3-SCL；
            } else if (assessPlanQueryDTO.getIdentificationMethod() == 3) {
                List<SclQueryDTO> sclQueryDTOS = sclService.listSclByPlanId(assessPlanQueryDTO.getId());
                if (ObjectUtils.isEmpty(sclQueryDTOS)){
                    continue;
                }
                for (SclQueryDTO sclQueryDTO : sclQueryDTOS) {
                    RiskPlanMethodBO riskPlanMethodBO = new RiskPlanMethodBO();
                    riskPlanMethodBO.setAssessPlanName(assessPlanQueryDTO.getAssessPlanName());
                    riskPlanMethodBO.setCheckItem(sclQueryDTO.getSclCheckItem());
                    riskPlanMethodBO.setRiskFactor(sclQueryDTO.getSclCheckStandard());
                    riskPlanMethodBO.setResult(sclQueryDTO.getSclCheckResult());
                    riskPlanMethodBO.setIdentificationMethod(assessPlanQueryDTO.getIdentificationMethod());
                    riskPlanMethodBO.setEvaluateMethod(assessPlanQueryDTO.getEvaluateMethod());
                    dealRiskPlanMethodBO(assessPlanQueryDTO,riskPlanMethodBO,sclQueryDTO.getId());
                    riskPlanMethodBOList.add(riskPlanMethodBO);
                }
                //辨识方法 4-HAZOP；
            } else if (assessPlanQueryDTO.getIdentificationMethod() == 4) {
                List<HazopQueryDTO> hazopQueryDTOS = hazopService.listHazopByPlanId(assessPlanQueryDTO.getId());
                if (ObjectUtils.isEmpty(hazopQueryDTOS)){
                    continue;
                }
                for (HazopQueryDTO hazopQueryDTO : hazopQueryDTOS) {
                    RiskPlanMethodBO riskPlanMethodBO = new RiskPlanMethodBO();
                    riskPlanMethodBO.setAssessPlanName(assessPlanQueryDTO.getAssessPlanName());
                    riskPlanMethodBO.setCheckItem(hazopQueryDTO.getHazopNode());
                    riskPlanMethodBO.setRiskFactor(hazopQueryDTO.getHazopParam());
                    riskPlanMethodBO.setResult(hazopQueryDTO.getHazopResult());
                    riskPlanMethodBO.setIdentificationMethod(assessPlanQueryDTO.getIdentificationMethod());
                    riskPlanMethodBO.setEvaluateMethod(assessPlanQueryDTO.getEvaluateMethod());
                    dealRiskPlanMethodBO(assessPlanQueryDTO,riskPlanMethodBO,hazopQueryDTO.getId());
                    riskPlanMethodBOList.add(riskPlanMethodBO);
                }
                //5-类比法 analogy；
            } else if (assessPlanQueryDTO.getIdentificationMethod() == 5) {
                List<AnalogyQueryDTO> analogyQueryDTOS = analogyService.listAnalogyByPlanId(assessPlanQueryDTO.getId());
                if (ObjectUtils.isEmpty(analogyQueryDTOS)){
                    continue;
                }
                for (AnalogyQueryDTO analogyQueryDTO : analogyQueryDTOS) {
                    RiskPlanMethodBO riskPlanMethodBO = new RiskPlanMethodBO();
                    riskPlanMethodBO.setAssessPlanName(assessPlanQueryDTO.getAssessPlanName());
                    riskPlanMethodBO.setCheckItem(analogyQueryDTO.getAnalogyCheckItem());
                    riskPlanMethodBO.setRiskFactor(analogyQueryDTO.getAnalogyRiskFactor());
                    riskPlanMethodBO.setResult(analogyQueryDTO.getAnalogyResult());
                    riskPlanMethodBO.setIdentificationMethod(assessPlanQueryDTO.getIdentificationMethod());
                    riskPlanMethodBO.setEvaluateMethod(assessPlanQueryDTO.getEvaluateMethod());
                    dealRiskPlanMethodBO(assessPlanQueryDTO,riskPlanMethodBO,analogyQueryDTO.getId());
                    riskPlanMethodBOList.add(riskPlanMethodBO);
                }
            }
        }
        return riskPlanMethodBOList;
    }

    private void dealRiskPlanMethodBO(AssessPlanQueryDTO assessPlanQueryDTO,  RiskPlanMethodBO riskPlanMethodBO,Long dataId) {
        //lec  方法
        if (assessPlanQueryDTO.getEvaluateMethod() == 1){
            List<RiskAssessPlanEvaluateLec> riskAssessPlanEvaluateLecs =
                    lecService.listLecByParam(assessPlanQueryDTO.getId(), dataId, assessPlanQueryDTO.getIdentificationMethod());
            if (!ObjectUtils.isEmpty(riskAssessPlanEvaluateLecs)){
                riskPlanMethodBO.setRiskLevel(riskAssessPlanEvaluateLecs.get(0).getRiskLevel());
                riskPlanMethodBO.setEvaluateDesc(riskAssessPlanEvaluateLecs.get(0).getEvaluateDesc());
            }
        }else if (assessPlanQueryDTO.getEvaluateMethod() == 2){
            List<RiskAssessPlanEvaluateLs> riskAssessPlanEvaluateLs = lsService.listLsByParam(assessPlanQueryDTO.getId(), dataId, assessPlanQueryDTO.getIdentificationMethod());
            if (!ObjectUtils.isEmpty(riskAssessPlanEvaluateLs)){
                riskPlanMethodBO.setRiskLevel(riskAssessPlanEvaluateLs.get(0).getRiskLevel());
                riskPlanMethodBO.setEvaluateDesc(riskAssessPlanEvaluateLs.get(0).getEvaluateDesc());
            }
        }else if (assessPlanQueryDTO.getEvaluateMethod() == 3){
            List<RiskAssessPlanEvaluateMes> riskAssessPlanEvaluateMes = mesService.listMesByParam(assessPlanQueryDTO.getId(), dataId, assessPlanQueryDTO.getIdentificationMethod());
            if (!ObjectUtils.isEmpty(riskAssessPlanEvaluateMes)){
                riskPlanMethodBO.setRiskLevel(riskAssessPlanEvaluateMes.get(0).getRiskLevel());
                riskPlanMethodBO.setEvaluateDesc(riskAssessPlanEvaluateMes.get(0).getEvaluateDesc());
            }

        }else if (assessPlanQueryDTO.getEvaluateMethod() == 4){
            List<RiskAssessPlanEvaluateRs> riskAssessPlanEvaluateRs = rsService.listRsByParam(assessPlanQueryDTO.getId(), dataId, assessPlanQueryDTO.getIdentificationMethod());
            if (!ObjectUtils.isEmpty(riskAssessPlanEvaluateRs)){
                riskPlanMethodBO.setRiskLevel(riskAssessPlanEvaluateRs.get(0).getRiskLevel());
                riskPlanMethodBO.setEvaluateDesc(riskAssessPlanEvaluateRs.get(0).getEvaluateDesc());
            }
        }
    }


    /**
     * 风险评估报告 - 生成报告信息
     */
@@ -322,6 +471,11 @@
        Byte level = 0;
        //获取该实验的所有计划信息
        List<AssessPlanQueryDTO> assessPlanList = assessPlanService.getAssessPlanByExperimentId(id);
        Map<Long, String> assessPlanMap = assessPlanList.stream()
                .collect(Collectors.toMap(
                        AssessPlanQueryDTO::getId,
                        AssessPlanQueryDTO::getAssessPlanName
                ));
        int tag = 0;
        StringBuilder info = new StringBuilder();
        List<Long>  assessPlanIds = new ArrayList<>();
@@ -359,7 +513,7 @@
                if (lecById.getRiskLevel() > level){
                    riskLevelList.add(lecById.getRiskLevel());
                    level = lecById.getRiskLevel();
                    analysis.append(a + lecById.getSafeRiskAnalysis() + ";");//todo 安全风险分析
                    analysis.append(a +(ObjectUtils.isEmpty(assessPlanMap.get(lecById.getAssessPlanId())) ? "" : assessPlanMap.get(lecById.getAssessPlanId()))+ lecById.getSafeRiskAnalysis() + ";");//todo 安全风险分析
                    a++;
                }
            }
@@ -369,7 +523,7 @@
                if (lsById.getRiskLevel() > level){
                    riskLevelList.add(lsById.getRiskLevel());
                    level = lsById.getRiskLevel();
                    analysis.append(a + lsById.getSafeRiskAnalysis() + ";");
                    analysis.append(a +(ObjectUtils.isEmpty(assessPlanMap.get(lsById.getAssessPlanId())) ? "" : assessPlanMap.get(lsById.getAssessPlanId()))+ lsById.getSafeRiskAnalysis() + ";");
                    a++;
                }
            }
@@ -379,7 +533,7 @@
                if (mesById.getRiskLevel() > level){
                    riskLevelList.add(mesById.getRiskLevel());
                    level = mesById.getRiskLevel();
                    analysis.append(a + mesById.getSafeRiskAnalysis() + ";");
                    analysis.append(a +(ObjectUtils.isEmpty(assessPlanMap.get(mesById.getAssessPlanId())) ? "" : assessPlanMap.get(mesById.getAssessPlanId()))+ mesById.getSafeRiskAnalysis() + ";");
                    a++;
                }
            }
@@ -390,7 +544,7 @@
                if (rsById.getRiskLevel() > level){
                    riskLevelList.add(rsById.getRiskLevel());
                    level = rsById.getRiskLevel();
                    analysis.append(a + rsById.getSafeRiskAnalysis() + ";");
                    analysis.append(a +(ObjectUtils.isEmpty(assessPlanMap.get(rsById.getAssessPlanId())) ? "" : assessPlanMap.get(rsById.getAssessPlanId()))+ rsById.getSafeRiskAnalysis() + ";");
                    a++;
                }
            }

 src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/impl/RiskAssessPlanEvaluateLecServiceImpl.java

@@ -21,6 +21,7 @@

import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.Collections;
import java.util.List;

/**
@@ -374,4 +375,9 @@
    public RiskAssessPlanEvaluateLec getLecByIdentificationId(Long identificationId, Byte identificationMethod) {
        return lecRepository.getLecByIdentification(identificationId, identificationMethod);
    }

    @Override
    public List<RiskAssessPlanEvaluateLec> listLecByParam(Long assessPlanId, Long identificationId, Byte identificationMethod) {
        return lecRepository.getLecByByParam(assessPlanId,identificationId,  identificationMethod);
    }
}

 src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/impl/RiskAssessPlanEvaluateLsServiceImpl.java

@@ -19,6 +19,7 @@

import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.Collections;
import java.util.List;

/**
@@ -338,4 +339,9 @@
    public RiskAssessPlanEvaluateLs getLsByIdentificationId(Long id, Byte identificationMethod) {
        return lsRepository.getLsByIdentification(id, identificationMethod);
    }

    @Override
    public List<RiskAssessPlanEvaluateLs> listLsByParam(Long id, Long identificationId, Byte identificationMethod) {
        return lsRepository.getLsByParam(id, identificationId, identificationMethod);
    }
}

 src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/impl/RiskAssessPlanEvaluateMesServiceImpl.java

@@ -23,6 +23,7 @@

import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.Collections;
import java.util.List;

/**
@@ -357,4 +358,9 @@
    public RiskAssessPlanEvaluateMes getMesByIdentificationId(Long id, Byte identificationMethod) {
        return mesRepository.getMesByIdentification(id, identificationMethod);
    }

    @Override
    public List<RiskAssessPlanEvaluateMes> listMesByParam(Long assessPlanId, Long identificationId, Byte identificationMethod) {
        return mesRepository.listMesByParam(assessPlanId, identificationId, identificationMethod);
    }
}

 src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/impl/RiskAssessPlanEvaluateRsServiceImpl.java

@@ -22,6 +22,7 @@

import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.Collections;
import java.util.List;

/**
@@ -341,4 +342,9 @@
    public RiskAssessPlanEvaluateRs getRsByIdentificationId(Long id, Byte identificationMethod) {
        return rsRepository.getRsByIdentification(id, identificationMethod);
    }

    @Override
    public List<RiskAssessPlanEvaluateRs> listRsByParam(Long assessPlanId, Long identificationId, Byte identificationMethod) {
        return rsRepository.listRsByParam(assessPlanId, identificationId, identificationMethod);
    }
}

 src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/impl/RiskAssessPlanServiceImpl.java

@@ -1238,7 +1238,6 @@
        PageRequest pageParam = PageRequest.of(queryParam.getPageIndex() - 1, queryParam.getPageSize(), Sort.Direction.DESC, "updateTime");
        Page<RiskAssessPlan> pageResult = assessPlanRepository.findAll(specification, pageParam);
        long pageCount = riskPlanDataMapper.getPageCount(queryParam);
        System.out.println("pageCountpageCountpageCountpageCountpageCountpageCount:"+pageCount);


        //循环遍历结果集，封装查询结果