ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceMedicalevaluationController.java
@@ -91,7 +91,7 @@ //@PreAuthorize("@ss.hasPermi('project:medicalevaluation:add')") @Log(title = "医学评估", businessType = BusinessType.INSERT) @PostMapping("/add") @NotRepeatCommit(key = "param:arg[1]", value = 30000) // @NotRepeatCommit(key = "param:arg[1]", value = 30000) public AjaxResult add(@RequestBody ServiceMedicalevaluation serviceMedicalevaluation) { boolean save = serviceMedicalevaluationService.save(serviceMedicalevaluation); return AjaxResult.success(serviceMedicalevaluation); @@ -104,7 +104,7 @@ //@PreAuthorize("@ss.hasPermi('project:medicalevaluation:edit')") @Log(title = "医学评估", businessType = BusinessType.UPDATE) @PostMapping("/edit") @NotRepeatCommit(key = "param:arg[1]", value = 30000) // @NotRepeatCommit(key = "param:arg[1]", value = 30000) public AjaxResult edit(@RequestBody ServiceMedicalevaluation serviceMedicalevaluation) { List<ServiceMedicalevaluation> list = serviceMedicalevaluationService.queryList(serviceMedicalevaluation); if (CollectionUtils.isEmpty(list)) { ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonateorgan.java
@@ -9,12 +9,9 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.apache.poi.hpsf.Decimal; import org.springframework.format.annotation.DateTimeFormat; import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; /** * 捐献器官管理对象 service_donateorgan ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/TimeVO.java
@@ -19,6 +19,8 @@ private String city; private String reporterno; //器官移植状态 ：0：未移植；1：已移植，2：弃用 private Integer transplantstate = null; } ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateorganServiceImpl.java
@@ -11,6 +11,7 @@ import com.ruoyi.common.exception.base.BaseException; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.bean.DtoConversionUtils; import com.ruoyi.project.domain.*; import com.ruoyi.project.domain.vo.*; import com.ruoyi.project.mapper.*; @@ -250,7 +251,7 @@ og.setDonateTransferRate(transferRate); } //本年度移植器官数量 //本年度移植器官数量（含弃用） int organTransplantNumber = serviceDonateorganMapper.getAllFinishedOrgansThisYear(timeVO); //本年度DBD来源器官捐献者 int DBDDonaterNumber = serviceDonationwitnessMapper.getDBDDonaterNumberThisYear(timeVO); @@ -296,7 +297,15 @@ og.setMarginOrganRate(0.0); og.setGermPositiveRate(0.0); } else { double organUsedRate = (double) organTransplantNumber / (double) getOrganNumber; log.info("timeVO的值为 ： {}",timeVO); TimeVO timeVO1 = DtoConversionUtils.sourceToTarget(timeVO, TimeVO.class); timeVO1.setTransplantstate(1); //获取本年度已经移植器官数量 int organTransplantNumber2 = serviceDonateorganMapper.getAllFinishedOrgansThisYear(timeVO1); log.info("timeVO1的值为 ： {}",timeVO1); log.info("organTransplantNumber2的值为 ： {}",organTransplantNumber2); log.info("organTransplantNumber的值为 ： {}",organTransplantNumber); double organUsedRate = (double) organTransplantNumber2 / (double) organTransplantNumber; og.setOrganUsedRate(organUsedRate); double biopsyBeforeRate = (double) biopsyBeforeNumber / (double) getOrganNumber; ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml
@@ -235,6 +235,7 @@ AND d.OrganNo != 'C00' AND d.OrganNo != 'C69L' AND d.OrganNo != 'C69R' <if test="transplantstate != null">and d.transplantstate >= #{transplantstate}</if> <if test="starttime != null">and d.TransplantTime >= #{starttime}</if> <if test="endtime != null ">and d.TransplantTime <= #{endtime}</if> <if test="city != null and city != ''">and o.City = #{city}</if>
