diff --git a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/FmsFollowupController.java b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/FmsFollowupController.java deleted file mode 100644 index fa092ce5e..000000000 --- a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/FmsFollowupController.java +++ /dev/null @@ -1,103 +0,0 @@ -package com.acupuncture.web.controller.web; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.util.IdUtil; -import com.acupuncture.common.annotation.Anonymous; -import com.acupuncture.common.core.domain.BaseDto; -import com.acupuncture.common.core.domain.JsonResponse; -import com.acupuncture.framework.datasource.DynamicDataSourceContextHolder; -import com.acupuncture.system.domain.dto.FmsFollowupDto; -import com.acupuncture.system.domain.po.FmsFollowupTask; -import com.acupuncture.system.domain.vo.FmsFollowupVo; -import com.acupuncture.system.domain.vo.UmsDataSourceVo; -import com.acupuncture.system.persist.dao.FmsFollowupDao; -import com.acupuncture.system.persist.dao.UmsDataSourceDao; -import com.acupuncture.system.persist.mapper.FmsFollowupTaskMapper; -import com.acupuncture.system.service.FmsFollowupQueueService; -import com.acupuncture.system.service.FmsFollowupService; -import com.acupuncture.system.service.TaskService; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.quartz.TriggerUtils; -import org.quartz.impl.triggers.CronTriggerImpl; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.List; - -/** - * @Author zzc - * @Package com.acupuncture.web.controller.web - * @Date 2025/2/11 16:45 - * @description: - */ -@Slf4j -@Api(tags = "随访相关") -@RestController -@RequestMapping("/followup") -public class FmsFollowupController { - @Resource - private FmsFollowupQueueService fmsFollowupQueueService; - @Resource - private FmsFollowupService fmsFollowupService; - - - @ApiOperation("查询公共队列") - @PostMapping("/commonQueue") - @Anonymous - public JsonResponse> queryCommonQueue(@RequestBody @Validated BaseDto dto) { - if (dto.getPageNum() > 0) { - PageHelper.startPage(dto.getPageNum(), dto.getPageSize()); - } - return JsonResponse.ok(new PageInfo<>(fmsFollowupQueueService.queryCommonQueue(dto.getParam().getName()))); - } - - @ApiOperation("查询随访队列") - @PostMapping("/query") - public JsonResponse> queryQueue(@RequestBody @Validated BaseDto dto) { - if (dto.getPageNum() > 0) { - PageHelper.startPage(dto.getPageNum(), dto.getPageSize()); - } - return JsonResponse.ok(new PageInfo<>(fmsFollowupService.queryQueue(dto.getParam()))); - } - - @ApiOperation("查询随访患者") - @PostMapping("/queryPatient") - public JsonResponse> queryPatient(@RequestBody @Validated BaseDto dto) { - if (dto.getPageNum() > 0) { - PageHelper.startPage(dto.getPageNum(), dto.getPageSize()); - } - return JsonResponse.ok(new PageInfo<>(fmsFollowupService.queryPatient(dto.getParam()))); - } - - @ApiOperation("查询随访任务") - @PostMapping("/queryTask") - public JsonResponse> queryTask(@RequestBody @Validated BaseDto dto) { - return JsonResponse.ok(new PageInfo<>(fmsFollowupService.queryTask(dto.getParam()))); - } - - @ApiOperation("标记为失访") - @PostMapping("/updStatus") - public JsonResponse markAsLost(@RequestBody @Validated FmsFollowupDto.FollowupLostDTO dto) { - fmsFollowupService.markAsLost(dto); - return JsonResponse.ok(); - } - - @ApiOperation("完成随访") - @PostMapping("/followPatient") - public JsonResponse completeFollowup(@RequestBody @Validated FmsFollowupDto.FollowupCompleteDTO dto) { - fmsFollowupService.completeFollowup(dto); - return JsonResponse.ok(); - } -} diff --git a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/StatisticsController.java b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/StatisticsController.java deleted file mode 100644 index 1765eb488..000000000 --- a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/StatisticsController.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.acupuncture.web.controller.web; - -import com.acupuncture.common.core.domain.JsonResponse; -import com.acupuncture.system.domain.dto.StatisticsDto; -import com.acupuncture.system.domain.vo.StatisticsVo; -import com.acupuncture.system.service.StatisticsService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.annotation.Resource; -import java.util.List; - -/** - * @Author zzc - * @Package com.acupuncture.web.controller.web - * @Date 2025/2/13 8:58 - * @description: - */ -@Slf4j -@Api(tags = "统计相关") -@RestController -@RequestMapping("/statistic") -public class StatisticsController { - - @Resource - private StatisticsService statisticsService; - - @ApiOperation("患者统计") - @PostMapping("/patientTotal") - public JsonResponse queryPatientStatistics(@RequestBody @Validated StatisticsDto.Query dto) { - return JsonResponse.ok(statisticsService.queryPatientStatistics(dto)); - } - - @ApiOperation("诊疗统计") - @PostMapping("/zlInfo") - public JsonResponse queryZlStatistics(@RequestBody @Validated StatisticsDto.Query dto) { - return JsonResponse.ok(statisticsService.queryZlStatistics(dto)); - } - - @ApiOperation("治疗类型统计") - @PostMapping("/zlType") - public JsonResponse queryZlTypeStatistics(@RequestBody @Validated StatisticsDto.Query dto) { - return JsonResponse.ok(statisticsService.queryZlTypeStatistics(dto)); - } - - @ApiOperation("随访分布统计") - @PostMapping("/sffb") - public JsonResponse querySfStatistics(@RequestBody @Validated StatisticsDto.Query dto) { - return JsonResponse.ok(statisticsService.querySfStatistics(dto)); - } - - @ApiOperation("失访统计") - @PostMapping("/sftj") - public JsonResponse> querySfTjStatistics(@RequestBody @Validated StatisticsDto.Query dto) { - return JsonResponse.ok(statisticsService.querySfTjStatistics(dto)); - } - -} diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/domain/dto/StatisticsDto.java b/acupuncture-system/src/main/java/com/acupuncture/system/domain/dto/StatisticsDto.java deleted file mode 100644 index fefd553e8..000000000 --- a/acupuncture-system/src/main/java/com/acupuncture/system/domain/dto/StatisticsDto.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.acupuncture.system.domain.dto; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.Date; - -/** - * @Author zzc - * @Package com.acupuncture.system.domain.dto - * @Date 2025/2/13 10:52 - * @description: - */ -public class StatisticsDto { - - @Data - public static class Query { - @ApiModelProperty("开始时间") - private Date startTime; - @ApiModelProperty("结束时间") - private Date endTime; - @ApiModelProperty("统计方式 0:周 1:月 2:季 3:年") - private Integer timeType; - } - -} 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 deleted file mode 100644 index f708a2b76..000000000 --- a/acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/StatisticsVo.java +++ /dev/null @@ -1,432 +0,0 @@ -package com.acupuncture.system.domain.vo; - -import com.acupuncture.common.annotation.DataSource; -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -/** - * @Author zzc - * @Package com.acupuncture.system.domain.vo - * @Date 2025/2/13 8:59 - * @description: - */ -public class StatisticsVo { - - @Data - @ApiModel("患者统计") - public static class PatientVo { - private Integer totalPatients; - @ApiModelProperty("性别统计") - private GenderVo gender; - - @ApiModelProperty("年龄统计") - private AgeVo age; - - @ApiModelProperty("疾病统计") - private JwbzVo jwbz; - - @Data - public static class GenderVo { - @ApiModelProperty("男患者人数") - private Integer male; - @ApiModelProperty("女患者人数") - private Integer female; - @ApiModelProperty("未知患者人数") - private Integer other; - } - - @Data - public static class AgeVo { - @ApiModelProperty("0-40") - private Integer num1; - @ApiModelProperty("41-50") - private Integer num2; - @ApiModelProperty("51-60") - private Integer num3; - @ApiModelProperty("61-70") - private Integer num4; - @ApiModelProperty("71-80") - private Integer num5; - @ApiModelProperty("80") - private Integer num6; - } - - @Data - public static class JwbzVo { - @ApiModelProperty("高血压") - private Integer gxy; - @ApiModelProperty("脑血管病") - private Integer nxgb; - @ApiModelProperty("恶性肿瘤") - private Integer exzl; - @ApiModelProperty("冠心病") - private Integer gxb; - @ApiModelProperty("精神疾病") - private Integer jsjb; - @ApiModelProperty("胃和十二指肠溃疡") - private Integer whsezcky; - @ApiModelProperty("肥胖症") - private Integer fpz; - @ApiModelProperty("骨质疏松症") - private Integer gzssz; - @ApiModelProperty("遗传性、先天性疾病") - private Integer ycxXtxjb; - @ApiModelProperty("糖尿病") - private Integer tnb; - @ApiModelProperty("慢性肺系疾病") - private Integer mxfxjb; - @ApiModelProperty("高脂血症") - private Integer gzxz; - @ApiModelProperty("肝脏疾病") - private Integer gzjb; - @ApiModelProperty("过敏性疾病") - private Integer gmxjb; - @ApiModelProperty("关节炎") - private Integer gjy; - @ApiModelProperty("痛风") - private Integer tf; - @ApiModelProperty("肾炎、肾病") - private Integer sySb; - @ApiModelProperty("其他") - private Integer other; - - public List sortFields() { - List sortList = new ArrayList<>(); - - // 将所有字段及其类型放入列表 - sortList.add(new TreamentVo.SortVo(gxy, 0, "高血压")); - sortList.add(new TreamentVo.SortVo(nxgb, 1, "脑血管病")); - sortList.add(new TreamentVo.SortVo(exzl, 2, "恶性肿瘤")); - sortList.add(new TreamentVo.SortVo(gxb, 3, "冠心病")); - sortList.add(new TreamentVo.SortVo(jsjb, 4, "精神疾病")); - sortList.add(new TreamentVo.SortVo(whsezcky, 5, "胃和十二指肠溃疡")); - sortList.add(new TreamentVo.SortVo(fpz, 6, "肥胖症")); - sortList.add(new TreamentVo.SortVo(gzssz, 7, "骨质疏松症")); - sortList.add(new TreamentVo.SortVo(ycxXtxjb, 8, "遗传性、先天性疾病")); - sortList.add(new TreamentVo.SortVo(tnb, 9, "糖尿病")); - sortList.add(new TreamentVo.SortVo(mxfxjb, 10, "慢性肺系疾病")); - sortList.add(new TreamentVo.SortVo(gzxz, 11, "高脂血症")); - sortList.add(new TreamentVo.SortVo(gzjb, 12, "肝脏疾病")); - sortList.add(new TreamentVo.SortVo(gmxjb, 13, "过敏性疾病")); - sortList.add(new TreamentVo.SortVo(gjy, 14, "关节炎")); - sortList.add(new TreamentVo.SortVo(tf, 15, "痛风")); - sortList.add(new TreamentVo.SortVo(sySb, 16, "肾炎、肾病")); - - // 使用选择排序算法对列表进行排序 - for (int i = 0; i < sortList.size() - 1; i++) { - int minIndex = i; - for (int j = i + 1; j < sortList.size(); j++) { - if (sortList.get(j).getTotal() > sortList.get(minIndex).getTotal()) { - minIndex = j; - } - } - if (minIndex != i) { - TreamentVo.SortVo temp = sortList.get(i); - sortList.set(i, sortList.get(minIndex)); - sortList.set(minIndex, temp); - } - } - - // 设置排序位置 - for (int i = 0; i < sortList.size(); i++) { - sortList.get(i).setSort(i + 1); - } - return sortList; - } - } - } - - - @Data - @ApiModel("诊疗信息") - public static class TreamentVo { - - @ApiModelProperty("排名信息") - private List sort; - @ApiModelProperty("体型分布") - private TxfbVo txfb; - @ApiModelProperty("中医体质分布") - private ZytzVo zytz; - @ApiModelProperty("体态") - private TtfbVo ttfb; - @ApiModelProperty("失眠") - private SmfbVo smfb; - @ApiModelProperty("焦虑") - private JlfbVo jlfb; - - @Data - @ApiModel("排名信息") - public static class SortVo { - private Integer total; - private Integer sort; - private String type; - - public SortVo(Integer total, Integer sort, String type) { - this.total = total; - this.sort = sort; - this.type = type; - } - } - - @Data - @ApiModel("体型分布") - public static class TxfbVo { - @ApiModelProperty("") - private Integer total; - @ApiModelProperty("隐形肥胖型") - private Integer yxfpz; - @ApiModelProperty("脂肪过多型") - private Integer zfgdx; - @ApiModelProperty("肥胖型") - private Integer fpx; - @ApiModelProperty("肌肉不足型") - private Integer jrbzx; - @ApiModelProperty("健康匀称型") - private Integer jkjcx; - @ApiModelProperty("超重肌肉型") - private Integer czjrx; - @ApiModelProperty("消瘦型") - private Integer xsx; - @ApiModelProperty("低脂肪型") - private Integer dzfx; - @ApiModelProperty("运动员型") - private Integer ydyx; - } - - @Data - @ApiModel("体型分布") - public static class ZytzVo { - @ApiModelProperty("") - private Integer total; - @ApiModelProperty("平和质") - private Integer phz; - @ApiModelProperty("气虚质") - private Integer qxz; - @ApiModelProperty("阳虚质") - private Integer yangxz; - @ApiModelProperty("阴虚质") - private Integer yinxz; - @ApiModelProperty("痰湿质") - private Integer tsz; - @ApiModelProperty("湿热质") - private Integer srz; - @ApiModelProperty("血瘀质") - private Integer xyz; - @ApiModelProperty("气郁质") - private Integer qyz; - @ApiModelProperty("特禀质") - private Integer tlz; - } - - @Data - @ApiModel("体态分布") - public static class TtfbVo { - @ApiModelProperty("") - private Integer score1; - @ApiModelProperty("") - private Integer score2; - @ApiModelProperty("") - private Integer score3; - @ApiModelProperty("") - private Integer score4; - @ApiModelProperty("") - private Integer score5; - } - - @Data - @ApiModel("失眠分布") - public static class SmfbVo { - @ApiModelProperty("") - private Integer score1; - @ApiModelProperty("") - private Integer score2; - @ApiModelProperty("") - private Integer score3; - @ApiModelProperty("") - private Integer score4; - @ApiModelProperty("") - private Integer score5; - } - - @Data - @ApiModel("焦虑分布") - public static class JlfbVo { - @ApiModelProperty("") - private Integer score1; - @ApiModelProperty("") - private Integer score2; - @ApiModelProperty("") - private Integer score3; - @ApiModelProperty("") - private Integer score4; - } - } - - @Data - @ApiModel("治疗类型") - public static class ZlTypeVo { - @ApiModelProperty("治疗类型统计") - private Zllxtj zllxtj; - @ApiModelProperty("病种方法分布") - private BzfffbVo bzfffb; - @ApiModelProperty("病种穴位分布") - private BzxwfbVo bzxwfb; - @ApiModelProperty("治疗效果统计") - private ZlxgVo zlxwfb; - @ApiModelProperty("诊疗费用分布") - private ZlfyVo zlfy; - - @Data - @ApiModel("治疗类型统计") - public static class Zllxtj { - private Integer zxyjh; - private Integer czy; - } - - @Data - @ApiModel("病种方法分布") - public static class BzfffbVo { - private Fpz fpz; - private Smz smz; - private Otherbz otherbz; - - @Data - @ApiModel("肥胖症") - public static class Fpz { - @ApiModelProperty("行为心理干预") - private Integer xwxlg; - @ApiModelProperty("运动干预") - private Integer ydgy; - @ApiModelProperty("临床营养治疗") - private Integer lcyyzl; - @ApiModelProperty("针灸疗法") - private Integer zjlf; - @ApiModelProperty("药物治疗") - private Integer ywzl; - } - - @Data - @ApiModel("失眠症") - public static class Smz { - @ApiModelProperty("生活习惯") - private Integer shxg; - @ApiModelProperty("心理调适") - private Integer xlts; - @ApiModelProperty("针灸") - private Integer zj; - @ApiModelProperty("药物治疗") - private Integer ywzl; - } - - @Data - @ApiModel("失眠症") - public static class Otherbz { - @ApiModelProperty("针灸") - private Integer zj; - @ApiModelProperty("药物治疗") - private Integer ywzl; - } - } - - @Data - @ApiModel("病种穴位分布") - public static class BzxwfbVo { - @ApiModelProperty("肥胖症病种穴位分布") - private Bzxwfb fpzbzxwfb; - @ApiModelProperty("失眠症病种穴位分布") - private Bzxwfb smzbzxwfb; - @ApiModelProperty("其他病种穴位分布") - private Bzxwfb qtbzxwfb; - - @Data - @ApiModel("病种穴位分布") - public static class Bzxwfb { - @ApiModelProperty("足三里") - private Integer zsl; - @ApiModelProperty("中脘") - private Integer zr; - @ApiModelProperty("天枢") - private Integer tq; - @ApiModelProperty("神门") - private Integer sm; - @ApiModelProperty("三阴交") - private Integer syj; - @ApiModelProperty("百会") - private Integer bh; - @ApiModelProperty("其他") - private Integer am; - @ApiModelProperty("药物治疗") - private Integer other; - } - } - - @Data - @ApiModel("治疗效果统计") - public static class ZlxgVo { - @ApiModelProperty("治愈") - private Integer zy; - @ApiModelProperty("显效") - private Integer xx; - @ApiModelProperty("好转") - private Integer hz; - @ApiModelProperty("无效") - private Integer wx; - } - - @Data - @ApiModel("诊疗费用分布") - public static class ZlfyVo { - @ApiModelProperty("<300元") - private Integer score1; - @ApiModelProperty("300 ~ 900元") - private Integer score2; - @ApiModelProperty("900 ~ 2000元") - private Integer score3; - @ApiModelProperty("2000 ~ 5000元") - private Integer score4; - @ApiModelProperty(">5000元") - private Integer score5; - } - } - - @Data - @ApiModel("随访分布") - public static class SffbVo { - @ApiModelProperty("减重队列") - private DlVo jzdl; - @ApiModelProperty("失眠队列") - private DlVo smdl; - - @Data - @ApiModel("队列") - public static class DlVo { - private Long queueId; - @ApiModelProperty("人数") - private Integer num; - @ApiModelProperty("待随访") - private Integer dsf; - @ApiModelProperty("临近随访") - private Integer ljsf; - @ApiModelProperty("超期随访") - private Integer cqsf; - @ApiModelProperty("正常随访") - private Integer zc; - } - } - - @Data - @ApiModel("失访统计") - public static class SftjVo { - @ApiModelProperty("失访数量") - private Integer num; - @ApiModelProperty("失访原因") - private String reason; - } -} 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 deleted file mode 100644 index b943a5755..000000000 --- a/acupuncture-system/src/main/java/com/acupuncture/system/persist/dao/StatisticsDao.java +++ /dev/null @@ -1,79 +0,0 @@ -package com.acupuncture.system.persist.dao; - -import com.acupuncture.system.domain.dto.StatisticsDto; -import com.acupuncture.system.domain.vo.StatisticsVo; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @Author zzc - * @Package com.acupuncture.system.persist.dao - * @Date 2025/2/13 14:07 - * @description: - */ -public interface StatisticsDao { - - /** - * 患者统计 - * - * @param dto - * @param tenantId - * @return - */ - StatisticsVo.PatientVo.GenderVo queryGenderStatistics(@Param("dto") StatisticsDto.Query dto, - @Param("tenantId") Long tenantId); - - /** - * 年龄统计 - * - * @param dto - * @param tenantId - * @return - */ - StatisticsVo.PatientVo.AgeVo queryAgeStatistics(@Param("dto") StatisticsDto.Query dto, - @Param("tenantId") Long tenantId); - - StatisticsVo.PatientVo.JwbzVo queryJwbzStatistics(@Param("dto") StatisticsDto.Query dto, - @Param("tenantId") Long tenantId); - - Integer queryTotalPatient(@Param("dto") StatisticsDto.Query dto, - @Param("tenantId") Long tenantId); - - StatisticsVo.TreamentVo.TxfbVo queryTxfbStatistics(@Param("dto") StatisticsDto.Query dto, - @Param("tenantId") Long tenantId); - - StatisticsVo.TreamentVo.ZytzVo queryZytzStatistics(@Param("dto") StatisticsDto.Query dto, - @Param("tenantId") Long tenantId); - - StatisticsVo.ZlTypeVo.Zllxtj queryZllxtjStatistics(@Param("dto") StatisticsDto.Query dto, - @Param("tenantId") Long tenantId); - - - StatisticsVo.ZlTypeVo.BzfffbVo.Fpz queryFpzStatistics(@Param("dto") StatisticsDto.Query dto, - @Param("tenantId") Long tenantId); - - StatisticsVo.ZlTypeVo.ZlxgVo queryZlxgStatistics(@Param("dto") StatisticsDto.Query dto, - @Param("tenantId") Long tenantId); - - StatisticsVo.ZlTypeVo.ZlfyVo queryZlfyStatistics(@Param("dto") StatisticsDto.Query dto, - @Param("tenantId") Long tenantId); - - List querySftjStatistics(@Param("dto") StatisticsDto.Query dto, - @Param("tenantId") Long tenantId); - - List querySfStatistics(@Param("dto") StatisticsDto.Query dto, - @Param("tenantId") Long tenantId); - - StatisticsVo.TreamentVo.TtfbVo queryTtfbStatistics(@Param("dto") StatisticsDto.Query dto, - @Param("tenantId") Long tenantId); - - StatisticsVo.TreamentVo.SmfbVo querySmfbStatistics(@Param("dto") StatisticsDto.Query dto, - @Param("tenantId") Long tenantId); - - StatisticsVo.TreamentVo.JlfbVo queryJlfbStatistics(@Param("dto") StatisticsDto.Query dto, - @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/StatisticsService.java b/acupuncture-system/src/main/java/com/acupuncture/system/service/StatisticsService.java deleted file mode 100644 index 58d135cfc..000000000 --- a/acupuncture-system/src/main/java/com/acupuncture/system/service/StatisticsService.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.acupuncture.system.service; - -import com.acupuncture.system.domain.dto.StatisticsDto; -import com.acupuncture.system.domain.vo.StatisticsVo; - -import java.util.List; - -/** - * @Author zzc - * @Package com.acupuncture.system.service - * @Date 2025/2/13 8:58 - * @description: - */ -public interface StatisticsService { - - /** - * 患者统计 - * - * @param dto - * @return - */ - StatisticsVo.PatientVo queryPatientStatistics(StatisticsDto.Query dto); - - /** - * 诊疗统计 - * - * @param dto - * @return - */ - StatisticsVo.TreamentVo queryZlStatistics(StatisticsDto.Query dto); - - /** - * 治疗类型统计 - * - * @param dto - * @return - */ - StatisticsVo.ZlTypeVo queryZlTypeStatistics(StatisticsDto.Query dto); - - /** - * 随访分布统计 - * - * @param dto - * @return - */ - StatisticsVo.SffbVo querySfStatistics(StatisticsDto.Query dto); - - /** - * 失访统计 - * - * @param dto - * @return - */ - List querySfTjStatistics(StatisticsDto.Query dto); -} 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 deleted file mode 100644 index ab0619993..000000000 --- a/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/StatisticsServiceImpl.java +++ /dev/null @@ -1,93 +0,0 @@ -package com.acupuncture.system.service.impl; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollUtil; -import com.acupuncture.common.utils.SecurityUtils; -import com.acupuncture.system.domain.dto.StatisticsDto; -import com.acupuncture.system.domain.vo.StatisticsVo; -import com.acupuncture.system.persist.dao.StatisticsDao; -import com.acupuncture.system.service.StatisticsService; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; -import java.util.List; - -/** - * @Author zzc - * @Package com.acupuncture.system.service - * @Date 2025/2/13 8:58 - * @description: - */ -@Service -public class StatisticsServiceImpl implements StatisticsService { - @Resource - private StatisticsDao statisticsDao; - - @Override - public StatisticsVo.PatientVo queryPatientStatistics(StatisticsDto.Query dto) { - StatisticsVo.PatientVo patientVo = new StatisticsVo.PatientVo(); - patientVo.setGender(statisticsDao.queryGenderStatistics(dto, SecurityUtils.getTenantId())); - patientVo.setAge(statisticsDao.queryAgeStatistics(dto, SecurityUtils.getTenantId())); - patientVo.setJwbz(statisticsDao.queryJwbzStatistics(dto, SecurityUtils.getTenantId())); - patientVo.setTotalPatients(statisticsDao.queryTotalPatient(dto, SecurityUtils.getTenantId())); - return patientVo; - } - - @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()); - } - treamentVo.setTxfb(statisticsDao.queryTxfbStatistics(dto, SecurityUtils.getTenantId())); - treamentVo.setZytz(statisticsDao.queryZytzStatistics(dto, SecurityUtils.getTenantId())); - treamentVo.setTtfb(statisticsDao.queryTtfbStatistics(dto, SecurityUtils.getTenantId())); - treamentVo.setSmfb(statisticsDao.querySmfbStatistics(dto, SecurityUtils.getTenantId())); - treamentVo.setJlfb(statisticsDao.queryJlfbStatistics(dto, SecurityUtils.getTenantId())); - return treamentVo; - } - - @Override - public StatisticsVo.ZlTypeVo queryZlTypeStatistics(StatisticsDto.Query dto) { - StatisticsVo.ZlTypeVo zlTypeVo = new StatisticsVo.ZlTypeVo(); - zlTypeVo.setZllxtj(statisticsDao.queryZllxtjStatistics(dto, SecurityUtils.getTenantId())); - - StatisticsVo.ZlTypeVo.BzfffbVo bzfffbVo = new StatisticsVo.ZlTypeVo.BzfffbVo(); - bzfffbVo.setFpz(statisticsDao.queryFpzStatistics(dto, SecurityUtils.getTenantId())); - bzfffbVo.setSmz(statisticsDao.querySmzStatistics(dto, SecurityUtils.getTenantId())); - //TODO - zlTypeVo.setBzfffb(bzfffbVo); - zlTypeVo.setZlxwfb(statisticsDao.queryZlxgStatistics(dto, SecurityUtils.getTenantId())); - zlTypeVo.setZlfy(statisticsDao.queryZlfyStatistics(dto, SecurityUtils.getTenantId())); - return zlTypeVo; - } - - @Override - public StatisticsVo.SffbVo querySfStatistics(StatisticsDto.Query dto) { - StatisticsVo.SffbVo sffbVo = new StatisticsVo.SffbVo(); - List dlVos = statisticsDao.querySfStatistics(dto, SecurityUtils.getTenantId()); - if (CollUtil.isNotEmpty(dlVos)) { - for (StatisticsVo.SffbVo.DlVo dlVo : dlVos) { - if (dlVo.getQueueId() == 10L) { - //减重队列 - StatisticsVo.SffbVo.DlVo jzdl = new StatisticsVo.SffbVo.DlVo(); - BeanUtil.copyProperties(dlVo, jzdl); - sffbVo.setJzdl(jzdl); - }else if (dlVo.getQueueId() == 11L) { - //失眠队列 - //减重队列 - StatisticsVo.SffbVo.DlVo smdl = new StatisticsVo.SffbVo.DlVo(); - BeanUtil.copyProperties(dlVo, smdl); - sffbVo.setSmdl(smdl); - } - } - } - return sffbVo; - } - - @Override - public List querySfTjStatistics(StatisticsDto.Query dto) { - return statisticsDao.querySftjStatistics(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 deleted file mode 100644 index f2a6080d0..000000000 --- a/acupuncture-system/src/main/resources/mapper/dao/StatisticsDao.xml +++ /dev/null @@ -1,287 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/datang-meeting-admin/target/datang-meeting-admin.jar b/datang-meeting-admin/target/datang-meeting-admin.jar index 24b48ae89..de803e88e 100644 Binary files a/datang-meeting-admin/target/datang-meeting-admin.jar and b/datang-meeting-admin/target/datang-meeting-admin.jar differ diff --git a/datang-meeting-admin/target/datang-meeting-admin.jar.original b/datang-meeting-admin/target/datang-meeting-admin.jar.original index 341f7e6fc..eda2f8fd7 100644 Binary files a/datang-meeting-admin/target/datang-meeting-admin.jar.original and b/datang-meeting-admin/target/datang-meeting-admin.jar.original differ diff --git a/datang-meeting-admin/target/maven-archiver/pom.properties b/datang-meeting-admin/target/maven-archiver/pom.properties index 159089898..ca0497e89 100644 --- a/datang-meeting-admin/target/maven-archiver/pom.properties +++ b/datang-meeting-admin/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Fri Feb 14 17:49:34 CST 2025 +#Wed Feb 19 09:27:30 CST 2025 version=3.8.9 groupId=com.datangMeeting artifactId=datang-meeting-admin diff --git a/datang-meeting-common/target/datang-meeting-common-3.8.9.jar b/datang-meeting-common/target/datang-meeting-common-3.8.9.jar index 8a810048a..c37d368a3 100644 Binary files a/datang-meeting-common/target/datang-meeting-common-3.8.9.jar and b/datang-meeting-common/target/datang-meeting-common-3.8.9.jar differ diff --git a/datang-meeting-common/target/maven-archiver/pom.properties b/datang-meeting-common/target/maven-archiver/pom.properties index e318837b6..eafbf4ce0 100644 --- a/datang-meeting-common/target/maven-archiver/pom.properties +++ b/datang-meeting-common/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Fri Feb 14 17:49:23 CST 2025 +#Wed Feb 19 09:27:20 CST 2025 version=3.8.9 groupId=com.datangMeeting artifactId=datang-meeting-common diff --git a/datang-meeting-framework/target/datang-meeting-framework-3.8.9.jar b/datang-meeting-framework/target/datang-meeting-framework-3.8.9.jar index 7c6b44943..1b2e4372e 100644 Binary files a/datang-meeting-framework/target/datang-meeting-framework-3.8.9.jar and b/datang-meeting-framework/target/datang-meeting-framework-3.8.9.jar differ diff --git a/datang-meeting-framework/target/maven-archiver/pom.properties b/datang-meeting-framework/target/maven-archiver/pom.properties index 462d0c4c7..cc4a227a1 100644 --- a/datang-meeting-framework/target/maven-archiver/pom.properties +++ b/datang-meeting-framework/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Fri Feb 14 17:49:28 CST 2025 +#Wed Feb 19 09:27:25 CST 2025 version=3.8.9 groupId=com.datangMeeting artifactId=datang-meeting-framework diff --git a/datang-meeting-generator/target/datang-meeting-generator-3.8.9.jar b/datang-meeting-generator/target/datang-meeting-generator-3.8.9.jar index 139db1345..0e243983c 100644 Binary files a/datang-meeting-generator/target/datang-meeting-generator-3.8.9.jar and b/datang-meeting-generator/target/datang-meeting-generator-3.8.9.jar differ diff --git a/datang-meeting-generator/target/maven-archiver/pom.properties b/datang-meeting-generator/target/maven-archiver/pom.properties index fe70462dc..000cd697c 100644 --- a/datang-meeting-generator/target/maven-archiver/pom.properties +++ b/datang-meeting-generator/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Fri Feb 14 17:49:31 CST 2025 +#Wed Feb 19 09:27:28 CST 2025 version=3.8.9 groupId=com.datangMeeting artifactId=datang-meeting-generator diff --git a/datang-meeting-quartz/target/datang-meeting-quartz-3.8.9.jar b/datang-meeting-quartz/target/datang-meeting-quartz-3.8.9.jar index 1a88f1ea3..f7274841a 100644 Binary files a/datang-meeting-quartz/target/datang-meeting-quartz-3.8.9.jar and b/datang-meeting-quartz/target/datang-meeting-quartz-3.8.9.jar differ diff --git a/datang-meeting-quartz/target/maven-archiver/pom.properties b/datang-meeting-quartz/target/maven-archiver/pom.properties index cbd98bae2..dce74ac54 100644 --- a/datang-meeting-quartz/target/maven-archiver/pom.properties +++ b/datang-meeting-quartz/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Fri Feb 14 17:49:29 CST 2025 +#Wed Feb 19 09:27:26 CST 2025 version=3.8.9 groupId=com.datangMeeting artifactId=datang-meeting-quartz diff --git a/datang-meeting-system/src/main/java/com/datangMeeting/system/persist/dao/DmsMeetingDao.java b/datang-meeting-system/src/main/java/com/datangMeeting/system/persist/dao/DmsMeetingDao.java index 9f81fae78..6682e4790 100644 --- a/datang-meeting-system/src/main/java/com/datangMeeting/system/persist/dao/DmsMeetingDao.java +++ b/datang-meeting-system/src/main/java/com/datangMeeting/system/persist/dao/DmsMeetingDao.java @@ -4,6 +4,7 @@ import com.datangMeeting.system.domain.dto.DmsMeetingDto; import com.datangMeeting.system.domain.vo.DmsMeetingVo; import org.apache.ibatis.annotations.Param; +import java.util.Date; import java.util.List; /** @@ -19,14 +20,19 @@ public interface DmsMeetingDao { * @param dto * @return */ - List list(@Param("title") String title, @Param("userId") Long userId, @Param("username") String username); + List list(@Param("title") String title, + @Param("userId") Long userId, + @Param("username") String username, + @Param("today")Date today); /** * 查询会议 * @param dto * @return */ - List adminList(@Param("title") String title); + List adminList(@Param("title") String title, + @Param("userId") Long userId, + @Param("username") String username); /** * 查询会议详情 diff --git a/datang-meeting-system/src/main/java/com/datangMeeting/system/service/impl/AdminServiceImpl.java b/datang-meeting-system/src/main/java/com/datangMeeting/system/service/impl/AdminServiceImpl.java index 3c394fb30..ee9efb4e2 100644 --- a/datang-meeting-system/src/main/java/com/datangMeeting/system/service/impl/AdminServiceImpl.java +++ b/datang-meeting-system/src/main/java/com/datangMeeting/system/service/impl/AdminServiceImpl.java @@ -87,7 +87,7 @@ public class AdminServiceImpl implements AdminService { @Override public List list(AdminDmsMeetingDto.QueryMeeting dto) { - List dmsMeetingResultVos = dmsMeetingDao.adminList(dto.getTitle()); + List dmsMeetingResultVos = dmsMeetingDao.adminList(dto.getTitle(), SecurityUtils.getUserId(), SecurityUtils.getUsername()); if (CollUtil.isNotEmpty(dmsMeetingResultVos)) { for (DmsMeetingVo.DmsMeetingResultVo dmsMeetingResultVo : dmsMeetingResultVos) { DmsMeetingUserExample dmsMeetingUserExample = new DmsMeetingUserExample(); diff --git a/datang-meeting-system/src/main/java/com/datangMeeting/system/service/impl/DmsMeetingServiceImpl.java b/datang-meeting-system/src/main/java/com/datangMeeting/system/service/impl/DmsMeetingServiceImpl.java index 6b2c07ca8..b704bbec7 100644 --- a/datang-meeting-system/src/main/java/com/datangMeeting/system/service/impl/DmsMeetingServiceImpl.java +++ b/datang-meeting-system/src/main/java/com/datangMeeting/system/service/impl/DmsMeetingServiceImpl.java @@ -18,10 +18,7 @@ import com.datangMeeting.system.service.ISysConfigService; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; /** @@ -43,7 +40,7 @@ public class DmsMeetingServiceImpl implements DmsMeetingService { @Override public List list(DmsMeetingDto.QueryMeeting dto) { - List list = meetingDao.list(null, SecurityUtils.getUserId(), SecurityUtils.getUsername()); + List list = meetingDao.list(null, SecurityUtils.getUserId(), SecurityUtils.getUsername(), DateUtil.parse(DateUtil.today(), "yyyy-MM-dd")); if (CollUtil.isEmpty(list)) { return CollUtil.newArrayList(); } @@ -73,7 +70,7 @@ public class DmsMeetingServiceImpl implements DmsMeetingService { customerMeeting.setTime(DateUtil.parse(DateUtil.format(value.get(0).getTime(), "yyyy-MM-dd"))); result.add(customerMeeting); } - return result; + return result.stream().sorted(Comparator.comparing(DmsMeetingVo.CustomerMeeting::getTime)).collect(Collectors.toList()); } @Override diff --git a/datang-meeting-system/src/main/resources/mapper/dao/DmsMeetingDao.xml b/datang-meeting-system/src/main/resources/mapper/dao/DmsMeetingDao.xml index 98baad3bd..b6cc7a205 100644 --- a/datang-meeting-system/src/main/resources/mapper/dao/DmsMeetingDao.xml +++ b/datang-meeting-system/src/main/resources/mapper/dao/DmsMeetingDao.xml @@ -18,14 +18,16 @@ m.id = u.meeting_id WHERE m.del_flag = 0 + AND time > #{today} - AND time > CURDATE() and u.username = #{username} AND title LIKE CONCAT('%', #{title}, '%') group by m.id + order by + m.time