修改疾病管理bug

huimv-smart-management/src/main/java/com/huimv/management/service/impl/HealthMedicalRecordServiceImpl.java

@@ -107,20 +107,38 @@ public class HealthMedicalRecordServiceImpl extends ServiceImpl<HealthMedicalRec
 
         QueryWrapper<HealthMedicalRecordEntity> medicalWrapper = new QueryWrapper<HealthMedicalRecordEntity>();
         medicalWrapper.eq("farm_id",Integer.parseInt(farmId));
-        //小于
-        medicalWrapper.le("create_time",endTime);
+
         //大于等于
         medicalWrapper.ge("create_time",startTime);
         //逻辑删除
         medicalWrapper.apply("effective = 1");
 
 
+
         //疾病统计
         List<DiseaseDto> diseaseDtos  = healthMedicalRecordDao.diseaseCount(medicalWrapper);
         resultMap.put("diseaseCount",diseaseDtos);
 
         //治愈统计
-        List<TreatResultDto> treatResultDtos = healthMedicalRecordDao.treatResultCount(medicalWrapper);
+        List<TreatResultDto> treatResultDtos = new ArrayList<>();
+
+        medicalWrapper.eq("result",1);
+        TreatResultDto dto =new TreatResultDto();
+        dto.setTreatResult(1+"");
+        dto.setTreatResultCount( healthMedicalRecordDao.selectCount(medicalWrapper));
+        treatResultDtos.add(dto);
+
+        medicalWrapper.clear();
+        medicalWrapper.eq("result",2);
+        medicalWrapper.eq("farm_id",Integer.parseInt(farmId));
+        medicalWrapper.ge("create_time",startTime);
+        TreatResultDto dto2 =new TreatResultDto();
+        dto2.setTreatResult(2+"");
+        dto2.setTreatResultCount( healthMedicalRecordDao.selectCount(medicalWrapper));
+        treatResultDtos.add(dto2);
+
+
+
         resultMap.put("treatResultCount",treatResultDtos);