diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/api/StatisticsController.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/api/StatisticsController.java index ca195aee..2a200399 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/api/StatisticsController.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/api/StatisticsController.java @@ -38,8 +38,8 @@ public class StatisticsController { return JsonResponse.newInstance().ok(fastEdResult); } @ApiOperation(value = "统计医院中小车得使用情况", notes = "") - @RequestMapping(value = "/get/result", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) - public JsonResponse selResult(@ApiParam @Validated @RequestBody QueryDto params) { + @RequestMapping(value = "/get/selResult", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse selResult(@ApiParam @Validated @RequestBody QueryDto params) { log.info("查看测评结果：{}",params); StatisticsVo.UseNumsVo selResult = statisticsService.selResult(params.getParam()); log.info("查看测评结果"); diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/vo/StatisticsVo.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/vo/StatisticsVo.java index f19cc215..c3421426 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/vo/StatisticsVo.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/vo/StatisticsVo.java @@ -14,23 +14,16 @@ public class StatisticsVo { @ApiModel("查询小车本年和往年使用次数") public static class UseNumsVo { @ApiModelProperty("本年单月") - private List sigleNow; + private List sigleNow; @ApiModelProperty("本年和") - private List sumNow; + private List sumNow; @ApiModelProperty("去年单月") - private List sigleLast; + private List sigleLast; @ApiModelProperty("去年年和") - private List sumLast; - } - @Data - @ApiModel("一次查询出来得结果") - public static class UseNumVo { - @ApiModelProperty("年份") - private String name; - @ApiModelProperty("数量") - private Integer num; + private List sumLast; } + @Data @ApiModel("医院id") public static class FastEdResult{ diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/persist/dao/StatisticsDao.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/persist/dao/StatisticsDao.java index 28029a73..28bbeec3 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/persist/dao/StatisticsDao.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/persist/dao/StatisticsDao.java @@ -8,6 +8,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; public interface StatisticsDao extends FirstAidMapper { + public List selResult(@Param("param")StatisticsDto.UseNum param); List getPointTimeCurrent(@Param("id") Long id); @@ -15,4 +16,7 @@ public interface StatisticsDao extends FirstAidMapper { List getPointTimeHospital(@Param("id") Long id); List getPointTimeInternation(@Param("id") Long id); + + public List selResult(@Param("param")StatisticsDto.UseNum param); + } diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/RecordService.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/RecordService.java index 58fd2010..9d75d3cd 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/RecordService.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/RecordService.java @@ -102,9 +102,9 @@ public class RecordService implements IRecordService{ String dosage; BigDecimal weight = BigDecimal.valueOf(weightInt).divide(BigDecimal.valueOf(1000),2,BigDecimal.ROUND_HALF_UP); //总剂量 - BigDecimal totalDose = weight.divide(BigDecimal.valueOf(0.9),2,BigDecimal.ROUND_HALF_UP); + BigDecimal totalDose = weight.multiply(BigDecimal.valueOf(0.9)).setScale(2, BigDecimal.ROUND_HALF_UP); //团注剂量 - BigDecimal dose1 = totalDose.divide(BigDecimal.valueOf(0.1),2,BigDecimal.ROUND_HALF_UP); + BigDecimal dose1 = totalDose.multiply(BigDecimal.valueOf(0.1)).setScale(2, BigDecimal.ROUND_HALF_UP); //维持剂量 BigDecimal dose2 = totalDose.subtract(dose1); dosage = totalDose + "," + dose1 + "," + dose2; @@ -207,7 +207,7 @@ public class RecordService implements IRecordService{ //redis查询急救表 Long firstAidId = null; Object o = redisUtil.get(key); - if(ObjectUtil.isNotNull(o)){ + if(ObjectUtil.isNull(o)){ FirstAidExample firstAidExample = new FirstAidExample(); firstAidExample.createCriteria().andCarIdEqualTo(wisdomCarId); List firstAids = firstAidMapper.selectByExample(firstAidExample); diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/StatisticsService.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/StatisticsService.java index 71ca0020..3f9478cb 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/StatisticsService.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/StatisticsService.java @@ -30,19 +30,27 @@ public class StatisticsService implements IStatisticsService{ @Override public StatisticsVo.UseNumsVo selResult(StatisticsDto.UseNum param) { StatisticsVo.UseNumsVo useNumsVo=new StatisticsVo.UseNumsVo(); - List useNumVoNow = statisticsDao.selResult(param); - List sumLast=new ArrayList(); + List useNumVoNow = statisticsDao.selResult(param); + List sumNow=new ArrayList(); + sumNow.add(useNumVoNow.get(0)); + for (int i = 1; i < useNumVoNow.size(); i++) { + sumNow.add(useNumVoNow.get(i)+sumNow.get(i-1)); + } useNumsVo.setSigleNow(useNumVoNow); - useNumsVo.setSumNow(useNumVoNow); + useNumsVo.setSumNow(sumNow); + + //往年得 Integer yaer=Integer.valueOf(param.getYear()); yaer=yaer-1; param.setYear(String.valueOf(yaer)); - List useNumVosLast = statisticsDao.selResult(param); + List useNumVosLast = statisticsDao.selResult(param); + List sumLast = new ArrayList(); + sumLast.add(useNumVosLast.get(0)); + for (int i = 1; i < useNumVosLast.size(); i++) { + sumLast.add(useNumVosLast.get(i)+sumLast.get(i-1)); + } useNumsVo.setSigleLast(useNumVosLast); - useNumsVo.setSumLast(useNumVosLast); - - - + useNumsVo.setSumLast(sumLast); return useNumsVo; } diff --git a/wisdomcar/src/main/resources/application.yml b/wisdomcar/src/main/resources/application.yml index a47f2a7b..ac92adb9 100644 --- a/wisdomcar/src/main/resources/application.yml +++ b/wisdomcar/src/main/resources/application.yml @@ -1,6 +1,6 @@ spring: profiles: - active: dev - include: common, util-dev + active: test + include: common, util-test diff --git a/wisdomcar/src/main/resources/mapper_dao/StatisticsDao.xml b/wisdomcar/src/main/resources/mapper_dao/StatisticsDao.xml index 56fad526..4617fe36 100644 --- a/wisdomcar/src/main/resources/mapper_dao/StatisticsDao.xml +++ b/wisdomcar/src/main/resources/mapper_dao/StatisticsDao.xml @@ -2,8 +2,8 @@ - + select if(tfa.num is NULL,0,tfa.num) as num FROM (SELECT concat( #{param.year}, `name` ) AS `name` FROM