|
@@ -4,7 +4,6 @@ import com.diagbot.biz.push.entity.Item;
|
|
|
import com.diagbot.biz.push.entity.Lis;
|
|
|
import com.diagbot.biz.push.entity.Pacs;
|
|
|
import com.diagbot.biz.push.vo.SearchVO;
|
|
|
-import com.diagbot.config.CryptConfiguer;
|
|
|
import com.diagbot.enums.ConceptTypeEnum;
|
|
|
import com.diagbot.enums.SysTypeEnum;
|
|
|
import com.diagbot.facade.TransferFacade;
|
|
@@ -79,7 +78,10 @@ public class SearchItemAggregate {
|
|
|
@DataProvider("setLis")
|
|
|
public List<Lis> setLis(@InvokeParameter("searchVO") SearchVO searchVO) {
|
|
|
List<Lis> lis = searchVO.getLis();
|
|
|
- lis = transferFacade.addLisUniqueName(lis, searchVO.getHosCode());
|
|
|
+ //数据引擎模式映射数据
|
|
|
+ if (searchVO.getSysType().intValue() == SysTypeEnum.LTAPI_SERVICE.getKey()) {
|
|
|
+ lis = transferFacade.addLisUniqueName(lis, searchVO.getHosCode());
|
|
|
+ }
|
|
|
return lis;
|
|
|
}
|
|
|
|
|
@@ -92,7 +94,10 @@ public class SearchItemAggregate {
|
|
|
@DataProvider("setPacs")
|
|
|
public List<Pacs> setPacs(@InvokeParameter("searchVO") SearchVO searchVO) {
|
|
|
List<Pacs> pacs = searchVO.getPacs();
|
|
|
- pacs = transferFacade.addPacsUniqueName(pacs, searchVO.getHosCode());
|
|
|
+ //数据引擎模式映射数据
|
|
|
+ if (searchVO.getSysType().intValue() == SysTypeEnum.LTAPI_SERVICE.getKey()) {
|
|
|
+ pacs = transferFacade.addPacsUniqueName(pacs, searchVO.getHosCode());
|
|
|
+ }
|
|
|
return pacs;
|
|
|
}
|
|
|
|
|
@@ -105,7 +110,10 @@ public class SearchItemAggregate {
|
|
|
@DataProvider("setDiag")
|
|
|
public List<Item> setDiag(@InvokeParameter("searchVO") SearchVO searchVO) {
|
|
|
List<Item> diag = searchVO.getDiag();
|
|
|
- diag = transferFacade.addItemUniqueName(diag, ConceptTypeEnum.Disease.getKey(), searchVO.getHosCode());
|
|
|
+ //数据引擎模式映射数据
|
|
|
+ if (searchVO.getSysType().intValue() == SysTypeEnum.LTAPI_SERVICE.getKey()) {
|
|
|
+ diag = transferFacade.addItemUniqueName(diag, ConceptTypeEnum.Disease.getKey(), searchVO.getHosCode());
|
|
|
+ }
|
|
|
return diag;
|
|
|
}
|
|
|
|
|
@@ -131,7 +139,10 @@ public class SearchItemAggregate {
|
|
|
@DataProvider("setLisOrder")
|
|
|
public List<Lis> setLisOrder(@InvokeParameter("searchVO") SearchVO searchVO) {
|
|
|
List<Lis> lisOrder = searchVO.getLisOrder();
|
|
|
- lisOrder = transferFacade.addLisUniqueName(lisOrder, searchVO.getHosCode());
|
|
|
+ //数据引擎模式映射数据
|
|
|
+ if (searchVO.getSysType().intValue() == SysTypeEnum.LTAPI_SERVICE.getKey()) {
|
|
|
+ lisOrder = transferFacade.addLisUniqueName(lisOrder, searchVO.getHosCode());
|
|
|
+ }
|
|
|
return lisOrder;
|
|
|
}
|
|
|
|
|
@@ -144,7 +155,10 @@ public class SearchItemAggregate {
|
|
|
@DataProvider("setPacsOrder")
|
|
|
public List<Pacs> setPacsOrder(@InvokeParameter("searchVO") SearchVO searchVO) {
|
|
|
List<Pacs> pacsOrder = searchVO.getPacsOrder();
|
|
|
- pacsOrder = transferFacade.addPacsUniqueName(pacsOrder, searchVO.getHosCode());
|
|
|
+ //数据引擎模式映射数据
|
|
|
+ if (searchVO.getSysType().intValue() == SysTypeEnum.LTAPI_SERVICE.getKey()) {
|
|
|
+ pacsOrder = transferFacade.addPacsUniqueName(pacsOrder, searchVO.getHosCode());
|
|
|
+ }
|
|
|
return pacsOrder;
|
|
|
}
|
|
|
|
|
@@ -157,7 +171,11 @@ public class SearchItemAggregate {
|
|
|
@DataProvider("setDiagOrder")
|
|
|
public List<Item> setDiagOrder(@InvokeParameter("searchVO") SearchVO searchVO) {
|
|
|
List<Item> diagOrder = searchVO.getDiagOrder();
|
|
|
- diagOrder = transferFacade.addItemUniqueName(diagOrder, ConceptTypeEnum.Disease.getKey(), searchVO.getHosCode());
|
|
|
+ //数据引擎模式映射数据
|
|
|
+ if (searchVO.getSysType().intValue() == SysTypeEnum.LTAPI_SERVICE.getKey()) {
|
|
|
+ diagOrder
|
|
|
+ = transferFacade.addItemUniqueName(diagOrder, ConceptTypeEnum.Disease.getKey(), searchVO.getHosCode());
|
|
|
+ }
|
|
|
return diagOrder;
|
|
|
}
|
|
|
|
|
@@ -217,7 +235,10 @@ public class SearchItemAggregate {
|
|
|
}
|
|
|
List<Item> diseaseItem = Lists.newLinkedList();
|
|
|
diseaseItem.add(searchVO.getDiseaseName());
|
|
|
- diseaseItem = transferFacade.addItemUniqueName(diseaseItem, ConceptTypeEnum.Disease.getKey(), searchVO.getHosCode());
|
|
|
+ //数据引擎模式映射数据
|
|
|
+ if (searchVO.getSysType().intValue() == SysTypeEnum.LTAPI_SERVICE.getKey()) {
|
|
|
+ diseaseItem = transferFacade.addItemUniqueName(diseaseItem, ConceptTypeEnum.Disease.getKey(), searchVO.getHosCode());
|
|
|
+ }
|
|
|
if (ListUtil.isNotEmpty(diseaseItem)) {
|
|
|
return diseaseItem.get(0);
|
|
|
} else {
|