From 8a09319b455a7624ecd9d74fa69cdfac3ae56253 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Wed, 10 Jan 2024 14:10:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E5=B1=95=E7=A4=BA=E5=AE=9E?= =?UTF-8?q?=E6=97=B6=E6=8E=A5=E5=8F=A3=EF=BC=8C=E6=97=A5=E6=8A=A5=E6=9C=88?= =?UTF-8?q?=E6=8A=A5=E4=B8=8A=E4=BC=A0=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller/stat/BigVisController.java | 94 +++++++++++++- .../sup/UserRegisterController.java | 4 +- .../controller/trace/UdiTraceController.java | 4 +- .../glxp/api/dao/stat/IoStatMonthMapper.java | 4 + .../dao/trace/TraceRecordDetailMapper.java | 5 + .../api/entity/stat/IoStatMonthEntity.java | 6 + .../entity/stat/StatWarnMessageEntity.java | 5 + .../glxp/api/req/stat/StatOnlineRequest.java | 11 ++ .../api/res/basic/BasicUdiRelResponse.java | 1 + .../glxp/api/res/stat/NmapTotalResponse.java | 5 + .../api/res/stat/OnlineTotalResponse.java | 121 ++++++++++++++++++ .../api/service/basic/BasicUdiRelService.java | 22 +++- .../api/service/stat/IoStatMonthService.java | 18 ++- .../trace/TraceProductDetailService.java | 92 +++++++++++++ .../mapper/basic/BasicUdiRelMapper.xml | 4 +- .../mybatis/mapper/stat/IoStatMonthMapper.xml | 6 + .../mapper/trace/TraceRecordDetailMapper.xml | 18 +++ 17 files changed, 406 insertions(+), 14 deletions(-) create mode 100644 src/main/java/com/glxp/api/req/stat/StatOnlineRequest.java create mode 100644 src/main/java/com/glxp/api/res/stat/OnlineTotalResponse.java diff --git a/src/main/java/com/glxp/api/controller/stat/BigVisController.java b/src/main/java/com/glxp/api/controller/stat/BigVisController.java index e82d320..8618993 100644 --- a/src/main/java/com/glxp/api/controller/stat/BigVisController.java +++ b/src/main/java/com/glxp/api/controller/stat/BigVisController.java @@ -14,21 +14,24 @@ import com.glxp.api.entity.sup.UserCompanyEntity; import com.glxp.api.req.auth.FilterUserComapanyRequest; import com.glxp.api.req.auth.UserRegisterFilterRequest; import com.glxp.api.req.replicate.FilterReplicateRequest; -import com.glxp.api.req.stat.StatAdverseRequest; -import com.glxp.api.req.stat.StatCityCorpRequest; -import com.glxp.api.req.stat.StatCorpInvRequest; -import com.glxp.api.req.stat.StatWarnMessageRequest; +import com.glxp.api.req.stat.*; import com.glxp.api.req.trace.TraceTaskDetailRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.auth.registComPerResponse; +import com.glxp.api.res.stat.NmapTotalResponse; import com.glxp.api.res.sup.UserCompanyOnlineResponse; import com.glxp.api.res.sup.UserCompanyResponse; import com.glxp.api.res.trace.TraceTaskDlResponse; +import com.glxp.api.service.basic.BasicCorpService; +import com.glxp.api.service.basic.BasicUdiRelService; import com.glxp.api.service.stat.*; import com.glxp.api.service.sup.UserCompanyOnlineService; import com.glxp.api.service.sup.UserCompanyService; +import com.glxp.api.service.sup.UserRegisterService; +import com.glxp.api.service.trace.TraceProductDetailService; import com.glxp.api.service.trace.TraceTaskService; import com.glxp.api.util.DateUtil; +import com.glxp.api.util.IntUtil; import com.glxp.api.util.page.ListPageRequest; import io.swagger.annotations.ApiOperation; import org.springframework.validation.BindingResult; @@ -266,8 +269,6 @@ public class BigVisController extends BaseController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } List selectlist = statCorpInvService.filterList(statCorpInvRequest); - - PageInfo pageInfo; pageInfo = new PageInfo<>(selectlist); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); @@ -337,4 +338,85 @@ public class BigVisController extends BaseController { return ResultVOUtils.success(pageSimpleResponse); } + + //*****************现场检查********************************* + @Resource + BasicUdiRelService basicUdiRelService; + @Resource + BasicCorpService basicCorpService; + @Resource + private UserRegisterService userRegisterService; + @Resource + TraceProductDetailService traceProductDetailService; + + @ApiOperation(value = "获取单位检查情况", response = registComPerResponse.class) + @PostMapping("/admin/auth/online/check/list") + public BaseResponse selectReslist(@RequestBody UserRegisterFilterRequest userRegisterFilterRequest, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List selectlist = userRegisterService.selectlist(userRegisterFilterRequest); + + for (registComPerResponse response : selectlist) { + + StatOnlineRequest statOnlineRequest = new StatOnlineRequest(); + statOnlineRequest.setTraceSource(2); + statOnlineRequest.setCompanyId(response.getCompanyId()); + NmapTotalResponse nmapTotalResponse = traceProductDetailService.statOnlineCount(statOnlineRequest); + response.setProductCount(IntUtil.value(nmapTotalResponse.getProductCount()) + ""); + response.setTagCodeCount(IntUtil.value(nmapTotalResponse.getTagCount())); + response.setUnTagCodeCount(IntUtil.value(nmapTotalResponse.getUnTagCount())); + response.setQixieCount(IntUtil.value(nmapTotalResponse.getQxCount())); + response.setShijiCount(IntUtil.value(nmapTotalResponse.getSjCount())); + response.setImportCount(IntUtil.value(nmapTotalResponse.getImportCount())); + response.setUnImportCount(IntUtil.value(nmapTotalResponse.getUnImportCount())); + response.setMipCount(IntUtil.value(nmapTotalResponse.getChsCount())); + response.setUnMipCount(IntUtil.value(nmapTotalResponse.getUnChsCount())); + + NmapTotalResponse corp = basicCorpService.statCompanyCorpCount(response.getCompanyId() + ""); + response.setCusCount(corp.getCustomCount()); + response.setSupCount(corp.getSupCount()); + + } + + PageInfo pageInfo; + pageInfo = new PageInfo<>(selectlist); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(selectlist); + + return ResultVOUtils.success(pageSimpleResponse); + } + + + /** + * 根据企业类型查询产品汇总 + */ + @GetMapping("udi/basic/online/check/stat") + public BaseResponse statOnlineCheck() { + StatOnlineRequest statOnlineRequest = new StatOnlineRequest(); + statOnlineRequest.setTraceSource(2); + NmapTotalResponse nmapTotalResponse = traceProductDetailService.statOnlineCount(statOnlineRequest); + return ResultVOUtils.success(nmapTotalResponse); + } + + + @Resource + IoStatMonthService statMonthService; + + /** + * 获取异常信息列表 + */ + @ApiOperation(value = "获取异常信息列表", response = registComPerResponse.class) + @GetMapping("bigVis/month/stat/list") + public BaseResponse monthStatList(StatAdverseRequest statAdverseRequest) { + List selectlist = statMonthService.filterList(statAdverseRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(selectlist); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(selectlist); + return ResultVOUtils.success(pageSimpleResponse); + } + } diff --git a/src/main/java/com/glxp/api/controller/sup/UserRegisterController.java b/src/main/java/com/glxp/api/controller/sup/UserRegisterController.java index 23da9d8..8af9716 100644 --- a/src/main/java/com/glxp/api/controller/sup/UserRegisterController.java +++ b/src/main/java/com/glxp/api/controller/sup/UserRegisterController.java @@ -259,7 +259,9 @@ public class UserRegisterController extends BaseController { response.setUnImportCount(IntUtil.value(nmapTotalResponse.getUnImportCount())); response.setMipCount(IntUtil.value(nmapTotalResponse.getChsCount())); response.setUnMipCount(IntUtil.value(nmapTotalResponse.getUnChsCount())); - + response.setPurNormal(nmapTotalResponse.getPurNormal()); + response.setPurPre(nmapTotalResponse.getPurPre()); + response.setPurPreIn(nmapTotalResponse.getPurPreIn()); NmapTotalResponse corp = basicCorpService.statCompanyCorpCount(response.getCompanyId() + ""); response.setCusCount(corp.getCustomCount()); response.setSupCount(corp.getSupCount()); diff --git a/src/main/java/com/glxp/api/controller/trace/UdiTraceController.java b/src/main/java/com/glxp/api/controller/trace/UdiTraceController.java index 7acd1f0..cc4edd1 100644 --- a/src/main/java/com/glxp/api/controller/trace/UdiTraceController.java +++ b/src/main/java/com/glxp/api/controller/trace/UdiTraceController.java @@ -131,7 +131,7 @@ public class UdiTraceController extends BaseController { } //3.查询产品信息 - basicUdiRelResponse = basicUdiRelService.findByProductNameCode(udiEntity.getUdi()); + basicUdiRelResponse = basicUdiRelService.findByProductNameCode(udiEntity.getUdi(), traceRecordRequest.getCompanyId() != null ? traceRecordRequest.getCompanyId() + "" : null); if (basicUdiRelResponse == null) { return ResultVOUtils.error(500, "未查询到产品信息"); } @@ -240,7 +240,7 @@ public class UdiTraceController extends BaseController { } //3.查询产品信息 - basicUdiRelResponse = basicUdiRelService.findByProductNameCode(udiEntity.getUdi()); + basicUdiRelResponse = basicUdiRelService.findByProductNameCode(udiEntity.getUdi(), traceRecordRequest.getCompanyId() != null ? traceRecordRequest.getCompanyId() + "" : null); if (basicUdiRelResponse == null) { return ResultVOUtils.error(500, "未查询到产品信息"); } diff --git a/src/main/java/com/glxp/api/dao/stat/IoStatMonthMapper.java b/src/main/java/com/glxp/api/dao/stat/IoStatMonthMapper.java index c79916b..319ad75 100644 --- a/src/main/java/com/glxp/api/dao/stat/IoStatMonthMapper.java +++ b/src/main/java/com/glxp/api/dao/stat/IoStatMonthMapper.java @@ -2,6 +2,7 @@ package com.glxp.api.dao.stat; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.entity.stat.IoStatMonthEntity; +import com.glxp.api.req.stat.StatAdverseRequest; import com.glxp.api.req.stat.StatCorpInvRequest; import com.glxp.api.res.basic.BasicUdiRelResponse; import org.apache.ibatis.annotations.Mapper; @@ -13,4 +14,7 @@ public interface IoStatMonthMapper extends BaseMapper { List statCompanyCount(StatCorpInvRequest statCorpInvRequest); + List filterList(StatAdverseRequest statAdverseRequest); + + } diff --git a/src/main/java/com/glxp/api/dao/trace/TraceRecordDetailMapper.java b/src/main/java/com/glxp/api/dao/trace/TraceRecordDetailMapper.java index 9fe484e..6d4bd95 100644 --- a/src/main/java/com/glxp/api/dao/trace/TraceRecordDetailMapper.java +++ b/src/main/java/com/glxp/api/dao/trace/TraceRecordDetailMapper.java @@ -2,8 +2,13 @@ package com.glxp.api.dao.trace; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.entity.trace.TraceProductDetailEntity; +import com.glxp.api.req.stat.StatOnlineRequest; +import com.glxp.api.res.basic.BasicUdiRelResponse; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + @Mapper public interface TraceRecordDetailMapper extends BaseMapper { + List statOnlineCount(StatOnlineRequest statOnlineRequest); } diff --git a/src/main/java/com/glxp/api/entity/stat/IoStatMonthEntity.java b/src/main/java/com/glxp/api/entity/stat/IoStatMonthEntity.java index 6d508f6..8380366 100644 --- a/src/main/java/com/glxp/api/entity/stat/IoStatMonthEntity.java +++ b/src/main/java/com/glxp/api/entity/stat/IoStatMonthEntity.java @@ -179,5 +179,11 @@ public class IoStatMonthEntity implements Serializable { @TableField(exist = false) private String deptName; + @TableField(value = "zczbhhzbapzbh") + private String zczbhhzbapzbh; + @TableField(value = "ylqxzcrbarmc") + private String ylqxzcrbarmc; + + private static final long serialVersionUID = 1L; } diff --git a/src/main/java/com/glxp/api/entity/stat/StatWarnMessageEntity.java b/src/main/java/com/glxp/api/entity/stat/StatWarnMessageEntity.java index 1438000..c2fcb45 100644 --- a/src/main/java/com/glxp/api/entity/stat/StatWarnMessageEntity.java +++ b/src/main/java/com/glxp/api/entity/stat/StatWarnMessageEntity.java @@ -4,8 +4,10 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; + import java.io.Serializable; import java.util.Date; + import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -40,6 +42,9 @@ public class StatWarnMessageEntity implements Serializable { @TableField(value = "warnMsg") private String warnMsg; + @TableField(value = "zczbhhzbapzbh") + private String zczbhhzbapzbh; + private static final long serialVersionUID = 1L; } diff --git a/src/main/java/com/glxp/api/req/stat/StatOnlineRequest.java b/src/main/java/com/glxp/api/req/stat/StatOnlineRequest.java new file mode 100644 index 0000000..36a476d --- /dev/null +++ b/src/main/java/com/glxp/api/req/stat/StatOnlineRequest.java @@ -0,0 +1,11 @@ +package com.glxp.api.req.stat; + +import lombok.Data; + +@Data +public class StatOnlineRequest { + + private Long companyId; + private Long bussinessStatus; + private Integer traceSource; +} diff --git a/src/main/java/com/glxp/api/res/basic/BasicUdiRelResponse.java b/src/main/java/com/glxp/api/res/basic/BasicUdiRelResponse.java index 19ec6c2..e78fb0f 100644 --- a/src/main/java/com/glxp/api/res/basic/BasicUdiRelResponse.java +++ b/src/main/java/com/glxp/api/res/basic/BasicUdiRelResponse.java @@ -338,5 +338,6 @@ public class BasicUdiRelResponse { * 采购方式：1：预入库；2：带票入库；3：寄售 */ private Integer purchaseType; + private Integer bussinessStatus; } diff --git a/src/main/java/com/glxp/api/res/stat/NmapTotalResponse.java b/src/main/java/com/glxp/api/res/stat/NmapTotalResponse.java index acef245..914db1e 100644 --- a/src/main/java/com/glxp/api/res/stat/NmapTotalResponse.java +++ b/src/main/java/com/glxp/api/res/stat/NmapTotalResponse.java @@ -114,4 +114,9 @@ public class NmapTotalResponse { */ private int levelthreeTagCount; + + private int manuProductCount; + private int supProudctCount; + private int hospProductCount; + } diff --git a/src/main/java/com/glxp/api/res/stat/OnlineTotalResponse.java b/src/main/java/com/glxp/api/res/stat/OnlineTotalResponse.java new file mode 100644 index 0000000..fb96ffd --- /dev/null +++ b/src/main/java/com/glxp/api/res/stat/OnlineTotalResponse.java @@ -0,0 +1,121 @@ +package com.glxp.api.res.stat; + +import lombok.Data; + +@Data +public class OnlineTotalResponse { + + /** + * 器械数量总数 + */ + private int qxCount; + + /** + * 试剂数量总数 + */ + private int sjCount; + + /** + * 产品总数量 + */ + private int productCount; + + /** + * 一类产品数量 + */ + private int levelOneCount; + + /** + * 二类产品数量 + */ + private int levelTwoCount; + + /** + * 三类产品数量 + */ + private int levelthreeCount; + + /** + * 集采数量 + */ + private int groupBuyCount; + + /** + * 非集采数量 + */ + private int unGroupCount; + + + /** + * 医保数量 + */ + private int chsCount; + + /** + * 非医保数量 + */ + private int unChsCount; + + /** + * 进口数量 + */ + private int importCount; + + /** + * 非进口数量 + */ + private int unImportCount; + + /** + * 赋码数量 + */ + private int tagCount; + /** + * 未赋码数量 + */ + private int unTagCount; + + + /** + * 供应商数量 + */ + private int supCount; + + /** + * 客户数量 + */ + private int customCount; + + + /** + * 带票入库 + */ + private int purNormal; + /** + * 预入库 + */ + private int purPreIn; + /** + * 寄售入库 + */ + private int purPre; + + /** + * 一类赋码数量 + */ + private int levelOneTagCount; + + /** + * 二类赋码数量 + */ + private int levelTwoTagCount; + + /** + * 三类赋码数量 + */ + private int levelthreeTagCount; + + private int manuProductCount; + private int supProudctCount; + private int hospProductCount; +} diff --git a/src/main/java/com/glxp/api/service/basic/BasicUdiRelService.java b/src/main/java/com/glxp/api/service/basic/BasicUdiRelService.java index 88ceea6..526b6ae 100644 --- a/src/main/java/com/glxp/api/service/basic/BasicUdiRelService.java +++ b/src/main/java/com/glxp/api/service/basic/BasicUdiRelService.java @@ -83,11 +83,12 @@ public class BasicUdiRelService extends ServiceImpl udiRelResponses = basicUdiRelMapper.filterList(filterUdiRelRequest); if (CollUtil.isNotEmpty(udiRelResponses)) return udiRelResponses.get(0); @@ -104,7 +105,7 @@ public class BasicUdiRelService extends ServiceImpl findDiListByProduct(FilterUdiRelRequest filterUdiRelRequest) { if (StrUtil.isNotEmpty(filterUdiRelRequest.getNameCode())) { - BasicUdiRelResponse basicUdiRelResponse = findByProductNameCode(filterUdiRelRequest.getNameCode()); + BasicUdiRelResponse basicUdiRelResponse = findByProductNameCode(filterUdiRelRequest.getNameCode(), filterUdiRelRequest.getCompanyIdFk()); return basicUdiRelMapper.findDiList(basicUdiRelResponse.getUuid()); } else { return basicUdiRelMapper.findDiListByProduct(filterUdiRelRequest); @@ -161,6 +162,15 @@ public class BasicUdiRelService extends ServiceImpl basicUdiRelResponses = statMonthMapper.statCompanyCount(statCorpInvRequest); InvStatTotalResponse nmapTotalResponse = new InvStatTotalResponse(); for (BasicUdiRelResponse item : basicUdiRelResponses) { @@ -86,4 +91,15 @@ public class IoStatMonthService extends ServiceImpl filterList(StatAdverseRequest statAdverseRequest) { + if (statAdverseRequest == null) { + return Collections.emptyList(); + } + int offset = (statAdverseRequest.getPage() - 1) * statAdverseRequest.getLimit(); + PageHelper.offsetPage(offset, statAdverseRequest.getLimit()); + return statMonthMapper.filterList(statAdverseRequest); + } + } diff --git a/src/main/java/com/glxp/api/service/trace/TraceProductDetailService.java b/src/main/java/com/glxp/api/service/trace/TraceProductDetailService.java index 124381f..0f59a44 100644 --- a/src/main/java/com/glxp/api/service/trace/TraceProductDetailService.java +++ b/src/main/java/com/glxp/api/service/trace/TraceProductDetailService.java @@ -1,7 +1,12 @@ package com.glxp.api.service.trace; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.glxp.api.req.stat.StatOnlineRequest; +import com.glxp.api.res.basic.BasicUdiRelResponse; +import com.glxp.api.res.stat.NmapTotalResponse; +import com.glxp.api.util.IntUtil; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.glxp.api.dao.trace.TraceRecordDetailMapper; @@ -39,4 +44,91 @@ public class TraceProductDetailService extends ServiceImpl basicUdiRelResponses = traceRecordDetailMapper.statOnlineCount(statOnlineRequest); + NmapTotalResponse nmapTotalResponse = new NmapTotalResponse(); + if (CollUtil.isNotEmpty(basicUdiRelResponses)) { + nmapTotalResponse.setProductCount(basicUdiRelResponses.size()); + for (BasicUdiRelResponse item : basicUdiRelResponses) { + if (item != null) { + //统计一类医疗器械数量 + if (StrUtil.isNotEmpty(item.getCategoryLevel()) && item.getCategoryLevel().equals("一类")) { + nmapTotalResponse.setLevelOneCount(IntUtil.value(nmapTotalResponse.getLevelOneCount()) + 1); + } + //统计二类医疗器械数量 + if (StrUtil.isNotEmpty(item.getCategoryLevel()) && item.getCategoryLevel().equals("二类")) { + nmapTotalResponse.setLevelTwoCount(IntUtil.value(nmapTotalResponse.getLevelTwoCount()) + 1); + } + //统计三类医疗器械数量 + if (StrUtil.isNotEmpty(item.getCategoryLevel()) && item.getCategoryLevel().equals("三类")) { + nmapTotalResponse.setLevelthreeCount(IntUtil.value(nmapTotalResponse.getLevelthreeCount()) + 1); + } + + //统计集采数量 + if (IntUtil.value(item.getGroupBuy()) == 1) { + nmapTotalResponse.setGroupBuyCount(IntUtil.value(nmapTotalResponse.getGroupBuyCount()) + 1); + } + //统计非集采数量 + if (IntUtil.value(item.getGroupBuy()) == 2) { + nmapTotalResponse.setUnGroupCount(IntUtil.value(nmapTotalResponse.getUnGroupCount()) + 1); + } + + //统计医保数量 + if (IntUtil.value(item.getChsType()) == 1) { + nmapTotalResponse.setChsCount(IntUtil.value(nmapTotalResponse.getChsCount()) + 1); + } + //统计非医保数量 + if (IntUtil.value(item.getChsType()) == 2) { + nmapTotalResponse.setUnChsCount(IntUtil.value(nmapTotalResponse.getUnChsCount()) + 1); + } + + //统计赋码数量 + if (StrUtil.isNotEmpty(item.getNameCode())) { + nmapTotalResponse.setTagCount(IntUtil.value(nmapTotalResponse.getTagCount()) + 1); + } else { + nmapTotalResponse.setUnTagCount(IntUtil.value(nmapTotalResponse.getUnTagCount()) + 1); + } + //统计进口数量 + if (IntUtil.value(item.getImportType()) == 1) { + nmapTotalResponse.setImportCount(IntUtil.value(nmapTotalResponse.getImportCount()) + 1); + } + //统计非进口数量 + if (IntUtil.value(item.getImportType()) == 2) { + nmapTotalResponse.setUnImportCount(IntUtil.value(nmapTotalResponse.getUnImportCount()) + 1); + } + + //器械类数量 + if (StrUtil.isNotEmpty(item.getCplx()) && item.getCplx().equals("器械")) { + nmapTotalResponse.setQxCount(IntUtil.value(nmapTotalResponse.getQxCount()) + 1); + } else { + nmapTotalResponse.setSjCount(IntUtil.value(nmapTotalResponse.getSjCount()) + 1); + } + + //采购方式 + if (IntUtil.value(item.getPurchaseType()) == 1) { + nmapTotalResponse.setPurNormal(IntUtil.value(nmapTotalResponse.getPurNormal()) + 1); + } + if (IntUtil.value(item.getPurchaseType()) == 2) { + nmapTotalResponse.setPurPreIn(IntUtil.value(nmapTotalResponse.getPurPreIn()) + 1); + } + if (IntUtil.value(item.getPurchaseType()) == 3) { + nmapTotalResponse.setPurPre(IntUtil.value(nmapTotalResponse.getPurPre()) + 1); + } + + if (IntUtil.value(item.getBussinessStatus()) == 1) { + nmapTotalResponse.setManuProductCount(nmapTotalResponse.getManuProductCount() + 1); + } + if (IntUtil.value(item.getBussinessStatus()) == 2) { + nmapTotalResponse.setSupProudctCount(nmapTotalResponse.getSupProudctCount() + 1); + } + if (IntUtil.value(item.getBussinessStatus()) == 3) { + nmapTotalResponse.setHospProductCount(nmapTotalResponse.getHospProductCount() + 1); + } + } + + } + } + return nmapTotalResponse; + + } } diff --git a/src/main/resources/mybatis/mapper/basic/BasicUdiRelMapper.xml b/src/main/resources/mybatis/mapper/basic/BasicUdiRelMapper.xml index 08c6ad4..0e4c6e8 100644 --- a/src/main/resources/mybatis/mapper/basic/BasicUdiRelMapper.xml +++ b/src/main/resources/mybatis/mapper/basic/BasicUdiRelMapper.xml @@ -312,12 +312,12 @@ - diff --git a/src/main/resources/mybatis/mapper/stat/IoStatMonthMapper.xml b/src/main/resources/mybatis/mapper/stat/IoStatMonthMapper.xml index a43457a..a858146 100644 --- a/src/main/resources/mybatis/mapper/stat/IoStatMonthMapper.xml +++ b/src/main/resources/mybatis/mapper/stat/IoStatMonthMapper.xml @@ -56,4 +56,10 @@ group by bur.uuid + + diff --git a/src/main/resources/mybatis/mapper/trace/TraceRecordDetailMapper.xml b/src/main/resources/mybatis/mapper/trace/TraceRecordDetailMapper.xml index 20ecad8..12acf0a 100644 --- a/src/main/resources/mybatis/mapper/trace/TraceRecordDetailMapper.xml +++ b/src/main/resources/mybatis/mapper/trace/TraceRecordDetailMapper.xml @@ -1,4 +1,22 @@ +