|
@@ -137,7 +137,7 @@ public class DrugManagementFacade {
|
|
|
|
|
|
DrugInfo drugInfo = new DrugInfo();
|
|
|
BeanUtils.copyProperties(matchingDrugVO, drugInfo);
|
|
|
- drugInfo.setStandard(matchingDrugVO.getStandard() + "_" + matchingDrugVO.getForm());
|
|
|
+ drugInfo.setStandard(matchingDrugVO.getStandard() + "_" + matchingDrugVO.getDosageForm());
|
|
|
return drugInfoFacade.updateById(drugInfo);
|
|
|
}
|
|
|
|
|
@@ -167,7 +167,7 @@ public class DrugManagementFacade {
|
|
|
temp.stream().forEach(importDrugVO -> {
|
|
|
DrugInfo drugInfo = new DrugInfo();
|
|
|
BeanUtils.copyProperties(importDrugVO, drugInfo);
|
|
|
- drugInfo.setStandard(importDrugVO.getStandard() + "_" + importDrugVO.getForm());
|
|
|
+ drugInfo.setStandard(importDrugVO.getStandard() + "_" + importDrugVO.getDosageForm());
|
|
|
});
|
|
|
List<DrugInfo> insert = BeanUtil.listCopyTo(temp, DrugInfo.class);
|
|
|
insert.stream().forEach(drugInfo -> {
|
|
@@ -264,7 +264,7 @@ public class DrugManagementFacade {
|
|
|
IPage<GetMatchingDrugPageDTO> drugPages = drugInfoServiceImpl.getBaseMapper().getMatchingDrugPage(getMatchingDrugPageVO);
|
|
|
for (GetMatchingDrugPageDTO drug : drugPages.getRecords()) {
|
|
|
//目前先按照_切割
|
|
|
- drug.setForm(drug.getStandard().split("_")[1]);
|
|
|
+ drug.setDosageForm(drug.getStandard().split("_")[1]);
|
|
|
getMatchingDrugPageDTOList.add(drug);
|
|
|
}
|
|
|
return drugPages.setRecords(getMatchingDrugPageDTOList);
|
|
@@ -279,6 +279,8 @@ public class DrugManagementFacade {
|
|
|
public GetDrugByIdDTO getDrugById(GetDrugByIdVO getDrugByIdVO) {
|
|
|
GetDrugByIdDTO out = new GetDrugByIdDTO();
|
|
|
BeanUtil.copyProperties(drugInfoFacade.getById(getDrugByIdVO.getId()), out);
|
|
|
+ //目前先按照_切割
|
|
|
+ out.setDosageForm(out.getStandard().split("_")[1]);
|
|
|
out.setIsMapping(StringUtil.isBlank(out.getStandard()) ? "未匹配" : "已匹配");
|
|
|
return out;
|
|
|
}
|