|
|
@@ -422,6 +422,7 @@ public class LocalBusClinicService extends BaseService<BusClinicMapper, BusClini
|
|
|
if(ObjectUtil.isNotEmpty(record.getFormula())){
|
|
|
List<FormulaDrugDetailDomain> detail = record.getFormula().getDetail();
|
|
|
if(CollectionUtil.isNotEmpty(detail)){
|
|
|
+ String content="";
|
|
|
for (FormulaDrugDetailDomain drug : detail) {
|
|
|
//根据药液剩余量计算药品残余量
|
|
|
if(StrUtil.isEmpty(drug.getDose())|| !NumberUtil.isNumber(drug.getDose()) ||ObjectUtil.equals(record.getRemainDose(), BigDecimal.ZERO)){
|
|
|
@@ -434,6 +435,9 @@ public class LocalBusClinicService extends BaseService<BusClinicMapper, BusClini
|
|
|
}
|
|
|
drug.setDose(drug.getDose()+drug.getUnit());
|
|
|
}
|
|
|
+ record.getFormula().setName( detail.stream()
|
|
|
+ .map(FormulaDrugDetailDomain::getDose)
|
|
|
+ .collect(Collectors.joining("+")));
|
|
|
}
|
|
|
}
|
|
|
}
|