患者处方相关修改

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());

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<BasicSkPrescribeDiEntity> basicSkPrescribeResponses = basicSkPrescribeDiService.filterList(basicSkPrescribeDiRequest);
+        PageInfo<BasicSkPrescribeDiEntity> pageInfo = new PageInfo<>(basicSkPrescribeResponses);
+        PageSimpleResponse<BasicSkPrescribeDiEntity> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(basicSkPrescribeResponses);
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
+}

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("后台已开始下载，请稍后刷新查看！");
     }

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<BasicSkPrescribeDiEntity> {
+
+    List<BasicSkPrescribeDiEntity> filterList(BasicSkPrescribeDiRequest basicSkPrescribeDiRequest);
+}
+
+
+
+

src/main/java/com/glxp/api/dao/basic/BasicSkPrescribeItemDetailMapper.java

@@ -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<BasicSkPrescribeItemDetailEntity> {
-
-}
-
-
-
-

src/main/java/com/glxp/api/entity/basic/BasicSkPrescribeDiEntity.java

@@ -4,17 +4,20 @@ 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 {
     /**
      *
      */
@@ -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;
 }

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;
+
 }

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;
+
+
+}

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;
 }

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<BasicSkPrescribeItemEntity> itemList;
+
 }

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<BasicSkPrescribeDiEntity> {
+
+    List<BasicSkPrescribeDiEntity> filterList(BasicSkPrescribeDiRequest basicSkPrescribeDiRequest);
+
+}

src/main/java/com/glxp/api/service/BasicSkPrescribeItemDetailService.java

@@ -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<BasicSkPrescribeItemDetailEntity> {
-
-}

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.*;
-import com.glxp.api.entity.basic.UdiRelevanceEntity;
 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<BasicSkPrescribeMapper,
 
     @Resource
     ErpBasicClient erpBasicClient;
+    @Resource
+    BasicSkPrescirbeDetailService basicSkPrescirbeDetailService;
+    @Resource
+    BasicSkPrescribeDiService basicSkPrescribeDiService;
 
     public List<BasicSkPrescribeResponse> filterList(BasicSkPrescribeRequest basicSkPrescribeRequest) {
         if (basicSkPrescribeRequest == null) {
@@ -57,7 +63,7 @@ public class BasicSkPrescribeService extends ServiceImpl<BasicSkPrescribeMapper,
 
     public BaseResponse downloadSickerPrescribe(GetSickPrescribeRequest request) {
         int page = 1;
-        int limit = 200;
+        int limit = 50;
         request.setThirdSys("thirdId");
         request.setLimit(limit);
         while (true) {
@@ -65,14 +71,26 @@ public class BasicSkPrescribeService extends ServiceImpl<BasicSkPrescribeMapper,
             BaseResponse<PageSimpleResponse<BasicSkPrescribeResponse>> baseResponse = erpBasicClient.getSickPrescribe(request);
             if (baseResponse.getCode() == 20000) {
                 List<BasicSkPrescribeResponse> list = baseResponse.getData().getList();
-
                 List<BasicSkPrescribeEntity> basicSkPrescribeEntities = new ArrayList<>();
-
                 list.forEach(item -> {
-                    BasicSkPrescribeEntity basicSkSickerEntity = new BasicSkPrescribeEntity();
+                    BasicSkPrescribeEntity basicSkPrescribeEntity = new BasicSkPrescribeEntity();
-                    BeanUtil.copyProperties(item, basicSkSickerEntity);
+                    BeanUtil.copyProperties(item, basicSkPrescribeEntity);
+                    basicSkPrescribeEntity.setSickerCode(item.getSickCode());
+                    List<BasicSkPrescribeItemEntity> skPrescribeItemEntities = item.getItemList();
+                    if (CollUtil.isNotEmpty(skPrescribeItemEntities)) {
+                        basicSkPrescirbeDetailService.remove(new QueryWrapper<BasicSkPrescribeItemEntity>().eq("prescribeCode", item.getCode()));
+                        basicSkPrescribeDiService.remove(new QueryWrapper<BasicSkPrescribeDiEntity>().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<BasicSkPrescribeMapper,
         return ResultVOUtils.success("下载成功！");
     }
 
+
+    @Resource
+    ThrProductsService thrProductsService;
+    @Resource
+    UdiRelevanceService udiRelevanceService;
+
+    /**
+     * 处方明细转换成处方使用耗材
+     *
+     * @return
+     */
+    public void trSkPrescribeDi(BasicSkPrescribeItemEntity skPrescribeItemEntity) {
+
+        if (skPrescribeItemEntity.getItemCode() != null) {
+            List<ThrProductsEntity> thrProductsEntities = thrProductsService.list(new QueryWrapper<ThrProductsEntity>().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);
+                }
+            }
+        }
+    }
+
+
 }

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<BasicSkSickerMapper, Basic
         return data;
     }
 
+    @Resource
+    RedisUtil redisUtil;
 
-    public BaseResponse downloadSicker(GetSickRequest request) {
+    public BaseResponse downloadSicker(GetSickRequest request, Integer startPage) {
-        int page = 1;
+        int page = (int) redisUtil.get("thr_sicker_page");
-        int limit = 200;
+        if (startPage != null)
+            page = 1;
+        int limit = 50;
         request.setThirdSys("thirdId");
         request.setLimit(limit);
         while (true) {
@@ -53,18 +58,20 @@ public class BasicSkSickerService extends ServiceImpl<BasicSkSickerMapper, Basic
             BaseResponse<PageSimpleResponse<BasicSkSickerResponse>> baseResponse = erpBasicClient.getSicker(request);
             if (baseResponse.getCode() == 20000) {
                 List<BasicSkSickerResponse> list = baseResponse.getData().getList();
-
                 List<BasicSkSickerEntity> 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;
                 }

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<BasicSkPrescribeDiMapper, BasicSkPrescribeDiEntity>
+        implements BasicSkPrescribeDiService {
+
+    public List<BasicSkPrescribeDiEntity> 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<BasicSkPrescribeDiEntity> data = super.baseMapper.filterList(basicSkPrescribeDiRequest);
+        return data;
+    }
+
+}
+
+
+
+

src/main/java/com/glxp/api/service/basic/impl/BasicSkPrescribeItemDetailServiceImpl.java

@@ -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<BasicSkPrescribeItemDetailMapper, BasicSkPrescribeItemDetailEntity>
-    implements BasicSkPrescribeItemDetailService{
-
-}
-
-
-
-

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:

src/main/resources/mybatis/mapper/basic/BasicSkPrescribeDiMapper.xml

@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.glxp.api.dao.basic.BasicSkPrescribeDiMapper">
+    <resultMap id="BaseResultMap" type="com.glxp.api.entity.basic.BasicSkPrescribeDiEntity">
+        <id property="id" column="id" jdbcType="BIGINT"/>
+        <result property="pId" column="pId" jdbcType="BIGINT"/>
+        <result property="sickerCode" column="sickerCode" jdbcType="VARCHAR"/>
+        <result property="prescribeCode" column="prescribeCode" jdbcType="VARCHAR"/>
+        <result property="relId" column="relId" jdbcType="BIGINT"/>
+        <result property="thrName" column="thrName" jdbcType="VARCHAR"/>
+        <result property="thrCode" column="thrCode" jdbcType="VARCHAR"/>
+        <result property="measureCount" column="measureCount" jdbcType="VARCHAR"/>
+        <result property="measureUnit" column="measureUnit" jdbcType="VARCHAR"/>
+        <result property="category" column="category" jdbcType="VARCHAR"/>
+        <result property="frequency" column="frequency" jdbcType="VARCHAR"/>
+        <result property="count" column="count" jdbcType="INTEGER"/>
+        <result property="price" column="price" jdbcType="DECIMAL"/>
+        <result property="ggxh" column="ggxh" jdbcType="VARCHAR"/>
+        <result property="remark" column="remark" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,
+        pId,
+        sickerCode,
+        prescribeCode,
+        relId,
+        thrName,
+        thrCode,
+        measureCount,
+        measureUnit,
+        category,
+        frequency,
+        count,
+        price,
+        ggxh,
+        remark
+    </sql>
+
+
+    <select id="filterList" parameterType="com.glxp.api.req.basic.BasicSkPrescribeDiRequest"
+            resultType="com.glxp.api.entity.basic.BasicSkPrescribeDiEntity">
+        SELECT *
+        FROM basic_sk_prescribe_item_detail
+        <where>
+            <if test="sickerCode != '' and sickerCode != null">
+                AND sickerCode LIKE concat('%', #{sickerCode}, '%')
+            </if>
+            <if test="prescribeCode != null and prescribeCode != ''">
+                AND prescribeCode = #{prescribeCode}
+            </if>
+            <if test="relId != null and relId != ''">
+                AND relId = #{relId}
+            </if>
+            <if test="thrName != null and thrName != ''">
+                AND thrName = #{thrName}
+            </if>
+            <if test="thrCode != null and thrCode != ''">
+                AND thrCode = #{thrCode}
+            </if>
+        </where>
+        order by prescribeDate
+    </select>
+</mapper>

src/main/resources/mybatis/mapper/basic/BasicSkPrescribeItemDetailMapper.xml

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.glxp.api.dao.basic.BasicSkPrescribeItemDetailMapper">
-
-    <resultMap id="BaseResultMap" type="com.glxp.api.entity.basic.BasicSkPrescribeItemDetailEntity">
-            <id property="id" column="id" jdbcType="BIGINT"/>
-            <result property="pId" column="pId" jdbcType="BIGINT"/>
-            <result property="sickerCode" column="sickerCode" jdbcType="VARCHAR"/>
-            <result property="prescribeCode" column="prescribeCode" jdbcType="VARCHAR"/>
-            <result property="relId" column="relId" jdbcType="BIGINT"/>
-            <result property="thrName" column="thrName" jdbcType="VARCHAR"/>
-            <result property="thrCode" column="thrCode" jdbcType="VARCHAR"/>
-            <result property="measureCount" column="measureCount" jdbcType="VARCHAR"/>
-            <result property="measureUnit" column="measureUnit" jdbcType="VARCHAR"/>
-            <result property="category" column="category" jdbcType="VARCHAR"/>
-            <result property="frequency" column="frequency" jdbcType="VARCHAR"/>
-            <result property="count" column="count" jdbcType="INTEGER"/>
-            <result property="price" column="price" jdbcType="DECIMAL"/>
-            <result property="ggxh" column="ggxh" jdbcType="VARCHAR"/>
-            <result property="remark" column="remark" jdbcType="VARCHAR"/>
-    </resultMap>
-
-    <sql id="Base_Column_List">
-        id,pId,sickerCode,
-        prescribeCode,relId,thrName,
-        thrCode,measureCount,measureUnit,
-        category,frequency,count,
-        price,ggxh,remark
-    </sql>
-</mapper>

src/main/resources/mybatis/mapper/basic/BasicSkSickerMapper.xml

@@ -43,9 +43,17 @@
             <if test="name != '' and name != null">
                 AND name LIKE concat('%', #{name}, '%')
             </if>
+            <if test="adNum != '' and adNum != null">
+                AND adNum LIKE concat('%', #{adNum}, '%')
+            </if>
             <if test="code != '' and code != null">
                 AND code LIKE concat('%', #{code}, '%')
             </if>
+
+
+
+
+
         </where>
     </select>
 </mapper>

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);