ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoReportController.java
@@ -160,7 +160,7 @@ boolean b = serviceDonatebaseinfoReportService.updateById(serviceDonatebaseinfoReport); if (b) { serviceDonatebaseinfoReportFileService.updateList(serviceDonatebaseinfoReport.getAnnexfilesList(), serviceDonatebaseinfoReport.getId(), serviceDonatebaseinfoReport.getCaseNo(), getNickName()); if (serviceDonatebaseinfoReport.getReportStatus().equals("3")) { if (serviceDonatebaseinfoReport.getReportStatus().equals("3")&&serviceDonatebaseinfoReport.getIsDonate().equals(1)) { //妿åæä¸æ¥ï¼é£å°±å¯ä»¥å»ºæ¡£äºï¼å¾ ServiceDonatebaseinfoæ°å¢ï¼ serviceDonatebaseinfoReportService.createDocument(serviceDonatebaseinfoReport); } @@ -180,4 +180,20 @@ serviceDonatebaseinfoReport.setDelFlag(1); return toAjax(serviceDonatebaseinfoReportService.updateById(serviceDonatebaseinfoReport)); } /** * ä¿®æ¹æç®ä¸æ¥åºç¡ */ @ApiOperation("䏿¥") @Log(title = "䏿¥", businessType = BusinessType.UPDATE) @PostMapping("/report") @RepeatSubmit public AjaxResult report(@RequestBody ServiceDonatebaseinfoReport serviceDonatebaseinfoReport) { if (StringUtils.isEmpty(serviceDonatebaseinfoReport.getCaseNo())) { throw new BaseException("æ¡ä¾ç¼å·ä¸ºç©ºï¼è¯·æ£æ¥ååä¿®æ¹"); } boolean b = serviceDonatebaseinfoReportService.updateById(serviceDonatebaseinfoReport); return toAjax(b); } } ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceEthicalreviewopinionsController.java
@@ -1,5 +1,7 @@ package com.ruoyi.web.controller.project; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.NotRepeatCommit; @@ -14,6 +16,9 @@ import com.ruoyi.project.domain.ServiceEthicalreviewopinions; import com.ruoyi.project.domain.vo.EthicalReviewVO; import com.ruoyi.project.service.IServiceEthicalreviewopinionsService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -103,4 +108,39 @@ public AjaxResult remove(@PathVariable Long[] ids) { return toAjax(serviceEthicalreviewopinionsService.removeByIds(Arrays.asList(ids))); } /** * è·å伦ç审æ¥ä¸å®¶æ°é */ @ApiOperation("è·å伦ç审æ¥ä¸å®¶æ°é") @GetMapping(value = "/expertCount") public AjaxResult count(Integer InfoID) { QueryWrapper<ServiceEthicalreviewopinions> ethicalreviewopinionsWrapper=new QueryWrapper<>(); ethicalreviewopinionsWrapper.eq("InfoID",InfoID); long count =serviceEthicalreviewopinionsService.count(ethicalreviewopinionsWrapper); return AjaxResult.success(count); } /** * è·å伦ç审æ¥ä¸å®¶æ¥æ¶ */ @ApiOperation("è·å伦ç审æ¥ä¸å®¶æ¥æ¶") @GetMapping("/receiveStatus") public AjaxResult receiveStatus(Integer InfoID,String DonorNo) { QueryWrapper<ServiceEthicalreviewopinions> ethicalreviewopinionsWrapper=new QueryWrapper<>(); ethicalreviewopinionsWrapper.eq("InfoID",InfoID).eq("DonorNo",DonorNo); ServiceEthicalreviewopinions serviceEthicalreviewopinions =new ServiceEthicalreviewopinions(); serviceEthicalreviewopinions.setReceiveStatus("1"); return toAjax(serviceEthicalreviewopinionsService.update(serviceEthicalreviewopinions,ethicalreviewopinionsWrapper)); } /** * è·å伦ç审æ¥ä¸å®¶æ°é */ @ApiOperation("ä¸å®¶ç»è®¡è¯¦æ ") @GetMapping(value = "/expertTotal") public AjaxResult expertTotal(String DonorNo) { return AjaxResult.success(serviceEthicalreviewopinionsService.expertTotal(DonorNo)); } } ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDeathinfo.java
@@ -115,5 +115,31 @@ @ApiModelProperty("ç¶æ1å¾ å©ç¨ï¼2è¿è¡ä¸ï¼3æç®å®æï¼4æ¾å¼") @Excel(name = "ç¶æ1å¾ å©ç¨ï¼2è¿è¡ä¸ï¼3æç®å®æï¼4æ¾å¼") private String state; /** æ»äº¡æ¶é´ */ @ApiModelProperty("å¿æ»äº¡æ¶é´") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "å¿æ»äº¡æ¶é´", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date heartdeathtime; /** æ»äº¡åå */ @ApiModelProperty("å¿æ»äº¡åå ") @Excel(name = "å¿æ»äº¡åå ") private String heartdeathreason; /** æ»äº¡å¤å®å»çä¸ */ @ApiModelProperty("å¿æ»äº¡å¤å®å»çä¸") @Excel(name = "å¿æ»äº¡å¤å®å»çä¸") private String heartdeathjudgedocto; /** æ»äº¡å¤å®å»çäº */ @ApiModelProperty("å¿æ»äº¡å¤å®å»çäº") @Excel(name = "å¿æ»äº¡å¤å®å»çäº") private String heartdeathjudgedoctt; /** æ»äº¡è¯æéä»¶ */ @ApiModelProperty("å¿æ»äº¡è¯æéä»¶") @Excel(name = "å¿æ»äº¡è¯æéä»¶") private String heartdeathjudgeannex; } ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfoReport.java
@@ -431,5 +431,16 @@ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date entryTime; @ApiModelProperty("驳åç±»å") @Excel(name = "驳åç±»å") private String rejectType; /** * æ¯å¦ä¸æ¥0ä¸ä¸æ¥1䏿¥ */ @TableField(exist = false) @ApiModelProperty("æ¯å¦æç®0䏿ç®1æç®") private Integer isDonate; } ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceEthicalreviewinitiate.java
@@ -133,5 +133,9 @@ @ApiModelProperty("éä»¶å¤ä¸ª;éå¼") @Excel(name = "éä»¶å¤ä¸ª;éå¼") private String filePatch; @ApiModelProperty("ç¾å") @Excel(name = "ç¾å") private String sigin; } ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DeathBaseInfoDTO.java
@@ -211,5 +211,31 @@ @Excel(name = "ç¶æ1å¾ å©ç¨ï¼2è¿è¡ä¸ï¼3æç®å®æï¼4æ¾å¼") private String state; /** æ»äº¡æ¶é´ */ @ApiModelProperty("å¿æ»äº¡æ¶é´") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "å¿æ»äº¡æ¶é´", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date heartdeathtime; /** æ»äº¡åå */ @ApiModelProperty("å¿æ»äº¡åå ") @Excel(name = "å¿æ»äº¡åå ") private String heartdeathreason; /** æ»äº¡å¤å®å»çä¸ */ @ApiModelProperty("å¿æ»äº¡å¤å®å»çä¸") @Excel(name = "å¿æ»äº¡å¤å®å»çä¸") private String heartdeathjudgedocto; /** æ»äº¡å¤å®å»çäº */ @ApiModelProperty("å¿æ»äº¡å¤å®å»çäº") @Excel(name = "å¿æ»äº¡å¤å®å»çäº") private String heartdeathjudgedoctt; /** æ»äº¡è¯æéä»¶ */ @ApiModelProperty("å¿æ»äº¡è¯æéä»¶") @Excel(name = "å¿æ»äº¡è¯æéä»¶") private String heartdeathjudgeannex; } ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/ReviewInitiateBaseInfoDTO.java
@@ -168,5 +168,8 @@ @Excel(name = "éä»¶å¤ä¸ª;éå¼") private String filePatch; @ApiModelProperty("ç¾å") @Excel(name = "ç¾å") private String sigin; } ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/EthicalreviewopinionsTotalVO.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,29 @@ package com.ruoyi.project.domain.vo; import com.ruoyi.common.annotation.Excel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data public class EthicalreviewopinionsTotalVO { @ApiModelProperty("æ»æ°é") private String count; @ApiModelProperty("å·²æ¥æ¶æ°é") private String acceptCount; @ApiModelProperty("æªæ¥æ¶æ°é") private String notAcceptCount; @ApiModelProperty("æä¸æè§æ°é") private String opinionCount; @ApiModelProperty("æ²¡ä¸æè§æ°é") private String notApinionCount; @ApiModelProperty("æä¸æéä»¶é") private String annexCount; @ApiModelProperty("æ²¡ä¸æéä»¶é") private String notAnnexCount; } ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceEthicalreviewopinionsMapper.java
@@ -5,6 +5,7 @@ import java.util.List; import com.ruoyi.project.domain.ServiceEthicalreviewopinions; import com.ruoyi.project.domain.vo.EthicalReviewVO; import com.ruoyi.project.domain.vo.EthicalreviewopinionsTotalVO; import com.ruoyi.project.domain.vo.TimeVO; import org.apache.ibatis.annotations.Mapper; @@ -28,4 +29,6 @@ List<EthicalReviewVO> selectVOList(EthicalReviewVO ethicalReviewVO); Integer countNumber(TimeVO timeVO); List<EthicalreviewopinionsTotalVO> expertTotal(String DonorNo); } ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceEthicalreviewopinionsService.java
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.project.domain.ServiceEthicalreviewopinions; import com.ruoyi.project.domain.vo.EthicalReviewVO; import com.ruoyi.project.domain.vo.EthicalreviewopinionsTotalVO; /** * 伦ç审æ¥ä¸å®¶æè§Serviceæ¥å£ @@ -26,4 +27,6 @@ public Page<ServiceEthicalreviewopinions> queryListByPage(ServiceEthicalreviewopinions serviceEthicalreviewopinions); List<EthicalReviewVO> selectVOList(EthicalReviewVO ethicalReviewVO); List<EthicalreviewopinionsTotalVO> expertTotal(String DonorNo); } ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceEthicalreviewopinionsServiceImpl.java
@@ -14,6 +14,7 @@ import com.ruoyi.project.common.CalculateDateUtils; import com.ruoyi.project.domain.ServiceDonationwitness; import com.ruoyi.project.domain.vo.EthicalReviewVO; import com.ruoyi.project.domain.vo.EthicalreviewopinionsTotalVO; import com.ruoyi.project.domain.vo.MedicalEvaluationVO; import com.ruoyi.project.mapper.ServiceDonationwitnessMapper; import lombok.extern.slf4j.Slf4j; @@ -202,4 +203,9 @@ return ethicalReviewVOS; } public List<EthicalreviewopinionsTotalVO> expertTotal(String DonorNo) { return serviceEthicalreviewopinionsMapper.expertTotal(DonorNo); } } ruoyi-project/src/main/resources/mapper/project/ServiceDeathinfoMapper.xml
@@ -50,7 +50,12 @@ update_time, judgment_description, ext_content, state state, heartDeathTime heartDeathReason heartDeathJudgeDoctO heartDeathJudgeDoctT heartDeathJudgeAnnex from service_deathinfo </sql> @@ -111,7 +116,12 @@ sdi.RememberAnnex as rememberannex, sdi.ResponsibleUserID as responsibleuserid, sdi.ResponsibleUserName as responsibleusername, sdi.state sdi.state, sdi.heartDeathTime as heartdeathtime, sdi.heartDeathReason as heartdeathreason, sdi.heartDeathJudgeDoctO as heartdeathjudgedocto, sdi.heartDeathJudgeDoctT as heartdeathjudgedoctt, sdi.heartDeathJudgeAnnex as heartdeathjudgeannex FROM service_donatebaseinfo sd LEFT JOIN service_deathinfo sdi ON sd.ID = sdi.InfoID ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewinitiateMapper.xml
@@ -103,7 +103,8 @@ se.expert_opinion as expertOpinion, se.expert_time as expertTime, se.status as status, se.file_patch as filePatch se.file_patch as filePatch, se.sigin FROM service_donatebaseinfo sd LEFT JOIN service_ethicalreviewinitiate se ON sd.ID = se.InfoID and sd.del_flag = 0 ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewopinionsMapper.xml
@@ -186,4 +186,20 @@ and create_time <= #{endtime} </select> <select id="expertTotal" resultType="com.ruoyi.project.domain.vo.EthicalreviewopinionsTotalVO"> SELECT COUNT(*) count,SUM(CASE WHEN receive_status = 1 THEN 1 ELSE 0 END) AS acceptCount, SUM(CASE WHEN receive_status =0 THEN 1 ELSE 0 END) AS notAcceptCount, SUM(CASE WHEN ExpertOpinion IS not null THEN 1 ELSE 0 END) AS opinionCount, SUM(CASE WHEN ExpertOpinion IS null THEN 1 ELSE 0 END) AS notApinionCount, SUM(CASE WHEN ConclusionAnnex IS not null THEN 1 ELSE 0 END) AS annexCount, SUM(CASE WHEN ConclusionAnnex IS null THEN 1 ELSE 0 END) AS notAnnexCount FROM service_ethicalreviewopinions <where> <if test="DonorNo != null ">DonorNo = #{DonorNo}</if> </where> GROUP BY receive_status,ExpertOpinion,ConclusionAnnex </select> </mapper>