代码提交

liusheng

9 天以前 d88fffd5d757a23f302011ced88dea92e1ce31e9

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceMedicalevaluationController.java

@@ -57,17 +57,17 @@
     */
    @ApiOperation("获取医疗评估患者基本信息列表")
    //// @PreAuthorize("@ss.hasPermi('project:medicalevaluation:list')")
    @PostMapping("/evaluateBaseInfolist")
    public Map<String, Object> evaluateBaseInfolist(@RequestBody MedicalEvaluationWithBaseInfoVO medicalEvaluationWithBaseInfoVO) {
    @PostMapping("/medevaluateBaseInfolist")
    public Map<String, Object> medevaluateBaseInfolist(@RequestBody MedicalEvaluationWithBaseInfoVO medicalEvaluationWithBaseInfoVO) {
        Integer offset = PageUtils.getOffset(medicalEvaluationWithBaseInfoVO.getPageNum(), medicalEvaluationWithBaseInfoVO.getPageSize());
        medicalEvaluationWithBaseInfoVO.setPageNum(offset);
        List<MedicalevaluationBaseInfoDTO> medicalEvaluationWithBaseInfoVOS = serviceMedicalevaluationService.evaluateBaseInfolist(medicalEvaluationWithBaseInfoVO);
        List<MedicalevaluationBaseInfoDTO> medicalEvaluationWithBaseInfoVOS = serviceMedicalevaluationService.medevaluateBaseInfolist(medicalEvaluationWithBaseInfoVO);

        //获取总数
        medicalEvaluationWithBaseInfoVO.setPageNum(null);
        medicalEvaluationWithBaseInfoVO.setPageSize(null);
        Integer totalCount = 0;
        List<MedicalevaluationBaseInfoDTO> total = serviceMedicalevaluationService.evaluateBaseInfolist(medicalEvaluationWithBaseInfoVO);
        List<MedicalevaluationBaseInfoDTO> total = serviceMedicalevaluationService.medevaluateBaseInfolist(medicalEvaluationWithBaseInfoVO);
        if (!CollectionUtils.isEmpty(total)) totalCount = total.size();
        return getDataTable(medicalEvaluationWithBaseInfoVOS, totalCount);
    }