Commit 373eac38 by zhu.zewen

修复阿里码上放心接口返回数据

parent fcd3258d
...@@ -34,29 +34,32 @@ public class AlihealthService { ...@@ -34,29 +34,32 @@ public class AlihealthService {
AlibabaAlihealthDrugtraceTopYljgQueryCodedetailResponse.ResultModel result = rsp.getResult(); AlibabaAlihealthDrugtraceTopYljgQueryCodedetailResponse.ResultModel result = rsp.getResult();
// List<AlibabaAlihealthDrugtraceTopYljgQueryCodedetailResponse.CodeFullInfoDto> models = result.getModels(); // List<AlibabaAlihealthDrugtraceTopYljgQueryCodedetailResponse.CodeFullInfoDto> models = result.getModels();
List<AlibabaAlihealthDrugtraceTopYljgQueryCodedetailResponse.CodeFullInfoDto> models = result.getModels(); List<AlibabaAlihealthDrugtraceTopYljgQueryCodedetailResponse.CodeFullInfoDto> models = result.getModels();
if(ObjectUtil.isEmpty(models)) { if (ObjectUtil.isEmpty(models)) {
throw new ServiceException("药品信息不存在"); throw new ServiceException("药品信息不存在");
} }
AlibabaAlihealthDrugtraceTopYljgQueryCodedetailResponse.CodeFullInfoDto codeFullInfoDto = models.get(0); AlibabaAlihealthDrugtraceTopYljgQueryCodedetailResponse.CodeFullInfoDto codeFullInfoDto = models.get(0);
AlibabaAlihealthDrugtraceTopYljgQueryCodedetailResponse.CodeProduceInfoDto codeProduceInfoDTO = codeFullInfoDto.getCodeProduceInfoDTO(); AlibabaAlihealthDrugtraceTopYljgQueryCodedetailResponse.CodeProduceInfoDto codeProduceInfoDTO = codeFullInfoDto.getCodeProduceInfoDTO();
List<AlibabaAlihealthDrugtraceTopYljgQueryCodedetailResponse.ProduceInfoDto> produceInfoList = codeProduceInfoDTO.getProduceInfoList(); List<AlibabaAlihealthDrugtraceTopYljgQueryCodedetailResponse.ProduceInfoDto> produceInfoList = codeProduceInfoDTO.getProduceInfoList();
if(ObjectUtil.isNotEmpty(produceInfoList)){ if (ObjectUtil.isNotEmpty(produceInfoList)) {
AlibabaAlihealthDrugtraceTopYljgQueryCodedetailResponse.ProduceInfoDto produceInfoDto = produceInfoList.get(0); AlibabaAlihealthDrugtraceTopYljgQueryCodedetailResponse.ProduceInfoDto produceInfoDto = produceInfoList.get(0);
physicInfoDTO.setBatchNo(produceInfoDto.getBatchNo()); physicInfoDTO.setBatchNo(produceInfoDto.getBatchNo());
physicInfoDTO.setProductionDate(produceInfoDto.getProduceDateStr());
physicInfoDTO.setExprieDate(produceInfoDto.getExpireDate()); physicInfoDTO.setExprieDate(produceInfoDto.getExpireDate());
} }
//药品信息 //药品信息
AlibabaAlihealthDrugtraceTopYljgQueryCodedetailResponse.DrugEntBaseDto drugEntBaseDTO = codeFullInfoDto.getDrugEntBaseDTO(); AlibabaAlihealthDrugtraceTopYljgQueryCodedetailResponse.DrugEntBaseDto drugEntBaseDTO = codeFullInfoDto.getDrugEntBaseDTO();
physicInfoDTO.setPhysicName(drugEntBaseDTO.getPhysicName()); physicInfoDTO.setPhysicName(drugEntBaseDTO.getPhysicName());
physicInfoDTO.setPhysicTypeDesc(drugEntBaseDTO.getPhysicTypeDesc()); physicInfoDTO.setPhysicSpec(drugEntBaseDTO.getPrepnSpec());
physicInfoDTO.setPkgSpecCrit(drugEntBaseDTO.getPkgSpecCrit()); physicInfoDTO.setPhysicType(drugEntBaseDTO.getPrepnTypeDesc());
physicInfoDTO.setUnit(drugEntBaseDTO.getPkgSpecCrit());
physicInfoDTO.setPrepnSpec(drugEntBaseDTO.getPrepnSpec()); physicInfoDTO.setPrepnSpec(drugEntBaseDTO.getPrepnSpec());
physicInfoDTO.setPkgSpecCrit(drugEntBaseDTO.getPkgSpecCrit());
physicInfoDTO.setPhysicTypeDesc(drugEntBaseDTO.getPhysicTypeDesc());
physicInfoDTO.setPrepnTypeDesc(drugEntBaseDTO.getPrepnTypeDesc()); physicInfoDTO.setPrepnTypeDesc(drugEntBaseDTO.getPrepnTypeDesc());
//厂家信息 //厂家信息
AlibabaAlihealthDrugtraceTopYljgQueryCodedetailResponse.PUserEntDto pUserEntDto = codeFullInfoDto.getpUserEntDTO(); AlibabaAlihealthDrugtraceTopYljgQueryCodedetailResponse.PUserEntDto pUserEntDto = codeFullInfoDto.getpUserEntDTO();
physicInfoDTO.setFactoryName(pUserEntDto.getEntName()); physicInfoDTO.setFactoryName(pUserEntDto.getEntName());
return physicInfoDTO; return physicInfoDTO;
} }
} }
...@@ -7,21 +7,25 @@ import lombok.Data; ...@@ -7,21 +7,25 @@ import lombok.Data;
public class PhysicInfoDTO { public class PhysicInfoDTO {
@ApiModelProperty(value = "药品名称") @ApiModelProperty(value = "药品名称")
private String physicName; private String physicName;
@ApiModelProperty(value = "规格")
private String prepnSpec;
@ApiModelProperty(value = "药品类型") @ApiModelProperty(value = "药品类型")
private String physicType; private String physicType;
@ApiModelProperty(value = "规格")
private String physicSpec;
@ApiModelProperty(value = "单位") @ApiModelProperty(value = "单位")
private String unit; private String unit;
@ApiModelProperty(value = "厂家名称") @ApiModelProperty(value = "厂家名称")
private String factoryName; private String factoryName;
@ApiModelProperty(value = "生产时间")
private String productionDate;
@ApiModelProperty(value = "失效时间") @ApiModelProperty(value = "失效时间")
private String exprieDate; private String exprieDate;
@ApiModelProperty(value = "药品类型描述") @ApiModelProperty(value = "规格")
private String physicTypeDesc; private String prepnSpec;
@ApiModelProperty(value = "包装规格") @ApiModelProperty(value = "包装规格")
private String pkgSpecCrit; private String pkgSpecCrit;
@ApiModelProperty(value = "药品类型描述")
private String physicTypeDesc;
@ApiModelProperty(value = "制剂类型描述") @ApiModelProperty(value = "制剂类型描述")
private String prepnTypeDesc; private String prepnTypeDesc;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment