gdxz/case-collection
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: gdxz:e880fbdbb19ba2e13aef50deb8255b7947d702fb
Branches Tags
gdxz:master
gdxz:dev
..
compare: gdxz:108aa68a17a6c2afe5d241710e000f7cf8c35d15
Branches Tags
gdxz:master
gdxz:dev

No commits in common. "e880fbdbb19ba2e13aef50deb8255b7947d702fb" and "108aa68a17a6c2afe5d241710e000f7cf8c35d15" have entirely different histories.
e880fbdbb1 ... 108aa68a17

3 changed files with 0 additions and 24 deletions
Show Stats Expand all files Collapse all files

3
sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/domain/vo/CaseplatformCaseVO.java
View File

@ -55,9 +55,6 @@ public class CaseplatformCaseVO {
@ApiModelPropertyEnum(value = CaseStatusEnum.class, desc = "0待审核 1审核通过 2审核不通过") @ApiModelPropertyEnum(value = CaseStatusEnum.class, desc = "0待审核 1审核通过 2审核不通过")
private Integer status; private Integer status;
@ApiModelProperty(value = "审核次数")
private int examineNum;
@ApiModelProperty(value = "审核通过时间") @ApiModelProperty(value = "审核通过时间")
private LocalDateTime examineTime; private LocalDateTime examineTime;

4
sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/domain/vo/EasyExcelCaseDetailVO.java
View File

@ -72,10 +72,6 @@ public class EasyExcelCaseDetailVO {
@ExcelProperty(value = "病例状态", converter = CaseStatusConverter.class) @ExcelProperty(value = "病例状态", converter = CaseStatusConverter.class)
private Integer status; private Integer status;
@ApiModelPropertyEnum(value = CaseStatusEnum.class, desc = "审核次数")
@ExcelProperty("审核次数")
private Integer examineNum;
@ApiModelProperty(value = "审核通过时间") @ApiModelProperty(value = "审核通过时间")
@ExcelProperty("审核时间") @ExcelProperty("审核时间")
private LocalDateTime examineTime; private LocalDateTime examineTime;

17
sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/service/CaseplatformCaseService.java
View File

@ -22,7 +22,6 @@ import net.lab1024.sa.admin.module.app.medicalrecord.domain.MedicalRecordCheckda
import net.lab1024.sa.admin.module.app.medicalrecord.domain.MedicalRecordDpmsEntity; import net.lab1024.sa.admin.module.app.medicalrecord.domain.MedicalRecordDpmsEntity;
import net.lab1024.sa.admin.module.app.medicalrecord.domain.MedicalRecordEntity; import net.lab1024.sa.admin.module.app.medicalrecord.domain.MedicalRecordEntity;
import net.lab1024.sa.admin.module.business.area.domain.vo.ProvVO; import net.lab1024.sa.admin.module.business.area.domain.vo.ProvVO;
import net.lab1024.sa.admin.module.business.caseplatformcase.constant.CaseStatusEnum;
import net.lab1024.sa.admin.module.business.caseplatformcase.dao.CaseplatformAcAppDao; import net.lab1024.sa.admin.module.business.caseplatformcase.dao.CaseplatformAcAppDao;
import net.lab1024.sa.admin.module.business.caseplatformcase.dao.CaseplatformCaseDao; import net.lab1024.sa.admin.module.business.caseplatformcase.dao.CaseplatformCaseDao;
import net.lab1024.sa.admin.module.business.caseplatformcase.dao.CaseplatformCaseExamineDao; import net.lab1024.sa.admin.module.business.caseplatformcase.dao.CaseplatformCaseExamineDao;
@ -169,11 +168,6 @@ public class CaseplatformCaseService {
List<CaseplatformCaseExamineVO> caseplatformCaseExamineVOs = SmartBeanUtil.copyList(caseplatformCaseExamines, CaseplatformCaseExamineVO.class); List<CaseplatformCaseExamineVO> caseplatformCaseExamineVOs = SmartBeanUtil.copyList(caseplatformCaseExamines, CaseplatformCaseExamineVO.class);
caseplatformCaseVO.setCaseplatformCaseExamineList(caseplatformCaseExamineVOs); caseplatformCaseVO.setCaseplatformCaseExamineList(caseplatformCaseExamineVOs);
} }
int examineNum = caseplatformCaseExamines.size();
if(caseplatformCaseVO.getStatus() == CaseStatusEnum.PASS.getValue()){
examineNum = examineNum + 1;
}
caseplatformCaseVO.setExamineNum(examineNum);
} }
PageResult<CaseplatformCaseVO> pageResult = SmartPageUtil.convert2PageResult(page, list); PageResult<CaseplatformCaseVO> pageResult = SmartPageUtil.convert2PageResult(page, list);
@ -228,17 +222,6 @@ public class CaseplatformCaseService {
} }
} }
List<EasyExcelCaseDetailVO> list = caseplatformCaseDao.excelList(queryForm, provList); List<EasyExcelCaseDetailVO> list = caseplatformCaseDao.excelList(queryForm, provList);
for (EasyExcelCaseDetailVO caseVO : list) {
// 获取审核失败原因
LambdaQueryWrapper<CaseplatformCaseExamineEntity> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(CaseplatformCaseExamineEntity::getCaseId, caseVO.getId());
List<CaseplatformCaseExamineEntity> caseplatformCaseExamines = caseplatformCaseExamineDao.selectList(queryWrapper);
int examineNum = caseplatformCaseExamines.size();
if(caseVO.getStatus() == CaseStatusEnum.PASS.getValue()){
examineNum = examineNum + 1;
}
caseVO.setExamineNum(examineNum);
}
return list; return list;
} }