|
@@ -16,6 +16,7 @@ import com.diagbot.enums.LexiconTypeEnum;
|
|
|
import com.diagbot.exception.CommonErrorCode;
|
|
|
import com.diagbot.exception.CommonException;
|
|
|
import com.diagbot.util.ListUtil;
|
|
|
+import com.diagbot.util.StringUtil;
|
|
|
import com.diagbot.vo.ConceptBaseVO;
|
|
|
import com.google.common.collect.Lists;
|
|
|
import io.github.lvyahui8.spring.aggregate.facade.DataBeanAggregateQueryFacade;
|
|
@@ -105,9 +106,24 @@ public class TreatmentFacade {
|
|
|
.map(m -> m.getMedicitionName())
|
|
|
.collect(Collectors.toList());
|
|
|
conceptNameList.addAll(drugNameList);
|
|
|
+ } else {
|
|
|
+ if(StringUtil.isBlank(meditionDetail.getDescription())) {
|
|
|
+ meditionDetailList.remove(meditionDetail);
|
|
|
+ meditionDetailList.size();
|
|
|
+ if (meditionDetailList.size() == 0) {
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ if (ListUtil.isEmpty(meditionDetailList)) {
|
|
|
+ treatmentPlanList.remove(treatmentPlan);
|
|
|
+ treatmentPlanList.size();
|
|
|
+ if (treatmentPlanList.size() == 0) {
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
if (ListUtil.isNotEmpty(adverseReactionList)) {
|