Merge remote-tracking branch 'origin/dev_drug' into dev_drug

src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java

@@ -237,6 +237,10 @@ public class ThrProductsAddDiController {
                     udiProductEntity.setCatalogname3(thrProductsAddDiEntity.getCatalogname3());
                     udiProductEntity.setMatrial(thrProductsAddDiEntity.getMatrial());
                     udiProductEntity.setDiType(1);
+                    if (thrProductsAddDiEntity.getProductsType() != null){
+                        udiProductEntity.setProductsType(thrProductsAddDiEntity.getProductsType());
+                    }
+
 
                     BeanUtil.copyProperties(udiProductEntity, udiRelevanceEntity);
                     udiRelevanceEntity.setGroupBuy(thrProductsAddDiEntity.getGroupBuy());

src/main/java/com/glxp/api/entity/basic/BasicProductsEntity.java

@@ -549,6 +549,8 @@ public class BasicProductsEntity {
     @TableField(value = "xjdw")
     private String xjdw;
 
+    @TableField(value = "detailSort")
+    private Integer detailSort;
 
 
 

src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java

@@ -245,6 +245,7 @@ public class UdiRelevanceResponse {
     private Integer useLeverCount;
     private String payFeeCode;
 
+
     /**
      * 当前层级包含流通层级使用数量
      */

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

@@ -157,10 +157,9 @@ public class ThrProductsAddDiService extends ServiceImpl<ThrProductsAddDiDao, Th
                 thrProductsAddDiEntity.setProductsType(thrDiProductsRequest.getProductsType());
             }
 
-            //医保编码解析
-            String catalogcode = thrDiProductsRequest.getCatalogcode();
-
             try {
+                //医保编码解析
+                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));

src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml

@@ -84,7 +84,7 @@
             </if>
             <if test="batchNo != null and batchNo != ''">
                 AND a2.batchNo like concat('%', #{batchNo}, '%')
-            </if>ggxh
+            </if>
             <if test="cpmctymc != null and cpmctymc != ''">
                 AND bp.cpmctymc like concat('%', #{cpmctymc}, '%')
             </if>