UDI
/
udi-spms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

12/20 bug 优化1.0

Browse Source
dev_unify
wangwei 4 months ago
parent e671b6def7
commit 66039057be
14 changed files with 80 additions and 53 deletions
Show Stats Download Patch File Download Diff File

3
src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java
Unescape Escape View File

@ -359,6 +359,7 @@ public class UdiRlSupController extends BaseController {
udiRelevanceEntity.setLockStatus(1);
udiRelevanceEntity.setProductsType(2);
udiRelevanceEntity.setUpdateTime(new Date());
udiRelevanceEntity.setDetailSort(udiInfoExportRequest.getSupplementRequest().getDetailSort());
udiRelevanceService.updateUdiRelevance(udiRelevanceEntity);
UdiProductEntity udiProductEntity = new UdiProductEntity();
udiProductEntity.setProductsType(2);
@ -373,7 +374,7 @@ public class UdiRlSupController extends BaseController {
byUuid.setCatalogname1(udiProductEntity.getCatalogname1());
byUuid.setCatalogname2(udiProductEntity.getCatalogname2());
byUuid.setCatalogname3(udiProductEntity.getCatalogname3());
byUuid.setDetailSort(udiProductEntity.getDetailSort());
// byUuid.setDetailSort(udiProductEntity.getDetailSort());
byUuid.setYbbm(udiProductEntity.getYbbm());
byUuid.setManufactory(udiProductEntity.getManufactory());
byUuid.setUpdateTime(new Date());

7
src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java
Unescape Escape View File

@ -457,7 +457,10 @@ public class IoOrderDetailBizController extends BaseController {
List<IoOrderDetailCodeEntity> orderDetailCodeEntities = orderDetailCodeService.findByOrderId(orderDetailBizRequest.getOrderIdFk());
ioCheckInoutService.bizOrderCheck2(list, orderDetailCodeEntities);
PageInfo<IoOrderDetailBizResponse> pageInfo = new PageInfo<>(list);
return ResultVOUtils.page(pageInfo);
PageSimpleResponse<IoOrderDetailBizResponse> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(list);
return ResultVOUtils.success(pageSimpleResponse);
}
@ -818,6 +821,8 @@ public class IoOrderDetailBizController extends BaseController {
if (StrUtil.isNotEmpty(aliYljgBillDetailDrug.getValidEndDate())) {
codeLostEntity.setExpireDate(aliYljgBillDetailDrug.getValidEndDate().substring(2).replace(" 00:00:00", "").replace("-", ""));
}
Long id = codeLostEntity.getId();
if (id == null) codeLostEntity.setId(IdUtil.getSnowflakeNextId());
}
ioCodeLostService.insertOrUpdate(codeLostEntity);

13
src/main/java/com/glxp/api/controller/test/TestCodeController.java
Unescape Escape View File

@ -2,6 +2,7 @@ package com.glxp.api.controller.test;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.dao.auth.AuthCompanyMapper;
import com.glxp.api.entity.alihealth.AliYljgBillDetail;
import com.glxp.api.entity.alihealth.AliYljgSearchbill;
@ -21,8 +22,10 @@ import com.glxp.api.res.alihealth.AlihealthYljgListupoutDetailResponse;
import com.glxp.api.service.collect.RelCodeBatchService;
import com.glxp.api.service.collect.RelCodeDetailService;
import com.glxp.api.service.thrsys.ThirdAliDrugService;
import com.glxp.api.util.DimaUtil;
import com.glxp.api.util.alihealth.AlihealthUtils;
import com.glxp.api.util.alihealth.AlihealthYljgUtils;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RestController;
@ -87,6 +90,7 @@ public class TestCodeController {
return null;
}
@PostMapping("/test1")
public BaseResponse test1() {
AlihealthThirdAliDrugInsertReqeust alihealthThirdAliDrugInsertReqeust = new AlihealthThirdAliDrugInsertReqeust();
@ -106,9 +110,9 @@ public class TestCodeController {
alihealthKytDrugrescodeReqeust.setRef_ent_id("ef99b78bd9c54c1284f813149c858fb0");
alihealthThirdAliDrugInsertReqeust.setAlihealthKytDrugrescodeReqeust(alihealthKytDrugrescodeReqeust);
BaseResponse<List<ThirdAliDrug>> baseResponse = alihealthUtils.thirdAliDrugInsertAll(alihealthThirdAliDrugInsertReqeust);
if(baseResponse.getCode() == 20000){
if (baseResponse.getCode() == 20000) {
List<ThirdAliDrug> list = baseResponse.getData();
if(list!=null && list.size() >0){
if (list != null && list.size() > 0) {
for (ThirdAliDrug thirdAliDrug : list) {
ThirdAliDrug thirdAliDrugNew = thirdAliDrugService.getOne(new QueryWrapper<ThirdAliDrug>().eq("nameCode", thirdAliDrug.getNameCode())
.last("limit 1")
@ -127,6 +131,7 @@ public class TestCodeController {
return baseResponse;
// return alihealthUtils.thirdAliDrugInsert(alihealthThirdAliDrugInsertReqeust,true);
}
@PostMapping("/test2")
public BaseResponse test2() {
AlihealthKytThirdAliSearchbillInsertReqeust alihealthKytThirdAliSearchbillInsertReqeust = new AlihealthKytThirdAliSearchbillInsertReqeust();
@ -166,6 +171,7 @@ public class TestCodeController {
return alihealthUtils.thirdAliSearchbillInsert(alihealthKytThirdAliSearchbillInsertReqeust);
}
@PostMapping("/test3")
public BaseResponse<List<AliYljgSearchbill>> test3() {
@ -174,8 +180,9 @@ public class TestCodeController {
alihealthYljgListupoutReqeust1.setEnd_date("2024-05-01");
alihealthYljgListupoutReqeust1.setPage(1);
alihealthYljgListupoutReqeust1.setPage_size(20);
return alihealthYljgUtils.listupout(alihealthYljgListupoutReqeust1,"72890663819159");
return alihealthYljgUtils.listupout(alihealthYljgListupoutReqeust1, "72890663819159");
}
@PostMapping("/test4")
public BaseResponse<AliYljgBillDetail> test4() {

4
src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java
Unescape Escape View File

@ -347,8 +347,8 @@ public class UdiProductEntity {
/**
* 明细分类
*/
@TableField(value = "detailSort")
private Integer detailSort;
// @TableField(value = "detailSort")
// private Integer detailSort;
public Integer getMyBhxjsl() {
if (bhxjsl == null || bhxjsl == 0)

3
src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java
Unescape Escape View File

@ -311,4 +311,7 @@ public class UdiRelevanceEntity {
@TableField(value = "unpackUseTime")
private Integer unpackUseTime;
@TableField(value = "detailSort")
private Integer detailSort;
}

1
src/main/java/com/glxp/api/req/basic/UpdateLevelDrugRequest.java
Unescape Escape View File

@ -35,6 +35,7 @@ public class UpdateLevelDrugRequest {
private String uuid;
private String xjdw;
private Integer diType;
private String packRatio;
public Integer getMyBhxjsl() {
if (bhxjsl == null || bhxjsl == 0)

1
src/main/java/com/glxp/api/service/basic/UdiContrastService.java
Unescape Escape View File

@ -433,6 +433,7 @@ public class UdiContrastService {
udiProductEntity.setSpmc(thirdAliDrug.getSpmc());
udiProductEntity.setBzgg(thirdAliDrug.getBzgg());
udiProductEntity.setPackRatio(thirdAliDrug.getPackRatio());
// udiProductEntity.setMatrial(ybDrug.getMaterialName());
// udiProductEntity.setPackMatrial(ybDrug.getMaterialName());
// udiProductEntity.setMedicareType(setMedicareType(ybDrug.getProductInsuranceType()));

2
src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java
Unescape Escape View File

@ -324,6 +324,7 @@ public class UdiProductServiceImpl implements UdiProductService {
udiRelevanceEntity.setUseMaxLevel(addProductRequest.getUseMaxLevel());
udiRelevanceEntity.setDistributeMaxLevel(addProductRequest.getDistributeMaxLevel());
udiRelevanceEntity.setUnpackUseTime(addProductRequest.getUnpackUseTime());
udiRelevanceEntity.setDetailSort(addProductRequest.getDetailSort());
udiRelevanceEntity.setUpdateTime(new Date());
udiRelevanceDao.updateById(udiRelevanceEntity);
updateLevelCount(udiRelevanceEntity);
@ -342,6 +343,7 @@ public class UdiProductServiceImpl implements UdiProductService {
udiRelevanceEntity.setHcType(addProductRequest.getHcType());
udiRelevanceEntity.setPayFeeCode(addProductRequest.getPayFeeCode());
udiRelevanceEntity.setUnpackUseTime(addProductRequest.getUnpackUseTime());
udiRelevanceEntity.setDetailSort(addProductRequest.getDetailSort());
udiRelevanceEntity.setUpdateTime(new Date());
// if (addProductRequest.getDistributeLevelDi() != null) {
// udiRelevanceEntity.setDistributeLevelDi(addProductRequest.getDistributeLevelDi());

2
src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java
Unescape Escape View File

@ -703,7 +703,7 @@ public class RelCodeBatchService extends ServiceImpl<RelCodeBatchMapper, RelCode
@Resource
AlihealthYljgUtils alihealthYljgUtils;
// 处理阿里新增关联关系
public void addRelCodeAli( Set<String> set, String erpId){
public void addRelCodeAli(Set<String> set, String erpId){
try {
List<String> relCodeBatchList =new ArrayList<>();
//2.下载关联关系存到关联关系表

14
src/main/java/com/glxp/api/util/DimaUtil.java
Unescape Escape View File

@ -28,16 +28,18 @@ public class DimaUtil {
}
// 最后加上最小单位（第一层级为 1）
calculatedLevels.add(1);
calculatedLevels.add(0,1);
// 结果倒序
List<Integer> reversed = new ArrayList<>();
for (int i = calculatedLevels.size() - 1; i >= 0; i--) {
reversed.add(calculatedLevels.get(i));
}
return reversed;
// List<Integer> reversed = new ArrayList<>();
// for (int i = calculatedLevels.size() - 1; i >= 0; i--) {
// reversed.add(calculatedLevels.get(i));
// }
return calculatedLevels;
}
public static Integer trMinCount(String bzgg) {
// 定义正则表达式模式，用于匹配数字
Pattern pattern = Pattern.compile("\\d+");

4
src/main/resources/mybatis/mapper/basic/UdiProductDao.xml
Unescape Escape View File

@ -599,9 +599,7 @@
<if test="catalogname2 != null">
catalogname2=#{catalogname2},
</if>
<if test="detailSort != null">
detailSort=#{detailSort},
</if>
</trim>
WHERE nameCode = #{nameCode}
and uuid = #{uuid}

10
src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
Unescape Escape View File

@ -494,8 +494,7 @@
basic_products.workPlaceCount,
basic_products.bhltcjsl,
basic_products.bhsycjsl,
th.hsmc hslbName,
basic_products.detailSort
th.hsmc hslbName
FROM basic_products
inner JOIN basic_udirel
ON basic_products.uuid = basic_udirel.uuid
@ -1067,7 +1066,7 @@
groupBuy, needCert, isStack,
distributeLevelCount, useLevel,
distributeLevel,
splitEnable, autoCode, distributeMaxLevel, useMaxLevel,unpackUseTime)
splitEnable, autoCode, distributeMaxLevel, useMaxLevel,unpackUseTime,detailSort)
values (#{id},
#{uuid},
#{mainId},
@ -1103,7 +1102,7 @@
#{useLevel},
#{distributeLevel},
#{splitEnable},
#{autoCode}, #{distributeMaxLevel}, #{useMaxLevel}, #{unpackUseTime})
#{autoCode}, #{distributeMaxLevel}, #{useMaxLevel}, #{unpackUseTime},#{detailSort})
</insert>
<insert id="insertUdiRelevanceignore" keyProperty="id"
@ -1298,6 +1297,9 @@
<if test="unpackUseTime != null">
unpackUseTime=#{unpackUseTime},
</if>
<if test="detailSort != null">
detailSort=#{detailSort},
</if>
</trim>
WHERE id = #{id}
</update>

2
src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml
Unescape Escape View File

@ -145,7 +145,7 @@
basic_products.physicType,
basic_products.medicareType,
basic_products.indate,
basic_products.detailSort
basic_udirel.detailSort
FROM company_product_relevance
inner JOIN basic_udirel
ON company_product_relevance.udiRlIdFk = basic_udirel.id

11
src/main/resources/schemas/schema_v2.4.sql
Unescape Escape View File

@ -1184,9 +1184,9 @@ CALL Pro_Temp_ColumnWork('third_ali_drug', 'approvalNum',
call Modify_index('third_ali_drug', 'approvalNum', 'approvalNum', 'BTREE');
CALL Pro_Temp_ColumnWork('basic_products', 'detailSort',
' tinyint DEFAULT NULL COMMENT ''明细分类''',
1);
# CALL Pro_Temp_ColumnWork('basic_products', 'detailSort',
# ' tinyint DEFAULT NULL COMMENT ''明细分类''',
# 1);
CALL Pro_Temp_ColumnWork('sync_data_set', 'drugDataTask',
' tinyint NULL DEFAULT NULL COMMENT ''药品关联关系同步''',
@ -1254,3 +1254,8 @@ call Modify_UNIQUE_index('io_code_lost', 'code', 'uniqueCode', 'BTREE');
CALL Pro_Temp_ColumnWork('io_order', 'aliOrderBillNo',
' varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT ''阿里来源单号''',
1);
CALL Pro_Temp_ColumnWork('basic_udirel', 'detailSort', ' tinyint DEFAULT NULL', 1);

Write Preview
Loading…
Cancel
Save