From 5f110bea39c79a2cf685f770cc58c3b8c8a36ad2 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Thu, 21 Dec 2023 11:00:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=82=A3=E8=80=85=E5=A4=84=E6=96=B9=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/BasicOrderPrintController.java | 2 + .../basic/BasicSickPrescribeDiController.java | 37 ++++++++++ .../basic/BasicSickerController.java | 2 +- .../dao/basic/BasicSkPrescribeDiMapper.java | 19 +++++ .../BasicSkPrescribeItemDetailMapper.java | 15 ---- ...ity.java => BasicSkPrescribeDiEntity.java} | 33 +++++++-- .../api/entity/thrsys/ThrProductsEntity.java | 6 ++ .../req/basic/BasicSkPrescribeDiRequest.java | 54 ++++++++++++++ .../req/basic/GetSickPrescribeRequest.java | 4 ++ .../res/basic/BasicSkPrescribeResponse.java | 9 ++- .../service/BasicSkPrescribeDiService.java | 23 ++++++ .../BasicSkPrescribeItemDetailService.java | 11 --- .../basic/BasicSkPrescribeService.java | 72 ++++++++++++++++--- .../service/basic/BasicSkSickerService.java | 15 ++-- .../impl/BasicSkPrescribeDiServiceImpl.java | 39 ++++++++++ ...BasicSkPrescribeItemDetailServiceImpl.java | 20 ------ src/main/resources/application-dev.yml | 2 +- .../mapper/basic/BasicSkPrescribeDiMapper.xml | 66 +++++++++++++++++ .../BasicSkPrescribeItemDetailMapper.xml | 32 --------- .../mapper/basic/BasicSkSickerMapper.xml | 8 +++ src/main/resources/schemas/schema_v2.4.sql | 7 ++ 21 files changed, 377 insertions(+), 99 deletions(-) create mode 100644 src/main/java/com/glxp/api/controller/basic/BasicSickPrescribeDiController.java create mode 100644 src/main/java/com/glxp/api/dao/basic/BasicSkPrescribeDiMapper.java delete mode 100644 src/main/java/com/glxp/api/dao/basic/BasicSkPrescribeItemDetailMapper.java rename src/main/java/com/glxp/api/entity/basic/{BasicSkPrescribeItemDetailEntity.java => BasicSkPrescribeDiEntity.java} (80%) create mode 100644 src/main/java/com/glxp/api/req/basic/BasicSkPrescribeDiRequest.java create mode 100644 src/main/java/com/glxp/api/service/BasicSkPrescribeDiService.java delete mode 100644 src/main/java/com/glxp/api/service/BasicSkPrescribeItemDetailService.java create mode 100644 src/main/java/com/glxp/api/service/basic/impl/BasicSkPrescribeDiServiceImpl.java delete mode 100644 src/main/java/com/glxp/api/service/basic/impl/BasicSkPrescribeItemDetailServiceImpl.java create mode 100644 src/main/resources/mybatis/mapper/basic/BasicSkPrescribeDiMapper.xml delete mode 100644 src/main/resources/mybatis/mapper/basic/BasicSkPrescribeItemDetailMapper.xml diff --git a/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java b/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java index d570debd2..4a6515d25 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java @@ -132,6 +132,7 @@ public class BasicOrderPrintController { bizData.put("remark1", sysPdfTemplateRelevanceCodeEntity.getRemark1() == null ? ' ' : sysPdfTemplateRelevanceCodeEntity.getRemark1()); bizData.put("remark2", sysPdfTemplateRelevanceCodeEntity.getRemark2() == null ? ' ' : sysPdfTemplateRelevanceCodeEntity.getRemark2()); bizData.put("productName", udiProductEntity.getCpms() == null ? ' ' : udiProductEntity.getCpms()); + bizData.put("ybbm", udiProductEntity.getYbbm() == null ? ' ' : udiProductEntity.getYbbm()); bizData.put("spmc", obj.getCoName() == null ? ' ' : obj.getCoName()); bizData.put("spec", obj.getSpec() == null ? ' ' : obj.getSpec()); bizData.put("count", obj.getCount()); @@ -202,6 +203,7 @@ public class BasicOrderPrintController { bizData.put("remark2", sysPdfTemplateRelevanceCodeEntity.getRemark2() == null ? ' ' : sysPdfTemplateRelevanceCodeEntity.getRemark2()); if (udiProductEntity != null) { bizData.put("productName", udiProductEntity.getCpms() == null ? ' ' : udiProductEntity.getCpms()); + bizData.put("ybbm", udiProductEntity.getYbbm() == null ? ' ' : udiProductEntity.getYbbm()); bizData.put("ylqxzcrbarmc", udiProductEntity.getYlqxzcrbarmc() == null ? ' ' : udiProductEntity.getYlqxzcrbarmc()); } bizData.put("spmc", ioOrderDetailBizEntity.getCoName() == null ? ' ' : ioOrderDetailBizEntity.getCoName()); diff --git a/src/main/java/com/glxp/api/controller/basic/BasicSickPrescribeDiController.java b/src/main/java/com/glxp/api/controller/basic/BasicSickPrescribeDiController.java new file mode 100644 index 000000000..cee31df13 --- /dev/null +++ b/src/main/java/com/glxp/api/controller/basic/BasicSickPrescribeDiController.java @@ -0,0 +1,37 @@ +package com.glxp.api.controller.basic; + +import com.github.pagehelper.PageInfo; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.entity.basic.BasicSkPrescribeDiEntity; +import com.glxp.api.req.basic.BasicSkPrescribeDiRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.service.BasicSkPrescribeDiService; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.List; + +@RestController +public class BasicSickPrescribeDiController { + + @Resource + BasicSkPrescribeDiService basicSkPrescribeDiService; + + /** + * 获取处方使用耗材详情 + * + * @return + */ + @GetMapping("/udiwms/basic/sk/prescribe/di/filter") + public BaseResponse filterSicker(BasicSkPrescribeDiRequest basicSkPrescribeDiRequest) { + List basicSkPrescribeResponses = basicSkPrescribeDiService.filterList(basicSkPrescribeDiRequest); + PageInfo pageInfo = new PageInfo<>(basicSkPrescribeResponses); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(basicSkPrescribeResponses); + return ResultVOUtils.success(pageSimpleResponse); + } + +} diff --git a/src/main/java/com/glxp/api/controller/basic/BasicSickerController.java b/src/main/java/com/glxp/api/controller/basic/BasicSickerController.java index 7d357bd86..dfe7c08d8 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicSickerController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicSickerController.java @@ -49,7 +49,7 @@ public class BasicSickerController extends BaseController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } ThreadUtil.execAsync(() -> { - basicSkSickerService.downloadSicker(getSickRequest); + basicSkSickerService.downloadSicker(getSickRequest, null); }); return ResultVOUtils.success("后台已开始下载，请稍后刷新查看！"); } diff --git a/src/main/java/com/glxp/api/dao/basic/BasicSkPrescribeDiMapper.java b/src/main/java/com/glxp/api/dao/basic/BasicSkPrescribeDiMapper.java new file mode 100644 index 000000000..92d55754e --- /dev/null +++ b/src/main/java/com/glxp/api/dao/basic/BasicSkPrescribeDiMapper.java @@ -0,0 +1,19 @@ +package com.glxp.api.dao.basic; + +import com.glxp.api.entity.basic.BasicSkPrescribeDiEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.req.basic.BasicSkPrescribeDiRequest; + +import java.util.List; + +/** + * 针对表【basic_sk_prescribe_item_detail(处方关联的耗材信息表)】的数据库操作Mapper + */ +public interface BasicSkPrescribeDiMapper extends BaseMapper { + + List filterList(BasicSkPrescribeDiRequest basicSkPrescribeDiRequest); +} + + + + diff --git a/src/main/java/com/glxp/api/dao/basic/BasicSkPrescribeItemDetailMapper.java b/src/main/java/com/glxp/api/dao/basic/BasicSkPrescribeItemDetailMapper.java deleted file mode 100644 index da8aedc5a..000000000 --- a/src/main/java/com/glxp/api/dao/basic/BasicSkPrescribeItemDetailMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.glxp.api.dao.basic; - -import com.glxp.api.entity.basic.BasicSkPrescribeItemDetailEntity; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** -* 针对表【basic_sk_prescribe_item_detail(处方用药信息表)】的数据库操作Mapper -*/ -public interface BasicSkPrescribeItemDetailMapper extends BaseMapper { - -} - - - - diff --git a/src/main/java/com/glxp/api/entity/basic/BasicSkPrescribeItemDetailEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicSkPrescribeDiEntity.java similarity index 80% rename from src/main/java/com/glxp/api/entity/basic/BasicSkPrescribeItemDetailEntity.java rename to src/main/java/com/glxp/api/entity/basic/BasicSkPrescribeDiEntity.java index abfc7bdd3..95dfd69b7 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicSkPrescribeItemDetailEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicSkPrescribeDiEntity.java @@ -4,19 +4,22 @@ 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.math.BigDecimal; + import lombok.Data; /** - * 处方用药信息表 + * 处方关联的耗材信息表 + * * @TableName basic_sk_prescribe_item_detail */ -@TableName(value ="basic_sk_prescribe_item_detail") +@TableName(value = "basic_sk_prescribe_item_detail") @Data -public class BasicSkPrescribeItemDetailEntity implements Serializable { +public class BasicSkPrescribeDiEntity implements Serializable { /** - * + * */ @TableId(value = "id") private Long id; @@ -39,12 +42,26 @@ public class BasicSkPrescribeItemDetailEntity implements Serializable { @TableField(value = "prescribeCode") private String prescribeCode; + /** + * 住院号 + */ + @TableField(value = "adNum") + private String adNum; + + /** * 耗材产品id */ @TableField(value = "relId") private Long relId; + /** + * DI标识 + */ + @TableField(value = "nameCode") + private String nameCode; + + /** * 耗材名称 */ @@ -105,6 +122,12 @@ public class BasicSkPrescribeItemDetailEntity implements Serializable { @TableField(value = "remark") private String remark; + /** + * 总金额 + */ + @TableField(value = "amount") + private BigDecimal amount; + @TableField(exist = false) private static final long serialVersionUID = 1L; -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/entity/thrsys/ThrProductsEntity.java b/src/main/java/com/glxp/api/entity/thrsys/ThrProductsEntity.java index 7493bca07..acace89e2 100644 --- a/src/main/java/com/glxp/api/entity/thrsys/ThrProductsEntity.java +++ b/src/main/java/com/glxp/api/entity/thrsys/ThrProductsEntity.java @@ -198,4 +198,10 @@ public class ThrProductsEntity { @TableField(exist = false) private String createByName; + /** + * 处方项目字典 + */ + @TableField("prcitmcode") + private String prcitmcode; + } diff --git a/src/main/java/com/glxp/api/req/basic/BasicSkPrescribeDiRequest.java b/src/main/java/com/glxp/api/req/basic/BasicSkPrescribeDiRequest.java new file mode 100644 index 000000000..f0b51e96a --- /dev/null +++ b/src/main/java/com/glxp/api/req/basic/BasicSkPrescribeDiRequest.java @@ -0,0 +1,54 @@ +package com.glxp.api.req.basic; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.glxp.api.util.page.ListPageRequest; +import lombok.Data; + +@Data +public class BasicSkPrescribeDiRequest extends ListPageRequest { + + + /** + * 项目组套外键 + */ + @TableField(value = "pId") + private Long pId; + + /** + * 患者编码 + */ + @TableField(value = "sickerCode") + private String sickerCode; + + /** + * 住院号 + */ + @TableField(value = "adNum") + private String adNum; + + /** + * 处方编码 + */ + @TableField(value = "prescribeCode") + private String prescribeCode; + + /** + * 耗材产品id + */ + @TableField(value = "relId") + private Long relId; + + /** + * 耗材名称 + */ + @TableField(value = "thrName") + private String thrName; + + /** + * 耗材编码 + */ + @TableField(value = "thrCode") + private String thrCode; + + +} diff --git a/src/main/java/com/glxp/api/req/basic/GetSickPrescribeRequest.java b/src/main/java/com/glxp/api/req/basic/GetSickPrescribeRequest.java index 0dfac2cbb..85db353c4 100644 --- a/src/main/java/com/glxp/api/req/basic/GetSickPrescribeRequest.java +++ b/src/main/java/com/glxp/api/req/basic/GetSickPrescribeRequest.java @@ -13,4 +13,8 @@ public class GetSickPrescribeRequest extends ListPageRequest { private String phone; private String searchTime; private String thirdSys; + /** + * 住院号（必传) + */ + private String adNum; } diff --git a/src/main/java/com/glxp/api/res/basic/BasicSkPrescribeResponse.java b/src/main/java/com/glxp/api/res/basic/BasicSkPrescribeResponse.java index 216aaf90a..7ec594ce5 100644 --- a/src/main/java/com/glxp/api/res/basic/BasicSkPrescribeResponse.java +++ b/src/main/java/com/glxp/api/res/basic/BasicSkPrescribeResponse.java @@ -1,11 +1,13 @@ package com.glxp.api.res.basic; import com.baomidou.mybatisplus.annotation.TableField; +import com.glxp.api.entity.basic.BasicSkPrescribeItemEntity; import lombok.Data; import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.Date; +import java.util.List; @Data public class BasicSkPrescribeResponse { @@ -18,7 +20,7 @@ public class BasicSkPrescribeResponse { /** * 病人编码 */ - private String sickerCode; + private String sickCode; /** * 开方时间 @@ -72,4 +74,9 @@ public class BasicSkPrescribeResponse { private LocalDateTime updateTime; + /** + * 处方明细 + */ + List itemList; + } diff --git a/src/main/java/com/glxp/api/service/BasicSkPrescribeDiService.java b/src/main/java/com/glxp/api/service/BasicSkPrescribeDiService.java new file mode 100644 index 000000000..014d2c623 --- /dev/null +++ b/src/main/java/com/glxp/api/service/BasicSkPrescribeDiService.java @@ -0,0 +1,23 @@ +package com.glxp.api.service; + +import com.github.pagehelper.PageHelper; +import com.glxp.api.dao.basic.BasicSkPrescribeDiMapper; +import com.glxp.api.dao.basic.BasicSkProjectMapper; +import com.glxp.api.entity.basic.BasicSkPrescribeDiEntity; +import com.baomidou.mybatisplus.extension.service.IService; +import com.glxp.api.req.basic.BasicSkPrescribeDiRequest; +import com.glxp.api.req.basic.BasicSkPrescribeRequest; +import com.glxp.api.res.basic.BasicSkPrescribeResponse; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +/** + * 针对表【basic_sk_prescribe_item_detail(处方使用耗材信息表)】的数据库操作Service + */ +public interface BasicSkPrescribeDiService extends IService { + + List filterList(BasicSkPrescribeDiRequest basicSkPrescribeDiRequest); + +} diff --git a/src/main/java/com/glxp/api/service/BasicSkPrescribeItemDetailService.java b/src/main/java/com/glxp/api/service/BasicSkPrescribeItemDetailService.java deleted file mode 100644 index fdda7f97b..000000000 --- a/src/main/java/com/glxp/api/service/BasicSkPrescribeItemDetailService.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.glxp.api.service; - -import com.glxp.api.entity.basic.BasicSkPrescribeItemDetailEntity; -import com.baomidou.mybatisplus.extension.service.IService; - -/** -* 针对表【basic_sk_prescribe_item_detail(处方用药信息表)】的数据库操作Service -*/ -public interface BasicSkPrescribeItemDetailService extends IService { - -} diff --git a/src/main/java/com/glxp/api/service/basic/BasicSkPrescribeService.java b/src/main/java/com/glxp/api/service/basic/BasicSkPrescribeService.java index 865fd1349..5e8f4f35a 100644 --- a/src/main/java/com/glxp/api/service/basic/BasicSkPrescribeService.java +++ b/src/main/java/com/glxp/api/service/basic/BasicSkPrescribeService.java @@ -2,6 +2,7 @@ package com.glxp.api.service.basic; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -9,8 +10,7 @@ import com.github.pagehelper.PageHelper; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.dao.basic.BasicSkProjectMapper; -import com.glxp.api.entity.basic.BasicSkSickerEntity; -import com.glxp.api.entity.basic.UdiRelevanceEntity; +import com.glxp.api.entity.basic.*; import com.glxp.api.entity.thrsys.ThrProductsEntity; import com.glxp.api.http.ErpBasicClient; import com.glxp.api.req.basic.BasicSkPrescribeRequest; @@ -22,12 +22,14 @@ import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.basic.BasicSkPrescribeResponse; import com.glxp.api.res.basic.BasicSkProjectResponse; import com.glxp.api.res.basic.BasicSkSickerResponse; +import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.res.thrsys.ThrProductsResponse; +import com.glxp.api.service.BasicSkPrescribeDiService; +import com.glxp.api.service.thrsys.ThrProductsService; import com.glxp.api.util.IntUtil; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.glxp.api.entity.basic.BasicSkPrescribeEntity; import com.glxp.api.dao.basic.BasicSkPrescribeMapper; import javax.annotation.Resource; @@ -41,6 +43,10 @@ public class BasicSkPrescribeService extends ServiceImpl filterList(BasicSkPrescribeRequest basicSkPrescribeRequest) { if (basicSkPrescribeRequest == null) { @@ -57,7 +63,7 @@ public class BasicSkPrescribeService extends ServiceImpl> baseResponse = erpBasicClient.getSickPrescribe(request); if (baseResponse.getCode() == 20000) { List list = baseResponse.getData().getList(); - List basicSkPrescribeEntities = new ArrayList<>(); - list.forEach(item -> { - BasicSkPrescribeEntity basicSkSickerEntity = new BasicSkPrescribeEntity(); - BeanUtil.copyProperties(item, basicSkSickerEntity); + BasicSkPrescribeEntity basicSkPrescribeEntity = new BasicSkPrescribeEntity(); + BeanUtil.copyProperties(item, basicSkPrescribeEntity); + basicSkPrescribeEntity.setSickerCode(item.getSickCode()); + List skPrescribeItemEntities = item.getItemList(); + if (CollUtil.isNotEmpty(skPrescribeItemEntities)) { + basicSkPrescirbeDetailService.remove(new QueryWrapper().eq("prescribeCode", item.getCode())); + basicSkPrescribeDiService.remove(new QueryWrapper().eq("prescribeCode", item.getCode())); + for (BasicSkPrescribeItemEntity skPrescribeItemEntity : skPrescribeItemEntities) { + skPrescribeItemEntity.setPrescribeCode(item.getCode()); + skPrescribeItemEntity.setSickerCode(item.getSickCode()); + skPrescribeItemEntity.setId(IdUtil.getSnowflakeNextId()); + basicSkPrescirbeDetailService.save(skPrescribeItemEntity); + trSkPrescribeDi(skPrescribeItemEntity); + } + } + //todo 数据转换 - basicSkPrescribeEntities.add(basicSkSickerEntity); + basicSkPrescribeEntities.add(basicSkPrescribeEntity); }); if (list.size() >= limit && !baseResponse.getData().getTotal().equals(-666)) { super.baseMapper.replaceBatchs(basicSkPrescribeEntities); @@ -87,4 +105,40 @@ public class BasicSkPrescribeService extends ServiceImpl thrProductsEntities = thrProductsService.list(new QueryWrapper().eq("prcitmcode", skPrescribeItemEntity.getItemCode())); + if (CollUtil.isNotEmpty(thrProductsEntities)) { + for (ThrProductsEntity thrProductsEntity : thrProductsEntities) { + BasicSkPrescribeDiEntity basicSkPrescribeDiEntity = new BasicSkPrescribeDiEntity(); + basicSkPrescribeDiEntity.setPrescribeCode(skPrescribeItemEntity.getPrescribeCode()); + basicSkPrescribeDiEntity.setSickerCode(skPrescribeItemEntity.getSickerCode()); + basicSkPrescribeDiEntity.setCount(IntUtil.value(skPrescribeItemEntity.getMeasureCount())); + basicSkPrescribeDiEntity.setMeasureUnit(skPrescribeItemEntity.getMeasureUnit()); + UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectByThirdId(thrProductsEntity.getCode(), "thirdId"); + basicSkPrescribeDiEntity.setAmount(skPrescribeItemEntity.getAmount()); + basicSkPrescribeDiEntity.setRelId(udiRelevanceEntity.getId()); + basicSkPrescribeDiEntity.setThrCode(thrProductsEntity.getCode()); + basicSkPrescribeDiEntity.setThrName(thrProductsEntity.getName()); + basicSkPrescribeDiEntity.setCategory(thrProductsEntity.getCplb()); + basicSkPrescribeDiEntity.setGgxh(thrProductsEntity.getStandard()); + basicSkPrescribeDiService.save(basicSkPrescribeDiEntity); + } + } + } + } + + } diff --git a/src/main/java/com/glxp/api/service/basic/BasicSkSickerService.java b/src/main/java/com/glxp/api/service/basic/BasicSkSickerService.java index 6152c4618..98ce08487 100644 --- a/src/main/java/com/glxp/api/service/basic/BasicSkSickerService.java +++ b/src/main/java/com/glxp/api/service/basic/BasicSkSickerService.java @@ -13,6 +13,7 @@ import com.glxp.api.req.basic.GetSickRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.basic.BasicSkProjectResponse; import com.glxp.api.res.basic.BasicSkSickerResponse; +import com.glxp.api.util.RedisUtil; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.glxp.api.entity.basic.BasicSkSickerEntity; @@ -42,10 +43,14 @@ public class BasicSkSickerService extends ServiceImpl> baseResponse = erpBasicClient.getSicker(request); if (baseResponse.getCode() == 20000) { List list = baseResponse.getData().getList(); - List basicSkSickerEntities = new ArrayList<>(); list.forEach(item -> { BasicSkSickerEntity basicSkSickerEntity = new BasicSkSickerEntity(); BeanUtil.copyProperties(item, basicSkSickerEntity); //todo 数据转换 + basicSkSickerEntities.add(basicSkSickerEntity); }); if (list.size() >= limit && !baseResponse.getData().getTotal().equals(-666)) { basicSkSickerMapper.replaceBatchs(basicSkSickerEntities); page++; + redisUtil.set("thr_sicker_page", page); + } else { break; } diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicSkPrescribeDiServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicSkPrescribeDiServiceImpl.java new file mode 100644 index 000000000..44e837ba3 --- /dev/null +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicSkPrescribeDiServiceImpl.java @@ -0,0 +1,39 @@ +package com.glxp.api.service.basic.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.pagehelper.PageHelper; +import com.glxp.api.entity.basic.BasicSkPrescribeDiEntity; +import com.glxp.api.req.basic.BasicSkPrescribeDiRequest; +import com.glxp.api.req.basic.BasicSkPrescribeRequest; +import com.glxp.api.res.basic.BasicSkPrescribeResponse; +import com.glxp.api.service.BasicSkPrescribeDiService; +import com.glxp.api.dao.basic.BasicSkPrescribeDiMapper; +import org.springframework.stereotype.Service; + +import java.util.Collections; +import java.util.List; + +/** + * 针对表【basic_sk_prescribe_item_detail(处方关联的耗材信息表)】的数据库操作Service实现 + */ +@Service +public class BasicSkPrescribeDiServiceImpl extends ServiceImpl + implements BasicSkPrescribeDiService { + + public List filterList(BasicSkPrescribeDiRequest basicSkPrescribeDiRequest) { + if (basicSkPrescribeDiRequest == null) { + return Collections.emptyList(); + } + if (basicSkPrescribeDiRequest.getPage() != null) { + int offset = (basicSkPrescribeDiRequest.getPage() - 1) * basicSkPrescribeDiRequest.getLimit(); + PageHelper.offsetPage(offset, basicSkPrescribeDiRequest.getLimit()); + } + List data = super.baseMapper.filterList(basicSkPrescribeDiRequest); + return data; + } + +} + + + + diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicSkPrescribeItemDetailServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicSkPrescribeItemDetailServiceImpl.java deleted file mode 100644 index 99b856695..000000000 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicSkPrescribeItemDetailServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.glxp.api.service.basic.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.glxp.api.entity.basic.BasicSkPrescribeItemDetailEntity; -import com.glxp.api.service.BasicSkPrescribeItemDetailService; -import com.glxp.api.dao.basic.BasicSkPrescribeItemDetailMapper; -import org.springframework.stereotype.Service; - -/** -* 针对表【basic_sk_prescribe_item_detail(处方用药信息表)】的数据库操作Service实现 -*/ -@Service -public class BasicSkPrescribeItemDetailServiceImpl extends ServiceImpl - implements BasicSkPrescribeItemDetailService{ - -} - - - - diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index b2df4abe2..eff144325 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -4,7 +4,7 @@ server: spring: datasource: driver-class-name: com.p6spy.engine.spy.P6SpyDriver - jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_pt?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_ct?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true username: root password: 123456 hikari: diff --git a/src/main/resources/mybatis/mapper/basic/BasicSkPrescribeDiMapper.xml b/src/main/resources/mybatis/mapper/basic/BasicSkPrescribeDiMapper.xml new file mode 100644 index 000000000..33050433c --- /dev/null +++ b/src/main/resources/mybatis/mapper/basic/BasicSkPrescribeDiMapper.xml @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + + id, + pId, + sickerCode, + prescribeCode, + relId, + thrName, + thrCode, + measureCount, + measureUnit, + category, + frequency, + count, + price, + ggxh, + remark + + + + + diff --git a/src/main/resources/mybatis/mapper/basic/BasicSkPrescribeItemDetailMapper.xml b/src/main/resources/mybatis/mapper/basic/BasicSkPrescribeItemDetailMapper.xml deleted file mode 100644 index f02a576c2..000000000 --- a/src/main/resources/mybatis/mapper/basic/BasicSkPrescribeItemDetailMapper.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - id,pId,sickerCode, - prescribeCode,relId,thrName, - thrCode,measureCount,measureUnit, - category,frequency,count, - price,ggxh,remark - - diff --git a/src/main/resources/mybatis/mapper/basic/BasicSkSickerMapper.xml b/src/main/resources/mybatis/mapper/basic/BasicSkSickerMapper.xml index 96d1063fb..d41d3e2df 100644 --- a/src/main/resources/mybatis/mapper/basic/BasicSkSickerMapper.xml +++ b/src/main/resources/mybatis/mapper/basic/BasicSkSickerMapper.xml @@ -43,9 +43,17 @@ AND name LIKE concat('%', #{name}, '%') + + AND adNum LIKE concat('%', #{adNum}, '%') + AND code LIKE concat('%', #{code}, '%') + + + + + diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index 05ae321fd..15fd3450f 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/src/main/resources/schemas/schema_v2.4.sql @@ -157,3 +157,10 @@ CREATE TABLE IF NOT EXISTS `thr_product_type` CALL Pro_Temp_ColumnWork('basic_udirel', 'uploadFlag', 'tinyint', 1); CALL Pro_Temp_ColumnWork('basic_udirel', 'uploadMsg', 'varchar(1024)', 1); + +CALL Pro_Temp_ColumnWork('thr_products', 'prcitmcode', 'varchar(255)', 1); + + +CALL Pro_Temp_ColumnWork('basic_sk_prescribe_item_detail', 'nameCode', 'varchar(255)', 1); +CALL Pro_Temp_ColumnWork('basic_sk_prescribe_item_detail', 'amount', 'decimal(10, 3)', 1); +CALL Pro_Temp_ColumnWork('basic_sk_prescribe_item_detail', 'adNum', 'varchar(255)', 1);