Browse Source

化验bug

zhoutg 4 năm trước cách đây
mục cha
commit
cb4c177af9

+ 2 - 2
src/main/java/com/diagbot/facade/CommonFacade.java

@@ -253,8 +253,8 @@ public class CommonFacade {
         CoreUtil.setPropertyList(wordCrfDTO.getDrugOrder(),"name", "uniqueName", map.get(StandConvertEnum.drug.toString()));
         CoreUtil.setPropertyList(wordCrfDTO.getDrugOrder(),"name", "uniqueName", map.get(StandConvertEnum.drug.toString()));
         CoreUtil.setPropertyList(wordCrfDTO.getDrug(),"name", "uniqueName", map.get(StandConvertEnum.drug.toString()));
         CoreUtil.setPropertyList(wordCrfDTO.getDrug(),"name", "uniqueName", map.get(StandConvertEnum.drug.toString()));
         //化验回填
         //化验回填
-        CoreUtil.setPropertyList(lis, "name", "detailName", "uniqueName", map.get(StandConvertEnum.lis.toString()));
-        CoreUtil.setPropertyList(wordCrfDTO.getLisOrder(), "name", "detailName", "uniqueName", map.get(StandConvertEnum.lis.toString()));
+        CoreUtil.setPropertyList(lis,"detailName", "uniqueName", map.get(StandConvertEnum.lis.toString()));
+        CoreUtil.setPropertyList(wordCrfDTO.getLisOrder(), "name", "uniqueName", map.get(StandConvertEnum.lis.toString()));
         //辅助检查回填
         //辅助检查回填
         CoreUtil.setPropertyList(pacsList, "name", "uniqueName", map.get(StandConvertEnum.pacs.toString()));
         CoreUtil.setPropertyList(pacsList, "name", "uniqueName", map.get(StandConvertEnum.pacs.toString()));
         CoreUtil.setPropertyList(wordCrfDTO.getPacs(), "name", "uniqueName", map.get(StandConvertEnum.pacs.toString()));
         CoreUtil.setPropertyList(wordCrfDTO.getPacs(), "name", "uniqueName", map.get(StandConvertEnum.pacs.toString()));

+ 3 - 1
src/main/java/com/diagbot/facade/OtherTipFacade.java

@@ -10,7 +10,6 @@ import com.diagbot.vo.IndicationPushVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Component;
 
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
 
 
 /**
 /**
@@ -155,6 +154,9 @@ public class OtherTipFacade {
         // otherTipPacsNeoDTOList.add(otherTipPacsNeoDTO);
         // otherTipPacsNeoDTOList.add(otherTipPacsNeoDTO);
         // TODO 测试数据结束
         // TODO 测试数据结束
         otherTipProcess.processPacs(otherTipPacsNeoDTOList, res);
         otherTipProcess.processPacs(otherTipPacsNeoDTOList, res);
+
+        // 结果去重处理
+        commonFacade.dealMsg(res.getOtherList());
     }
     }
 
 
 }
 }