第三方产品信息对应字段修改

src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java

@@ -250,12 +250,11 @@ public class CtqyyClient extends CommonHttpClient {
                     ThrProductsEntity products = new ThrProductsEntity();
                     products.setCode(dict.getPHYSIC_CODE());
                     products.setName(dict.getPHYSIC_NAME());
-                    products.setMeasname(dict.getPHYSIC_UNIT());
-                    products.setSpec(dict.getPHYSIC_SPEC());
+                    products.setMeasname(dict.getPACK_UNIT());
+                    products.setSpec(dict.getPACK_SPEC());
                     products.setYbbm(dict.getCOUNTRY_CODE());
-//                    todo  少了制剂规格，制剂单位  dict.getPHYSIC_SPEC()
-//                    dict.getPHYSIC_UNIT()
-//                    products.setRegisterNo(dict.getPHYSIC_NO());
+                    products.setPrepnSpec(dict.getPHYSIC_SPEC());
+                    products.setPrepnUnit(dict.getPHYSIC_UNIT());
                     products.setProductType(2);
                     return products;
                 }).collect(Collectors.toList());
@@ -1366,7 +1365,7 @@ public class CtqyyClient extends CommonHttpClient {
     public BaseResponse getPrescribes(UdiwmsBasicSkPrescribeRequest udiwmsBasicSkPrescribeRequest) {
         LambdaQueryWrapper<VYpzsPresInfo> wrapper = new LambdaQueryWrapper<>();
         String code = udiwmsBasicSkPrescribeRequest.getCode();
-        wrapper.and(StrUtil.isNotEmpty(code),t -> t.eq(VYpzsPresInfo::getSTOOUT_NO, code).or().eq(VYpzsPresInfo::getPRESCRIBE_NUMBER, code));
+        wrapper.and(StrUtil.isNotEmpty(code), t -> t.eq(VYpzsPresInfo::getSTOOUT_NO, code).or().eq(VYpzsPresInfo::getPRESCRIBE_NUMBER, code));
         //补充其他查询条件
         IPage<VYpzsPresInfo> page = vYpzsPresInfoMapper
                 .selectPage(new Page<VYpzsPresInfo>(udiwmsBasicSkPrescribeRequest.getPage(), udiwmsBasicSkPrescribeRequest.getLimit()), wrapper);
@@ -1539,7 +1538,7 @@ public class CtqyyClient extends CommonHttpClient {
                     BasicUdirelEntity basicUdirelEntity = basicUdirelDao.selectOne(new LambdaQueryWrapper<BasicUdirelEntity>().eq(BasicUdirelEntity::getMainId, entity.getPHYSIC_CODE()));
                     if (basicUdirelEntity != null) {
                         collectOrderBiz.setRelId(basicUdirelEntity.getId());
-                    }else {
+                    } else {
                         errorMsg.append(entity.getPHYSIC_NAME()).append("字典未对照").append(";");
                     }
                     collectOrderBiz.setThrCode(entity.getPHYSIC_CODE());
@@ -1553,7 +1552,7 @@ public class CtqyyClient extends CommonHttpClient {
                     collectOrderBiz.setUnTagCount(0);
                     bizList.add(collectOrderBiz);
                 });
-                if(StrUtil.isNotBlank(errorMsg)){
+                if (StrUtil.isNotBlank(errorMsg)) {
                     ioCollectOrder.setErrorMsg(errorMsg.toString());
                     ioCollectOrder.setTagStatus(4);
                 }

src/main/java/com/glxp/mipsdl/entity/thrsys/ThrProductsEntity.java

@@ -198,5 +198,16 @@ public class ThrProductsEntity extends Model<ThrProductsEntity> {
 
     @TableField("productType")
     private Integer productType;
+    /**
+     * 制剂规格
+     */
+    @TableField(value = "prepnSpec")
+    private String prepnSpec;
+
+    /**
+     * 制剂规格
+     */
+    @TableField(value = "prepnUnit")
+    private String prepnUnit;
 
 }