diff --git a/src/main/java/com/glxp/api/entity/basic/BasicProductsEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicProductsEntity.java index b0d0df1fd..163882a12 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicProductsEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicProductsEntity.java @@ -340,6 +340,13 @@ public class BasicProductsEntity { @TableField(value = "`createUser`") private String createUser; + + /** + * 包装规格 + */ + @TableField(value = "bzgg") + private String bzgg; + /** * 更新人 */ @@ -349,8 +356,8 @@ public class BasicProductsEntity { @TableField(value = "remark") private String remark; - @TableField(value = "pinyinInitial") - private String pinyinInitial; + @TableField(value = "cphhhbh") + private String cphhhbh; /** * 一级分类名称(学科，品名） @@ -374,23 +381,41 @@ public class BasicProductsEntity { private String catalogname3; /** - * 耗材材质 + * 一级分类名称(学科，品名） */ - @TableField(value = "matrial") - @ApiModelProperty(value="耗材材质") - private String matrial; - + @TableField(value = "catalogcode1") + @ApiModelProperty(value="一级分类名称(学科，品名）") + private Integer catalogcode1; + /** + * 二级分类名称(用途、品目） + */ + @TableField(value = "catalogcode2") + @ApiModelProperty(value="二级分类名称(用途、品目）") + private Integer catalogcode2; /** - * 包装规格 + * 三级分类名称(部位、功能、品种） */ - @TableField(value = "bzgg") - private String bzgg; + @TableField(value = "catalogcode3") + @ApiModelProperty(value="三级分类名称(部位、功能、品种）") + private Integer catalogcode3; + /** + * 是否扫码 + */ @TableField(value = "requireScanCode") private Integer requireScanCode; + /** + * 耗材材质 + */ + @TableField(value = "matrial") + @ApiModelProperty(value="耗材材质") + private String matrial; + + + /** * 产品类型 1:药品 2:耗材 @@ -474,6 +499,13 @@ public class BasicProductsEntity { private Integer medicareType; + @TableField(value = "pinyinInitial") + private String pinyinInitial; + + + @TableField(value = "majorStatus") + private String majorStatus; + @@ -591,6 +623,5 @@ public class BasicProductsEntity { public static final String COL_UPDATEUSER = "updateUser"; public static final String COL_REMARK = "remark"; - public static final String COL_BZGG= "bzgg"; } diff --git a/src/main/java/com/glxp/api/req/basic/AddProductRequest.java b/src/main/java/com/glxp/api/req/basic/AddProductRequest.java index d983b9598..d301295b0 100644 --- a/src/main/java/com/glxp/api/req/basic/AddProductRequest.java +++ b/src/main/java/com/glxp/api/req/basic/AddProductRequest.java @@ -276,6 +276,7 @@ public class AddProductRequest { * 收费编码 */ private String payFeeCode; + private String packUnit; } diff --git a/src/main/java/com/glxp/api/req/inout/FilterReceiveRequest.java b/src/main/java/com/glxp/api/req/inout/FilterReceiveRequest.java index 49394c07c..a3f58e87d 100644 --- a/src/main/java/com/glxp/api/req/inout/FilterReceiveRequest.java +++ b/src/main/java/com/glxp/api/req/inout/FilterReceiveRequest.java @@ -42,7 +42,7 @@ public class FilterReceiveRequest extends ListPageRequest { private String createUser; private Boolean sysApprovalFlow; - private Integer productType; + private Integer productType = 1; } diff --git a/src/main/java/com/glxp/api/req/purchase/PurApplyRequest.java b/src/main/java/com/glxp/api/req/purchase/PurApplyRequest.java index 0e3fc52c4..654240931 100644 --- a/src/main/java/com/glxp/api/req/purchase/PurApplyRequest.java +++ b/src/main/java/com/glxp/api/req/purchase/PurApplyRequest.java @@ -120,6 +120,6 @@ public class PurApplyRequest extends ListPageRequest { /** * 产品类型 1.器械 2.药品 */ - private Integer productType; + private Integer productType = 1; } diff --git a/src/main/java/com/glxp/api/res/basic/UdiRlSupResponse.java b/src/main/java/com/glxp/api/res/basic/UdiRlSupResponse.java index d282aa1ef..ae4a2eeff 100644 --- a/src/main/java/com/glxp/api/res/basic/UdiRlSupResponse.java +++ b/src/main/java/com/glxp/api/res/basic/UdiRlSupResponse.java @@ -121,4 +121,10 @@ public class UdiRlSupResponse { private String matrial; private Integer requireScanCode; + + + private String bzgg; + private String prepnUnit; + private String prepnSpec; + } diff --git a/src/main/java/com/glxp/api/service/basic/UdiProductService.java b/src/main/java/com/glxp/api/service/basic/UdiProductService.java index c86c46f04..3f6cdf1a1 100644 --- a/src/main/java/com/glxp/api/service/basic/UdiProductService.java +++ b/src/main/java/com/glxp/api/service/basic/UdiProductService.java @@ -297,8 +297,14 @@ public class UdiProductService { throw new JsonException(500, "层级编码已存在！"); } UdiProductEntity udiProductEntity = new UdiProductEntity(); - BeanUtils.copyProperties(updateLevelDrugRequest, udiProductEntity); +// BeanUtils.copyProperties(updateLevelDrugRequest, udiProductEntity); + BeanUtils.copyProperties(addProductRequest, udiProductEntity); + udiProductEntity.setNameCode(updateLevelDrugRequest.getNameCode()); + udiProductEntity.setBhxjsl(updateLevelDrugRequest.getBhxjsl()); + udiProductEntity.setPackUnit(updateLevelDrugRequest.getPackUnit()); + udiProductEntity.setSjcpbm(updateLevelDrugRequest.getSjcpbm()); udiProductEntity.setCpmctymc(addProductRequest.getCpmctymc()); + udiProductEntity.setPackLevel(String.valueOf(updateLevelDrugRequest.getPackLevel())); udiProductEntity.setUuid(udiRelevanceEntity.getUuid()); udiProductEntity.setProductsType(2); udiProductEntity.setGgxh(addProductRequest.getSpec()); diff --git a/src/main/java/com/glxp/api/service/sync/HeartService.java b/src/main/java/com/glxp/api/service/sync/HeartService.java index 34521a651..263950d0a 100644 --- a/src/main/java/com/glxp/api/service/sync/HeartService.java +++ b/src/main/java/com/glxp/api/service/sync/HeartService.java @@ -1707,7 +1707,6 @@ public class HeartService { Integer code = obj.getInt("code"); if (!code.equals(20000)) { log.error("从UDI自助平台拉取数据错误，报文-----{}", data); - log.error("打印出来{}",exportType); return; } //数据内容 @@ -1941,18 +1940,14 @@ public class HeartService { */ @Transactional(propagation = Propagation.NESTED) public void insertDeviceInfoData(String content) { - log.error("这个是什么{}",content); cn.hutool.json.JSONObject jsonObject = JSONUtil.parseObj(content); List deviceInfoEntities = JSONUtil.toList(jsonObject.getJSONArray(DeviceInfoEntity.class.getSimpleName()), DeviceInfoEntity.class); - log.error("shebei jichu 数据 到底是什么{}",deviceInfoEntities); if (CollectionUtil.isNotEmpty(deviceInfoEntities)) { for (DeviceInfoEntity deviceInfoEntity : deviceInfoEntities) { deviceInfoEntity.setUpdateTime(null); } - log.error("hahahhahhahahah woyao fengle{}",deviceInfoEntities); boolean b = deviceInfoMapper.replaceBatchs(deviceInfoEntities); if (b == false){ - log.error("差距自己找，头像右上角"); } } List syncFiles = JSONUtil.toList(jsonObject.getJSONArray("syncFiles"), String.class); diff --git a/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml index 305f53234..2c57bfcff 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml @@ -105,11 +105,14 @@ basic_products.basicPrductRemak7, basic_products.basicPrductRemak8, basic_corp.name companyName, - basic_products.catalogname1, - basic_products.catalogname2, - basic_products.catalogname3, - basic_products.requireScanCode, - basic_products.matrial + basic_products.catalogname1, + basic_products.catalogname2, + basic_products.catalogname3, + basic_products.requireScanCode, + basic_products.bzgg, + basic_products.prepnUnit, + basic_products.prepnSpec, + basic_products.matrial FROM company_product_relevance inner JOIN basic_udirel ON company_product_relevance.udiRlIdFk = basic_udirel.id diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index e2fa3b3b3..ce8045b88 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/src/main/resources/schemas/schema_v2.4.sql @@ -4123,3 +4123,5 @@ CALL Pro_Temp_ColumnWork('basic_sk_prescribe_item_detail', 'tagStatus', CALL Pro_Temp_ColumnWork('basic_sk_prescribe_item_detail', 'tagMsg', 'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''处方赋码错误信息''', 1); + +CALL Pro_Temp_ColumnWork('basic_products', 'cphhhbh', 'varchar(255)', 1);