From c0b983fdf8108eff08ac845d80afa17112f0b4a7 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Tue, 3 Dec 2024 17:18:44 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=8C=BB=E4=BF=9D?=
 =?UTF-8?q?=E8=A7=A3=E6=9E=90=E5=85=BC=E5=AE=B9=E8=AF=95=E5=89=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../glxp/api/service/basic/impl/UdiProductServiceImpl.java  | 6 +++---
 .../api/service/thrsys/impl/ThrProductsAddDiService.java    | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java
index 7f9968bf..b04f6b2d 100644
--- a/src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java
@@ -118,7 +118,7 @@ public class UdiProductServiceImpl implements UdiProductService {
 
         //医保编码解析
         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 catalogcode2 = Integer.valueOf(catalogcode1 + catalogcode.substring(3, 5));
             Integer catalogcode3 = Integer.valueOf(catalogcode2 + catalogcode.substring(5, 7));
@@ -150,7 +150,7 @@ public class UdiProductServiceImpl implements UdiProductService {
         udiProductEntity.setUpdateTime(new Date());
         //医保编码解析
         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 catalogcode2 = Integer.valueOf(catalogcode1 + catalogcode.substring(3, 5));
             Integer catalogcode3 = Integer.valueOf(catalogcode2 + catalogcode.substring(5, 7));
@@ -166,7 +166,7 @@ public class UdiProductServiceImpl implements UdiProductService {
         udiProductEntity.setUpdateTime(new Date());
         //医保编码解析
         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 catalogcode2 = Integer.valueOf(catalogcode1 + catalogcode.substring(3, 5));
             Integer catalogcode3 = Integer.valueOf(catalogcode2 + catalogcode.substring(5, 7));
diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiService.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiService.java
index 86a4887e..dfd8b907 100644
--- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiService.java
+++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiService.java
@@ -153,7 +153,7 @@ public class ThrProductsAddDiService extends ServiceImpl<ThrProductsAddDiDao, Th
             thrProductsAddDiEntity.setSelectThridSysStr(JSONUtil.toJsonStr(thrDiProductsRequest.getSelectThirdSys()));
             //医保编码解析
             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 catalogcode2 = Integer.valueOf(catalogcode1 + catalogcode.substring(3, 5));
                 Integer catalogcode3 = Integer.valueOf(catalogcode2 + catalogcode.substring(5, 7));
@@ -334,7 +334,7 @@ public class ThrProductsAddDiService extends ServiceImpl<ThrProductsAddDiDao, Th
                     //医保编码解析
                     String catalogcode = 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 catalogcode2 = Integer.valueOf(catalogcode1 + catalogcode.substring(3, 5));
                         Integer catalogcode3 = Integer.valueOf(catalogcode2 + catalogcode.substring(5, 7));