|
|
|
|
@ -23,8 +23,6 @@ import com.glxp.api.res.DiLevelResponse;
|
|
|
|
|
import com.glxp.api.service.auth.CustomerService;
|
|
|
|
|
import com.glxp.api.service.basic.UdiContrastService;
|
|
|
|
|
import com.glxp.api.service.basic.UdiProductService;
|
|
|
|
|
import com.glxp.api.service.basic.UdiRelevanceService;
|
|
|
|
|
import com.glxp.api.service.thrsys.ThirdAliDrugService;
|
|
|
|
|
import com.glxp.api.service.thrsys.ThrProductsService;
|
|
|
|
|
import com.glxp.api.service.thrsys.YbDrugService;
|
|
|
|
|
import com.glxp.api.util.IntUtil;
|
|
|
|
|
@ -58,22 +56,8 @@ public class UdiProductServiceImpl implements UdiProductService {
|
|
|
|
|
@Resource
|
|
|
|
|
private CustomerService customerService;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private static final Logger logger = LoggerFactory.getLogger(UdiProductService.class);
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public List<UdiProductEntity> filterUdiInfo(FilterUdiRelRequest filterUdiRelRequest) {
|
|
|
|
|
if (filterUdiRelRequest == null) {
|
|
|
|
|
return Collections.emptyList();
|
|
|
|
|
}
|
|
|
|
|
// 分页处理
|
|
|
|
|
filterUdiRelRequest.pageDispose();
|
|
|
|
|
|
|
|
|
|
List<UdiProductEntity> data = udiProductDao.filterUdiInfo(filterUdiRelRequest);
|
|
|
|
|
return data;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public UdiProductEntity findBySptm(String sptm) {
|
|
|
|
|
FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest();
|
|
|
|
|
@ -144,26 +128,6 @@ public class UdiProductServiceImpl implements UdiProductService {
|
|
|
|
|
}
|
|
|
|
|
return udiProductDao.insertUdiInfo(udiProductEntity);
|
|
|
|
|
}
|
|
|
|
|
// @Override
|
|
|
|
|
// public boolean insertUdiInfo(UdiProductEntity udiProductEntity) {
|
|
|
|
|
// udiProductEntity.setUpdateTime(new Date());
|
|
|
|
|
// if (udiProductEntity.getId() == null) {
|
|
|
|
|
// udiProductEntity.setId(IdUtil.getSnowflakeNextId());
|
|
|
|
|
// }
|
|
|
|
|
//
|
|
|
|
|
// //医保编码解析
|
|
|
|
|
// String catalogcode = udiProductEntity.getCatalogcode();
|
|
|
|
|
// if (StrUtil.isNotEmpty(catalogcode) && catalogcode.length() >= 7) {
|
|
|
|
|
// Integer catalogcode1 = Integer.valueOf(catalogcode.substring(1, 3));
|
|
|
|
|
// Integer catalogcode2 = Integer.valueOf(catalogcode1 + catalogcode.substring(3, 5));
|
|
|
|
|
// Integer catalogcode3 = Integer.valueOf(catalogcode2 + catalogcode.substring(5, 7));
|
|
|
|
|
// udiProductEntity.setCatalogCode1(catalogcode1);
|
|
|
|
|
// udiProductEntity.setCatalogCode2(catalogcode2);
|
|
|
|
|
// udiProductEntity.setCatalogCode3(catalogcode3);
|
|
|
|
|
// }
|
|
|
|
|
//
|
|
|
|
|
// return udiProductDao.insertUdiInfo(udiProductEntity);
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public boolean insertUdiInfos(List<UdiProductEntity> udiInfoEntities) {
|
|
|
|
|
@ -178,46 +142,12 @@ public class UdiProductServiceImpl implements UdiProductService {
|
|
|
|
|
return udiProductDao.updateUdiInfo(udiProductEntity);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// @Override
|
|
|
|
|
// public boolean updateUdiInfoByUuid(UdiProductEntity udiProductEntity) {
|
|
|
|
|
// if (StrUtil.isEmpty(udiProductEntity.getUuid()))
|
|
|
|
|
// return false;
|
|
|
|
|
// udiProductEntity.setUpdateTime(new Date());
|
|
|
|
|
// //医保编码解析
|
|
|
|
|
// String catalogcode = udiProductEntity.getCatalogcode();
|
|
|
|
|
// if (StrUtil.isNotEmpty(catalogcode) && catalogcode.length() >= 7) {
|
|
|
|
|
// Integer catalogcode1 = Integer.valueOf(catalogcode.substring(1, 3));
|
|
|
|
|
// Integer catalogcode2 = Integer.valueOf(catalogcode1 + catalogcode.substring(3, 5));
|
|
|
|
|
// Integer catalogcode3 = Integer.valueOf(catalogcode2 + catalogcode.substring(5, 7));
|
|
|
|
|
// udiProductEntity.setCatalogCode1(catalogcode1);
|
|
|
|
|
// udiProductEntity.setCatalogCode2(catalogcode2);
|
|
|
|
|
// udiProductEntity.setCatalogCode3(catalogcode3);
|
|
|
|
|
// }
|
|
|
|
|
// return udiProductDao.updateUdiInfoByUuid(udiProductEntity);
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
public boolean updateUdiInfoByUuid(UdiProductEntity udiProductEntity) {
|
|
|
|
|
if (StrUtil.isEmpty(udiProductEntity.getUuid()))
|
|
|
|
|
return false;
|
|
|
|
|
return udiProductDao.updateUdiInfoByUuid(udiProductEntity);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// @Override
|
|
|
|
|
// public boolean updateUdiInfoById(UdiProductEntity udiProductEntity) {
|
|
|
|
|
// udiProductEntity.setUpdateTime(new Date());
|
|
|
|
|
// //医保编码解析
|
|
|
|
|
// String catalogcode = udiProductEntity.getCatalogcode();
|
|
|
|
|
// if (StrUtil.isNotEmpty(catalogcode) && catalogcode.length() >= 7) {
|
|
|
|
|
// Integer catalogcode1 = Integer.valueOf(catalogcode.substring(1, 3));
|
|
|
|
|
// Integer catalogcode2 = Integer.valueOf(catalogcode1 + catalogcode.substring(3, 5));
|
|
|
|
|
// Integer catalogcode3 = Integer.valueOf(catalogcode2 + catalogcode.substring(5, 7));
|
|
|
|
|
// udiProductEntity.setCatalogCode1(catalogcode1);
|
|
|
|
|
// udiProductEntity.setCatalogCode2(catalogcode2);
|
|
|
|
|
// udiProductEntity.setCatalogCode3(catalogcode3);
|
|
|
|
|
// }
|
|
|
|
|
//
|
|
|
|
|
// return udiProductDao.updateUdiInfoById(udiProductEntity);
|
|
|
|
|
// }
|
|
|
|
|
@Override
|
|
|
|
|
public boolean updateUdiInfoById(UdiProductEntity udiProductEntity) {
|
|
|
|
|
return udiProductDao.updateUdiInfoById(udiProductEntity);
|
|
|
|
|
@ -247,24 +177,13 @@ public class UdiProductServiceImpl implements UdiProductService {
|
|
|
|
|
return udiProductDao.updateUdiInfoNotAll(udiInfoRequest);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Value("${UDI_SERVER_URL}")
|
|
|
|
|
private String udiUrl;
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 新增/编辑药品信息
|
|
|
|
|
*
|
|
|
|
|
* @param addProductRequest
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
/**
|
|
|
|
|
* 新增/编辑药品信息
|
|
|
|
|
*
|
|
|
|
|
* @param addProductRequest
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
@Override
|
|
|
|
|
public AddProductRequest addDrug(AddProductRequest addProductRequest) {
|
|
|
|
|
|
|
|
|
|
UdiRelevanceEntity udiRelevanceEntity;
|
|
|
|
|
@ -272,7 +191,6 @@ public class UdiProductServiceImpl implements UdiProductService {
|
|
|
|
|
if (addProductRequest.getRelId() != null) {
|
|
|
|
|
udiRelevanceEntity = udiRelevanceDao.selectById(addProductRequest.getRelId());
|
|
|
|
|
List<UdiProductEntity> udiProductEntities = udiProductDao.findByUuids(udiRelevanceEntity.getUuid());
|
|
|
|
|
// List<CodeRel> list = new ArrayList<>();
|
|
|
|
|
for (UdiProductEntity udiProductEntity : udiProductEntities) {
|
|
|
|
|
addProductRequest.setNameCode(udiProductEntity.getNameCode());
|
|
|
|
|
addProductRequest.setId(udiProductEntity.getId());
|
|
|
|
|
@ -286,25 +204,12 @@ public class UdiProductServiceImpl implements UdiProductService {
|
|
|
|
|
if (IntUtil.value(udiProductEntity.getPackLevel()) == 1) {
|
|
|
|
|
udiProductEntity.setDiType(1);
|
|
|
|
|
}
|
|
|
|
|
// CodeRel codeRel = new CodeRel();
|
|
|
|
|
// codeRel.setDrugCode(udiProductEntity.getNameCode());
|
|
|
|
|
// codeRel.setYbbm(udiProductEntity.getYbbm());
|
|
|
|
|
// codeRel.setUpdateTime(new Date());
|
|
|
|
|
// codeRel.setPackUnit(udiProductEntity.getPackUnit());
|
|
|
|
|
// codeRel.setBhxjsl(udiProductEntity.getBhxjsl());
|
|
|
|
|
// codeRel.setXjdw(udiProductEntity.getXjdw());
|
|
|
|
|
// codeRel.setYbBzgg(udiProductEntity.getBzgg());
|
|
|
|
|
// list.add(codeRel);
|
|
|
|
|
|
|
|
|
|
int i = udiProductDao.updateById(udiProductEntity);
|
|
|
|
|
if (i == 0) {
|
|
|
|
|
throw new JsonException(500, "更新错误");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
// if (list != null && list.size() > 0) {
|
|
|
|
|
// // 上传多玛关系
|
|
|
|
|
// udiContrastService.codeRelUpdateBatch(list);
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
//修改关联表
|
|
|
|
|
// udiRelevanceEntity.setUseLeverCount(addProductRequest.getUseLeverCount());
|
|
|
|
|
udiRelevanceEntity.setSplitEnable(addProductRequest.getSplitEnable());
|
|
|
|
|
@ -341,25 +246,6 @@ public class UdiProductServiceImpl implements UdiProductService {
|
|
|
|
|
udiRelevanceEntity.setUnpackUseTime(addProductRequest.getUnpackUseTime());
|
|
|
|
|
udiRelevanceEntity.setDetailSort(addProductRequest.getDetailSort());
|
|
|
|
|
udiRelevanceEntity.setUpdateTime(new Date());
|
|
|
|
|
// if (addProductRequest.getDistributeLevelDi() != null) {
|
|
|
|
|
// udiRelevanceEntity.setDistributeLevelDi(addProductRequest.getDistributeLevelDi());
|
|
|
|
|
// }
|
|
|
|
|
// if (addProductRequest.getDistributeLevelCount() != null) {
|
|
|
|
|
// udiRelevanceEntity.setDistributeLevelCount(addProductRequest.getDistributeLevelCount());
|
|
|
|
|
// }
|
|
|
|
|
// if (addProductRequest.getDistributeLevelUnit() != null) {
|
|
|
|
|
// udiRelevanceEntity.setDistributeLevelUnit(addProductRequest.getDistributeLevelUnit());
|
|
|
|
|
// }
|
|
|
|
|
//
|
|
|
|
|
// if (addProductRequest.getUseLevelDi() != null) {
|
|
|
|
|
// udiRelevanceEntity.setUseLevelDi(addProductRequest.getUseLevelDi());
|
|
|
|
|
// }
|
|
|
|
|
// if (addProductRequest.getUseLevelUnit() != null) {
|
|
|
|
|
// udiRelevanceEntity.setUseLevelUnit(addProductRequest.getUseLevelUnit());
|
|
|
|
|
// }
|
|
|
|
|
// if (addProductRequest.getUseLeverCount() != null) {
|
|
|
|
|
// udiRelevanceEntity.setUseLeverCount(addProductRequest.getUseLeverCount());
|
|
|
|
|
// }
|
|
|
|
|
if (addProductRequest.getDistributeLevel() != null) {
|
|
|
|
|
udiRelevanceEntity.setDistributeLevel(addProductRequest.getDistributeLevel());
|
|
|
|
|
}
|
|
|
|
|
@ -455,16 +341,9 @@ public class UdiProductServiceImpl implements UdiProductService {
|
|
|
|
|
codeRel.setYbBzgg(udiProductEntity1.getBzgg());
|
|
|
|
|
codeRelArrayList.add(codeRel);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 上传到多码融合表
|
|
|
|
|
udiContrastService.codeRelUpdateBatch(codeRelArrayList);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// if (IntUtil.value(udiProductEntity1.getPackLevel()) == 1) {
|
|
|
|
|
// calculateDistCount(udiProductEntity1, udiRelevanceEntity);
|
|
|
|
|
// calculateUseCount(udiProductEntity1, udiRelevanceEntity);
|
|
|
|
|
// }
|
|
|
|
|
} else {
|
|
|
|
|
UdiProductEntity udiProductEntity1 = udiProductDao.findByNameCode(updateLevelDrugRequest.getNameCode());
|
|
|
|
|
if (udiProductEntity1 != null) {
|
|
|
|
|
@ -532,8 +411,6 @@ public class UdiProductServiceImpl implements UdiProductService {
|
|
|
|
|
List<UdiProductEntity> udiProductEntities = udiProductDao.findByUuids(udiProductEntity.getUuid());
|
|
|
|
|
CountWrapper xjCountWrapper = new CountWrapper();
|
|
|
|
|
findUltimateEntity(udiProductEntity, udiProductEntities, xjCountWrapper);
|
|
|
|
|
// udiRelevanceEntity.setDistributeLevelDi(udiProductEntity.getNameCode());
|
|
|
|
|
// udiRelevanceEntity.setDistributeLevelUnit(udiProductEntity.getPackUnit());
|
|
|
|
|
udiRelevanceEntity.setDistributeLevel(IntUtil.value(udiProductEntity.getPackLevel()));
|
|
|
|
|
udiRelevanceEntity.setDistributeLevelCount(xjCountWrapper.getCount());
|
|
|
|
|
}
|
|
|
|
|
@ -545,10 +422,7 @@ public class UdiProductServiceImpl implements UdiProductService {
|
|
|
|
|
List<UdiProductEntity> udiProductEntities = udiProductDao.findByUuids(udiProductEntity.getUuid());
|
|
|
|
|
CountWrapper xjCountWrapper = new CountWrapper();
|
|
|
|
|
findUltimateEntity(udiProductEntity, udiProductEntities, xjCountWrapper);
|
|
|
|
|
// udiRelevanceEntity.setUseLevelDi(udiProductEntity.getNameCode());
|
|
|
|
|
// udiRelevanceEntity.setUseLevelUnit(udiProductEntity.getPackUnit());
|
|
|
|
|
udiRelevanceEntity.setUseLevel(IntUtil.value(udiProductEntity.getPackLevel()));
|
|
|
|
|
// udiRelevanceEntity.setUseLeverCount(xjCountWrapper.getCount());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public static UdiProductEntity findUltimateEntity(UdiProductEntity udiProductEntity, List<UdiProductEntity> udiProductEntities, CountWrapper xjCountWrapper) {
|
|
|
|
|
@ -628,23 +502,13 @@ public class UdiProductServiceImpl implements UdiProductService {
|
|
|
|
|
@Resource
|
|
|
|
|
private ThrProductsService thrProductsService;
|
|
|
|
|
@Resource
|
|
|
|
|
private UdiProductService udiProductService;
|
|
|
|
|
@Resource
|
|
|
|
|
private ThirdAliDrugService thirdAliDrugService;
|
|
|
|
|
@Resource
|
|
|
|
|
private YbDrugService ybDrugService;
|
|
|
|
|
@Resource
|
|
|
|
|
private UdiContrastService udiContrastService;
|
|
|
|
|
@Resource
|
|
|
|
|
private UdiRelevanceService udiRelevanceService;
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public BaseResponse saveOrUpadateLevelDrugAli(ThirdAliDrugRequest thirdAliDrugRequest) {
|
|
|
|
|
Integer detailSort = 0;
|
|
|
|
|
// ThirdAliDrug thirdAliDrugServiceOne = thirdAliDrugService.getOne(
|
|
|
|
|
// new QueryWrapper<ThirdAliDrug>().eq("nameCode", thirdAliDrugRequest.getNameCodeRow()).last("limit 1")
|
|
|
|
|
// );
|
|
|
|
|
String str = "";
|
|
|
|
|
List<ThirdAliDrug> thirdAliDrugList = new ArrayList<>();
|
|
|
|
|
thirdAliDrugRequest.setNameCode(thirdAliDrugRequest.getNameCodeRow());
|
|
|
|
|
thirdAliDrugList = udiContrastService.optThirdAliDrug(thirdAliDrugRequest);
|
|
|
|
|
|
qiuyt
1 month ago