Merge branch 'dev_drug' of http://116.204.71.86:3000/UDI/udi-spms-java into dev_drug

src/main/java/com/glxp/api/req/thrsys/AddThrDiProductsRequest.java

@@ -99,5 +99,6 @@ public class AddThrDiProductsRequest {
 
     private Integer sourceType;
 
+    private Integer productsType;
 
 }

src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiService.java

@@ -151,16 +151,36 @@ public class ThrProductsAddDiService extends ServiceImpl<ThrProductsAddDiDao, Th
             thrProductsAddDiEntity.setUpdateTime(new Date());
             thrProductsAddDiEntity.setStatus(1); //..
             thrProductsAddDiEntity.setSelectThridSysStr(JSONUtil.toJsonStr(thrDiProductsRequest.getSelectThirdSys()));
+            if (thrDiProductsRequest.getProductsType() == null){
+                thrProductsAddDiEntity.setProductsType(2);
+            }else {
+                thrProductsAddDiEntity.setProductsType(thrDiProductsRequest.getProductsType());
+            }
+
             //医保编码解析
             String catalogcode = thrDiProductsRequest.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));
-                thrProductsAddDiEntity.setCatalogCode1(catalogcode1);
-                thrProductsAddDiEntity.setCatalogCode2(catalogcode2);
-                thrProductsAddDiEntity.setCatalogCode3(catalogcode3);
+
+            try {
+                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));
+                    thrProductsAddDiEntity.setCatalogCode1(catalogcode1);
+                    thrProductsAddDiEntity.setCatalogCode2(catalogcode2);
+                    thrProductsAddDiEntity.setCatalogCode3(catalogcode3);
+                }
+            } catch (Exception e) {
+
+
             }
+//            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));
+//                thrProductsAddDiEntity.setCatalogCode1(catalogcode1);
+//                thrProductsAddDiEntity.setCatalogCode2(catalogcode2);
+//                thrProductsAddDiEntity.setCatalogCode3(catalogcode3);
+//            }
             String internalMaterialCode = this.getInternalMaterialCode("10","66");
             thrProductsAddDiEntity.setInternalMaterialCode(internalMaterialCode);
             list.add(thrProductsAddDiEntity);

src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDiDao.xml

@@ -25,7 +25,7 @@
                                                 catalogCode1,
                                                 catalogCode2,
                                                 catalogCode3,
-                                                matrial, addStatus)
+                                                matrial, addStatus,productsType)
                 values
         <foreach collection="list" index="index" item="item" separator=",">
             (#{item.uuid},
@@ -58,7 +58,7 @@
              #{item.catalogCode1},
              #{item.catalogCode2},
              #{item.catalogCode3},
-             #{item.matrial}, #{item.addStatus})
+             #{item.matrial}, #{item.addStatus},#{item.productsType})
         </foreach>
     </insert>