qdintc/intc-cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 健康管理系统，吃奶量统计接口新增。

Browse Source
This commit is contained in:
tianyongbao
2025-02-05 16:40:21 +08:00
parent 592ea40742
commit 523e3c8499
6 changed files with 447 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
intc-modules/intc-health/src/main/java/com/intc/health/controller/StatisticAnalysisController.java
View File

@@ -61,4 +61,12 @@ public class StatisticAnalysisController extends BaseController {
}
@ApiOperation("吃奶统计分析")
@GetMapping("/milkPowderAnalysis")
public Map<String,Object> getMilkPowderAnalysis(AnalysisDto analysisDto){
Map<String, Object> resultMap = iStatisticAnalysisService.getMilkPowderAnalysis(analysisDto);
return AjaxResult.success(resultMap);
}
}

150
intc-modules/intc-health/src/main/java/com/intc/health/domain/vo/HealthMilkPowderStatisticVo.java Normal file
View File

@@ -0,0 +1,150 @@
package com.intc.health.domain.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* 吃奶记录Vo对象 health_milk_powder_record
*
* @author tianyongbao
* @date 2025-02-01
*/
@ApiModel("吃奶记录Vo对象")
@Data
public class HealthMilkPowderStatisticVo
{
/** 人员名称 */
@ApiModelProperty(value="人员姓名)")
private String personName;
/** 人员ID */
@ApiModelProperty(value="人员ID)")
private Long personId;
/** 今日次数 */
@ApiModelProperty(value="今日次数)")
private int todayCount;
/** 今日吃奶量 */
@ApiModelProperty(value="今日吃奶量)")
private double todayConsumption;
/** 今日平均吃奶量 */
@ApiModelProperty(value="今日平均吃奶量)")
private double todayPerConsumption;
/** 近7日次数 */
@ApiModelProperty(value="近7日次数)")
private int sevenDayCount;
/** 近7日吃奶量 */
@ApiModelProperty(value="近7日吃奶量)")
private double sevenDayConsumption;
/** 近7日平均吃奶量 */
@ApiModelProperty(value="近7日平均吃奶量)")
private double sevenDayPerConsumption;
/** 近1月次数 */
@ApiModelProperty(value="近1月次数)")
private int oneMonthCount;
/** 近1月吃奶量 */
@ApiModelProperty(value="近1月吃奶量)")
private double oneMonthConsumption;
/** 近1月平均吃奶量 */
@ApiModelProperty(value="近1月平均吃奶量)")
private double oneMonthPerConsumption;
/** 近3月次数 */
@ApiModelProperty(value="近3月次数)")
private int threeMonthCount;
/** 近3月吃奶量 */
@ApiModelProperty(value="近3月吃奶量)")
private double threeMonthConsumption;
/** 近3月平均吃奶量 */
@ApiModelProperty(value="近3月平均吃奶量)")
private double threeMonthPerConsumption;
/** 近6月次数 */
@ApiModelProperty(value="近6月次数)")
private int sixMonthCount;
/** 近6月吃奶量 */
@ApiModelProperty(value="近6月吃奶量)")
private double sixMonthConsumption;
/** 近6月平均吃奶量 */
@ApiModelProperty(value="近6月平均吃奶量)")
private double sixMonthPerConsumption;
/** 近1年次数 */
@ApiModelProperty(value="近1年次数)")
private int oneYearCount;
/** 近1年吃奶量 */
@ApiModelProperty(value="近1年吃奶量)")
private double oneYearConsumption;
/** 近1年平均吃奶量 */
@ApiModelProperty(value="近1年平均吃奶量)")
private double oneYearPerConsumption;
/** 近2年次数 */
@ApiModelProperty(value="近2年次数)")
private int twoYearCount;
/** 近2年吃奶量 */
@ApiModelProperty(value="近2年吃奶量)")
private double twoYearConsumption;
/** 近2年平均吃奶量 */
@ApiModelProperty(value="近2年平均吃奶量)")
private double twoYearPerConsumption;
/** 近3年次数 */
@ApiModelProperty(value="近3年次数)")
private int threeYearCount;
/** 近3年吃奶量 */
@ApiModelProperty(value="近3年吃奶量)")
private double threeYearConsumption;
/** 近3年平均吃奶量 */
@ApiModelProperty(value="近3年平均吃奶量)")
private double threeYearPerConsumption;
/** 近5年次数 */
@ApiModelProperty(value="近5年次数)")
private int fiveYearCount;
/** 近5年吃奶量 */
@ApiModelProperty(value="近5年吃奶量)")
private double fiveYearConsumption;
/** 近5年平均吃奶量 */
@ApiModelProperty(value="近5年平均吃奶量)")
private double fiveYearPerConsumption;
/** 总次数 */
@ApiModelProperty(value="总次数)")
private int totalCount;
/** 总吃奶量 */
@ApiModelProperty(value="总吃奶量)")
private double totalConsumption;
/** 总平均吃奶量 */
@ApiModelProperty(value="总平均吃奶量)")
private double totalPerConsumption;
}

