From 498d061cb001c240ca078d533f74495c8395bfb2 Mon Sep 17 00:00:00 2001 From: tianyongbao Date: Mon, 16 Dec 2024 15:08:47 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=81=A5=E5=BA=B7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=A1=A3=E6=A1=88=EF=BC=8C=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E5=AE=8C=E5=96=84=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/common/core/utils/DateUtils.java | 16 +++++++++++++++- .../ruoyi/health/domain/HealthDoctorRecord.java | 15 +++++++++++---- .../ruoyi/health/domain/vo/HealthActivityVo.java | 6 ++++-- .../ruoyi/health/domain/vo/HealthRecordVo.java | 3 +++ .../service/impl/HealthActivityServiceImpl.java | 9 ++++++++- .../service/impl/HealthRecordServiceImpl.java | 14 +++++++++++++- .../service/impl/StatisticAnalysisImpl.java | 3 ++- .../mapper/health/HealthDoctorRecordMapper.xml | 5 +++++ 8 files changed, 61 insertions(+), 10 deletions(-) diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java index c1dfa24..4030e3e 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java @@ -158,7 +158,21 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils long min = diff % nd % nh / nm; // 计算差多少秒//输出结果 // long sec = diff % nd % nh % nm / ns; - return day + "天" + hour + "小时" + min + "分钟"; + if(day>0){ + return day + "天" + hour + "小时" + min + "分钟"; + }else { + if(hour>0){ + if(min>0){ + return hour + "小时" + min + "分钟"; + }else { + return hour + "小时"; + } + } + else { + return min + "分钟"; + } + } + } /** diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthDoctorRecord.java b/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthDoctorRecord.java index c89609c..0adfd7c 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthDoctorRecord.java +++ b/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthDoctorRecord.java @@ -57,12 +57,18 @@ public class HealthDoctorRecord extends BaseEntity @Excel(name = "康复时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date visitingTime; - /** 诊断及用药 */ - @ApiModelProperty(value="诊断及用药)") - @NotNull(message="诊断及用药不能为空") - @Excel(name = "诊断及用药") + /** 处理及医嘱 */ + @ApiModelProperty(value="处理及医嘱)") + @NotNull(message="处理及医嘱不能为空") + @Excel(name = "处理及医嘱") private String prescribe; + /** 诊断结果 */ + @ApiModelProperty(value="诊断结果)") + @NotNull(message="诊断结果不能为空") + @Excel(name = "诊断结果") + private String diagnosis; + /** 人员id */ @ApiModelProperty(value="人员id") @Excel(name = "人员id") @@ -108,6 +114,7 @@ public class HealthDoctorRecord extends BaseEntity .append("partner", getPartner()) .append("costDetail", getCostDetail()) .append("type", getType()) + .append("diagnosis", getDiagnosis()) .toString(); } } diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthActivityVo.java b/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthActivityVo.java index ba19cdf..036e140 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthActivityVo.java +++ b/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthActivityVo.java @@ -1,8 +1,9 @@ package com.ruoyi.health.domain.vo; import com.ruoyi.health.domain.HealthActivity; -import lombok.Data; import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; /** * 活动记录Vo对象 health_activity * @@ -13,5 +14,6 @@ import io.swagger.annotations.ApiModel; @Data public class HealthActivityVo extends HealthActivity { - + @ApiModelProperty(value="活动时长") + private String exerciseTimeStr; } diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthRecordVo.java b/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthRecordVo.java index b17d9ee..214711c 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthRecordVo.java +++ b/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthRecordVo.java @@ -21,4 +21,7 @@ public class HealthRecordVo extends HealthRecord @Excel(name = "人员姓名") private String personName; + @ApiModelProperty(value="持续时间") + private String duration; + } diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthActivityServiceImpl.java b/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthActivityServiceImpl.java index 8bd0191..4387e79 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthActivityServiceImpl.java +++ b/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthActivityServiceImpl.java @@ -46,7 +46,12 @@ public class HealthActivityServiceImpl implements IHealthActivityService @Override public List selectHealthActivityList(HealthActivityDto healthActivityDto) { - return healthActivityMapper.selectHealthActivityList(healthActivityDto); + List healthActivityList = healthActivityMapper.selectHealthActivityList(healthActivityDto); + for (HealthActivityVo activityVo : healthActivityList) { + String daysBetween = DateUtils.timeDistance(activityVo.getEndTime(),activityVo.getStartTime()); + activityVo.setExerciseTimeStr(daysBetween); + } + return healthActivityList; } /** @@ -60,6 +65,7 @@ public class HealthActivityServiceImpl implements IHealthActivityService { healthActivity.setCreateBy(SecurityUtils.getUsername()); healthActivity.setCreateTime(DateUtils.getNowDate()); + healthActivity.setExerciseTime((healthActivity.getEndTime().getTime()-healthActivity.getStartTime().getTime())/1000+""); healthActivity.setId(IdWorker.getId()); return healthActivityMapper.insertHealthActivity(healthActivity); } @@ -75,6 +81,7 @@ public class HealthActivityServiceImpl implements IHealthActivityService { healthActivity.setUpdateBy(SecurityUtils.getUsername()); healthActivity.setUpdateTime(DateUtils.getNowDate()); + healthActivity.setExerciseTime((healthActivity.getEndTime().getTime()-healthActivity.getStartTime().getTime())/1000+""); return healthActivityMapper.updateHealthActivity(healthActivity); } diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthRecordServiceImpl.java b/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthRecordServiceImpl.java index abe0e73..d0e5054 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthRecordServiceImpl.java +++ b/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthRecordServiceImpl.java @@ -11,6 +11,7 @@ import com.ruoyi.health.service.IHealthRecordService; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.Date; import java.util.List; /** @@ -46,7 +47,18 @@ public class HealthRecordServiceImpl implements IHealthRecordService @Override public List selectHealthRecordList(HealthRecordDto healthRecordDto) { - return healthRecordMapper.selectHealthRecordList(healthRecordDto); + List list=healthRecordMapper.selectHealthRecordList(healthRecordDto); + for (HealthRecordVo recordVo : list) { + String daysBetween=""; + if(recordVo.getRehabilitationTime()!=null){ + daysBetween = DateUtils.timeDistance(recordVo.getRehabilitationTime(),recordVo.getOccurTime()); + }else { + daysBetween = DateUtils.timeDistance(new Date(),recordVo.getOccurTime()); + } + recordVo.setDuration(daysBetween); + } + + return list; } /** diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/StatisticAnalysisImpl.java b/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/StatisticAnalysisImpl.java index f2fa613..4df4782 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/StatisticAnalysisImpl.java +++ b/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/StatisticAnalysisImpl.java @@ -158,7 +158,8 @@ public class StatisticAnalysisImpl implements IStatisticAnalysisService { staticsTimeList.add(dayString); } } - + //用药天数 + map.put("marDays",staticsTimeList.size()); for (String staticsTime :staticsTimeList ) { double count=0; diff --git a/ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthDoctorRecordMapper.xml b/ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthDoctorRecordMapper.xml index bee00a9..c346a27 100644 --- a/ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthDoctorRecordMapper.xml +++ b/ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthDoctorRecordMapper.xml @@ -25,6 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -47,6 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" a.total_cost, a.partner, a.cost_detail, + a.diagnosis, hp."name" as person_name , hr."name" as health_record_name from @@ -106,6 +108,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" partner, cost_detail, type, + diagnosis, #{id}, @@ -126,6 +129,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{partner}, #{costDetail}, #{type}, + #{diagnosis}, @@ -149,6 +153,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" partner = #{partner}, cost_detail = #{costDetail}, type = #{type}, + diagnosis = #{diagnosis}, where id = #{id}