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

fix: 修复医保解析兼容试剂

Browse Source
dev_ksck_axxyy
chenhc 7 months ago
parent 4cc8baa5f5
commit c0b983fdf8
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File

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

@ -118,7 +118,7 @@ public class UdiProductServiceImpl implements UdiProductService {
//医保编码解析 //医保编码解析
String catalogcode = udiProductEntity.getCatalogcode(); String catalogcode = udiProductEntity.getCatalogcode();
if (StrUtil.isNotEmpty(catalogcode) && catalogcode.length() >= 7) { if (StrUtil.isNotEmpty(catalogcode) && catalogcode.length() >= 7 && !catalogcode.contains("CJ")) {
Integer catalogcode1 = Integer.valueOf(catalogcode.substring(1, 3)); Integer catalogcode1 = Integer.valueOf(catalogcode.substring(1, 3));
Integer catalogcode2 = Integer.valueOf(catalogcode1 + catalogcode.substring(3, 5)); Integer catalogcode2 = Integer.valueOf(catalogcode1 + catalogcode.substring(3, 5));
Integer catalogcode3 = Integer.valueOf(catalogcode2 + catalogcode.substring(5, 7)); Integer catalogcode3 = Integer.valueOf(catalogcode2 + catalogcode.substring(5, 7));
@ -150,7 +150,7 @@ public class UdiProductServiceImpl implements UdiProductService {
udiProductEntity.setUpdateTime(new Date()); udiProductEntity.setUpdateTime(new Date());
//医保编码解析 //医保编码解析
String catalogcode = udiProductEntity.getCatalogcode(); String catalogcode = udiProductEntity.getCatalogcode();
if (StrUtil.isNotEmpty(catalogcode) && catalogcode.length() >= 7) { if (StrUtil.isNotEmpty(catalogcode) && catalogcode.length() >= 7 && !catalogcode.contains("CJ")) {
Integer catalogcode1 = Integer.valueOf(catalogcode.substring(1, 3)); Integer catalogcode1 = Integer.valueOf(catalogcode.substring(1, 3));
Integer catalogcode2 = Integer.valueOf(catalogcode1 + catalogcode.substring(3, 5)); Integer catalogcode2 = Integer.valueOf(catalogcode1 + catalogcode.substring(3, 5));
Integer catalogcode3 = Integer.valueOf(catalogcode2 + catalogcode.substring(5, 7)); Integer catalogcode3 = Integer.valueOf(catalogcode2 + catalogcode.substring(5, 7));
@ -166,7 +166,7 @@ public class UdiProductServiceImpl implements UdiProductService {
udiProductEntity.setUpdateTime(new Date()); udiProductEntity.setUpdateTime(new Date());
//医保编码解析 //医保编码解析
String catalogcode = udiProductEntity.getCatalogcode(); String catalogcode = udiProductEntity.getCatalogcode();
if (StrUtil.isNotEmpty(catalogcode) && catalogcode.length() >= 7) { if (StrUtil.isNotEmpty(catalogcode) && catalogcode.length() >= 7 && !catalogcode.contains("CJ")) {
Integer catalogcode1 = Integer.valueOf(catalogcode.substring(1, 3)); Integer catalogcode1 = Integer.valueOf(catalogcode.substring(1, 3));
Integer catalogcode2 = Integer.valueOf(catalogcode1 + catalogcode.substring(3, 5)); Integer catalogcode2 = Integer.valueOf(catalogcode1 + catalogcode.substring(3, 5));
Integer catalogcode3 = Integer.valueOf(catalogcode2 + catalogcode.substring(5, 7)); Integer catalogcode3 = Integer.valueOf(catalogcode2 + catalogcode.substring(5, 7));

4
src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiService.java
Unescape Escape View File

@ -153,7 +153,7 @@ public class ThrProductsAddDiService extends ServiceImpl<ThrProductsAddDiDao, Th
thrProductsAddDiEntity.setSelectThridSysStr(JSONUtil.toJsonStr(thrDiProductsRequest.getSelectThirdSys())); thrProductsAddDiEntity.setSelectThridSysStr(JSONUtil.toJsonStr(thrDiProductsRequest.getSelectThirdSys()));
//医保编码解析 //医保编码解析
String catalogcode = thrDiProductsRequest.getCatalogcode(); String catalogcode = thrDiProductsRequest.getCatalogcode();
if (StrUtil.isNotEmpty(catalogcode) && catalogcode.length() >= 7) { if (StrUtil.isNotEmpty(catalogcode) && catalogcode.length() >= 7 && !catalogcode.contains("CJ")) {
Integer catalogcode1 = Integer.valueOf(catalogcode.substring(1, 3)); Integer catalogcode1 = Integer.valueOf(catalogcode.substring(1, 3));
Integer catalogcode2 = Integer.valueOf(catalogcode1 + catalogcode.substring(3, 5)); Integer catalogcode2 = Integer.valueOf(catalogcode1 + catalogcode.substring(3, 5));
Integer catalogcode3 = Integer.valueOf(catalogcode2 + catalogcode.substring(5, 7)); Integer catalogcode3 = Integer.valueOf(catalogcode2 + catalogcode.substring(5, 7));
@ -334,7 +334,7 @@ public class ThrProductsAddDiService extends ServiceImpl<ThrProductsAddDiDao, Th
//医保编码解析 //医保编码解析
String catalogcode = excelVo.getYbbm(); String catalogcode = excelVo.getYbbm();
thrProductsAdddiEntity.setYbbm(excelVo.getYbbm()); thrProductsAdddiEntity.setYbbm(excelVo.getYbbm());
if (StrUtil.isNotEmpty(catalogcode) && catalogcode.length() >= 7) { if (StrUtil.isNotEmpty(catalogcode) && catalogcode.length() >= 7 && !catalogcode.contains("CJ")) {
Integer catalogcode1 = Integer.valueOf(catalogcode.substring(1, 3)); Integer catalogcode1 = Integer.valueOf(catalogcode.substring(1, 3));
Integer catalogcode2 = Integer.valueOf(catalogcode1 + catalogcode.substring(3, 5)); Integer catalogcode2 = Integer.valueOf(catalogcode1 + catalogcode.substring(3, 5));
Integer catalogcode3 = Integer.valueOf(catalogcode2 + catalogcode.substring(5, 7)); Integer catalogcode3 = Integer.valueOf(catalogcode2 + catalogcode.substring(5, 7));

Write Preview
Loading…
Cancel
Save