|
@@ -3,12 +3,10 @@ package com.diagbot.facade;
|
|
|
import com.diagbot.biz.push.entity.Item;
|
|
|
import com.diagbot.biz.push.entity.Lis;
|
|
|
import com.diagbot.biz.push.entity.Pacs;
|
|
|
-import com.diagbot.dto.BillMsg;
|
|
|
import com.diagbot.dto.BillNeoDTO;
|
|
|
import com.diagbot.dto.IndicationDTO;
|
|
|
import com.diagbot.dto.WordCrfDTO;
|
|
|
import com.diagbot.process.BillProcess;
|
|
|
-import com.diagbot.util.ListUtil;
|
|
|
import com.diagbot.util.StringUtil;
|
|
|
import com.diagbot.vo.BillNeoVO;
|
|
|
import com.diagbot.vo.Drug;
|
|
@@ -17,8 +15,6 @@ import com.diagbot.vo.ItemExt;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Component;
|
|
|
|
|
|
-import java.util.ArrayList;
|
|
|
-import java.util.Iterator;
|
|
|
import java.util.List;
|
|
|
|
|
|
/**
|
|
@@ -50,28 +46,7 @@ public class BillFacade {
|
|
|
billProcess.process(billNeoDTOList, wordCrfDTO, res);
|
|
|
|
|
|
// 结果去重处理
|
|
|
- dealMsg(res);
|
|
|
- }
|
|
|
-
|
|
|
-
|
|
|
- /**
|
|
|
- * 提示信息去重
|
|
|
- * @param indicationDTO
|
|
|
- */
|
|
|
- public void dealMsg(IndicationDTO indicationDTO) {
|
|
|
- List<BillMsg> billMsgList = indicationDTO.getBillMsgList();
|
|
|
- if (ListUtil.isNotEmpty(billMsgList)) {
|
|
|
- List<String> msgList = new ArrayList<>();
|
|
|
- Iterator<BillMsg> it = billMsgList.iterator();
|
|
|
- while (it.hasNext()) {
|
|
|
- String msg = it.next().getMsg();
|
|
|
- if (msgList.contains(msg)) {
|
|
|
- it.remove();
|
|
|
- } else {
|
|
|
- msgList.add(msg);
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
+ commonFacade.dealMsg(res.getBillMsgList());
|
|
|
}
|
|
|
|
|
|
public BillNeoVO fillBillNeo(WordCrfDTO wordCrfDTO) {
|