diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/StatisticsVo.java b/acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/StatisticsVo.java index f708a2b7..d9b7fbb6 100644 --- a/acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/StatisticsVo.java +++ b/acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/StatisticsVo.java @@ -168,6 +168,8 @@ public class StatisticsVo { private Integer sort; private String type; + private String disease_name; + private Integer count; public SortVo(Integer total, Integer sort, String type) { this.total = total; this.sort = sort; diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/persist/dao/StatisticsDao.java b/acupuncture-system/src/main/java/com/acupuncture/system/persist/dao/StatisticsDao.java index b943a575..3c9451df 100644 --- a/acupuncture-system/src/main/java/com/acupuncture/system/persist/dao/StatisticsDao.java +++ b/acupuncture-system/src/main/java/com/acupuncture/system/persist/dao/StatisticsDao.java @@ -37,6 +37,9 @@ public interface StatisticsDao { StatisticsVo.PatientVo.JwbzVo queryJwbzStatistics(@Param("dto") StatisticsDto.Query dto, @Param("tenantId") Long tenantId); + List queryZyzdStatistics(@Param("dto") StatisticsDto.Query dto, + @Param("tenantId") Long tenantId); + Integer queryTotalPatient(@Param("dto") StatisticsDto.Query dto, @Param("tenantId") Long tenantId); @@ -75,5 +78,7 @@ public interface StatisticsDao { @Param("tenantId") Long tenantId); StatisticsVo.ZlTypeVo.BzfffbVo.Smz querySmzStatistics(StatisticsDto.Query dto, Long tenantId); + + } diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/StatisticsServiceImpl.java b/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/StatisticsServiceImpl.java index ab061999..cbfde025 100644 --- a/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/StatisticsServiceImpl.java +++ b/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/StatisticsServiceImpl.java @@ -10,7 +10,9 @@ import com.acupuncture.system.service.StatisticsService; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.Comparator; import java.util.List; +import java.util.stream.Collectors; /** * @Author zzc @@ -36,9 +38,9 @@ public class StatisticsServiceImpl implements StatisticsService { @Override public StatisticsVo.TreamentVo queryZlStatistics(StatisticsDto.Query dto) { StatisticsVo.TreamentVo treamentVo = new StatisticsVo.TreamentVo(); - StatisticsVo.PatientVo.JwbzVo jwbzVo = statisticsDao.queryJwbzStatistics(dto, SecurityUtils.getTenantId()); - if (jwbzVo != null) { - treamentVo.setSort(jwbzVo.sortFields()); + List sortVoList = statisticsDao.queryZyzdStatistics(dto, SecurityUtils.getTenantId()); + if (CollUtil.isNotEmpty(sortVoList)) { + treamentVo.setSort(sortVoList.stream().sorted(Comparator.comparing(StatisticsVo.TreamentVo.SortVo::getSort, Comparator.reverseOrder())).collect(Collectors.toList())); } treamentVo.setTxfb(statisticsDao.queryTxfbStatistics(dto, SecurityUtils.getTenantId())); treamentVo.setZytz(statisticsDao.queryZytzStatistics(dto, SecurityUtils.getTenantId())); diff --git a/acupuncture-system/src/main/resources/mapper/dao/StatisticsDao.xml b/acupuncture-system/src/main/resources/mapper/dao/StatisticsDao.xml index f2a6080d..c50c97b8 100644 --- a/acupuncture-system/src/main/resources/mapper/dao/StatisticsDao.xml +++ b/acupuncture-system/src/main/resources/mapper/dao/StatisticsDao.xml @@ -34,45 +34,7 @@ + + + + + + + +