22
intc-modules/intc-health/src/main/java/com/intc/health/mapper/StatisticAnalysisMapper.java
View File

@@ -3,11 +3,9 @@ package com.intc.health.mapper;
import com.intc.common.datascope.annotation.DataScope;
import com.intc.health.domain.dto.HealthDoctorRecordDto;
import com.intc.health.domain.dto.HealthMarRecordDto;
import com.intc.health.domain.dto.HealthMilkPowderRecordDto;
import com.intc.health.domain.dto.HealthRecordDto;
import com.intc.health.domain.vo.HealthDoctorRecordVo;
import com.intc.health.domain.vo.HealthMarRecordVo;
import com.intc.health.domain.vo.HealthRecordVo;
import com.intc.health.domain.vo.HealthStaticPersonVo;
import com.intc.health.domain.vo.*;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@@ -159,6 +157,22 @@ public interface StatisticAnalysisMapper {
public List<HealthDoctorRecordVo> selectDepartStaticList(HealthDoctorRecordDto dto);
/**
* 查询用药记录
*
* @param healthMilkPowderRecordDto
* @return 收支集合
*/
@DataScope(businessAlias = "hp")
public HealthMilkPowderStatisticVo selectMilkPowderStatistic(HealthMilkPowderRecordDto healthMilkPowderRecordDto);
/**
* 查询用药记录
*
* @param healthMilkPowderRecordDto
* @return 收支集合
*/
@DataScope(businessAlias = "hmpr")
public List<HealthMilkPowderRecordVo> selectMilkPowderDayStatistic(HealthMilkPowderRecordDto healthMilkPowderRecordDto);
}

3
intc-modules/intc-health/src/main/java/com/intc/health/service/IStatisticAnalysisService.java
View File

@@ -23,4 +23,7 @@ public interface IStatisticAnalysisService {
public Map<String, Object> getDoctorAnalysis(AnalysisDto analysisDto);
public Map<String, Object> getMilkPowderAnalysis(AnalysisDto analysisDto);
}

48
intc-modules/intc-health/src/main/java/com/intc/health/service/impl/StatisticAnalysisImpl.java
View File

@@ -342,6 +342,7 @@ public class StatisticAnalysisImpl implements IStatisticAnalysisService {
}
ArrayList<Map<String, Object>> temperatureList = new ArrayList<>();
Collections.reverse(temperatureRecordVoList);
for (HealthTemperatureRecordVo vo:temperatureRecordVoList
) {
Map<String, Object> datamap = new HashMap<>();
@@ -738,4 +739,51 @@ public class StatisticAnalysisImpl implements IStatisticAnalysisService {
return map;
}
@Override
public Map<String, Object> getMilkPowderAnalysis(AnalysisDto analysisDto) {
//返回数据
HashMap<String, Object> map = new HashMap<>();
DecimalFormat decimalFormat = new DecimalFormat("#.##");
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
HealthMilkPowderRecordDto dto=new HealthMilkPowderRecordDto();
dto.setPersonId(analysisDto.getId());
//获取数据
dto.setEndTime(analysisDto.getEndTime());
dto.setStartTime(analysisDto.getStartTime());
HealthMilkPowderStatisticVo milkPowderStatisticVo= statisticAnalysisMapper.selectMilkPowderStatistic(dto);
if(milkPowderStatisticVo.getTodayCount()!=0) {
milkPowderStatisticVo.setTodayPerConsumption(milkPowderStatisticVo.getTodayConsumption() / milkPowderStatisticVo.getTodayCount());
}
milkPowderStatisticVo.setSevenDayPerConsumption(Double.parseDouble(decimalFormat.format(milkPowderStatisticVo.getSevenDayConsumption()/7)));
//列表
map.put("milkPowderStatistic",milkPowderStatisticVo);
List<HealthMilkPowderRecordVo> list=statisticAnalysisMapper.selectMilkPowderDayStatistic(dto);
ArrayList<Map<String, Object>> milkPowderList = new ArrayList<>();
ArrayList<Map<String, Object>> milkPowderTableList = new ArrayList<>();
for (HealthMilkPowderRecordVo vo:list
) {
Map<String, Object> datamap = new HashMap<>();
datamap.put("time", dateFormat.format(vo.getSucklesTime()));
datamap.put("value", vo.getConsumption());
milkPowderTableList.add(datamap);
}
Collections.reverse(list);
for (HealthMilkPowderRecordVo vo:list
) {
Map<String, Object> datamap = new HashMap<>();
datamap.put("time", dateFormat.format(vo.getSucklesTime()));
datamap.put("value", vo.getConsumption());
milkPowderList.add(datamap);
}
//列表
map.put("milkPowderTableList",milkPowderTableList);
map.put("milkPowderList",milkPowderList);
return map;
}
}