|
@@ -380,6 +380,12 @@ public class PushProcess {
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
public void process(PushDTO pushDTO, PushVO pushVo, WordCrfDTO wordCrfDTO) {
|
|
public void process(PushDTO pushDTO, PushVO pushVo, WordCrfDTO wordCrfDTO) {
|
|
|
|
+ // 一般治疗——界面下的第一个诊断
|
|
|
|
+ if (ListUtil.isNotEmpty(wordCrfDTO.getDiag())) {
|
|
|
|
+ TreatDTO treatDTO = new TreatDTO();
|
|
|
|
+ BeanUtil.copyProperties(wordCrfDTO.getDiag().get(0), treatDTO);
|
|
|
|
+ pushDTO.getTreat().add(treatDTO);
|
|
|
|
+ }
|
|
// 生成反推的入参
|
|
// 生成反推的入参
|
|
List<String> ruleTypeList = Lists.newArrayList(pushVo.getFeatureType().split(",")); // 需要获取的类型
|
|
List<String> ruleTypeList = Lists.newArrayList(pushVo.getFeatureType().split(",")); // 需要获取的类型
|
|
Map<String, List<PushBaseDTO>> dis = pushDTO.getDis();
|
|
Map<String, List<PushBaseDTO>> dis = pushDTO.getDis();
|
|
@@ -393,7 +399,7 @@ public class PushProcess {
|
|
// 查询数据
|
|
// 查询数据
|
|
List<ReverseDTO> reverseDTOList = conceptInfoFacade.getReverseFac(reverseVO);
|
|
List<ReverseDTO> reverseDTOList = conceptInfoFacade.getReverseFac(reverseVO);
|
|
// 获取各个类型的界面过滤元素
|
|
// 获取各个类型的界面过滤元素
|
|
- // TODO 测试数据
|
|
|
|
|
|
+ // TODO 测试数据开始
|
|
ReverseDTO reverseDTO = new ReverseDTO();
|
|
ReverseDTO reverseDTO = new ReverseDTO();
|
|
reverseDTO.setSonType(101);
|
|
reverseDTO.setSonType(101);
|
|
reverseDTO.setSonName("氨来呫诺");
|
|
reverseDTO.setSonName("氨来呫诺");
|
|
@@ -403,7 +409,6 @@ public class PushProcess {
|
|
reverseDTO1.setSonType(106);
|
|
reverseDTO1.setSonType(106);
|
|
reverseDTO1.setSonName("鞍区病损切除术");
|
|
reverseDTO1.setSonName("鞍区病损切除术");
|
|
reverseDTOList.add(reverseDTO1);
|
|
reverseDTOList.add(reverseDTO1);
|
|
-
|
|
|
|
for (int i = 0; i <reverseDTOList.size(); i++) {
|
|
for (int i = 0; i <reverseDTOList.size(); i++) {
|
|
if (reverseDTOList.get(i).getSonType().intValue() == 107) {
|
|
if (reverseDTOList.get(i).getSonType().intValue() == 107) {
|
|
reverseDTOList.remove(i--);
|
|
reverseDTOList.remove(i--);
|
|
@@ -413,6 +418,8 @@ public class PushProcess {
|
|
reverseDTO2.setSonType(107);
|
|
reverseDTO2.setSonType(107);
|
|
reverseDTO2.setSonName("钾测定");
|
|
reverseDTO2.setSonName("钾测定");
|
|
reverseDTOList.add(reverseDTO2);
|
|
reverseDTOList.add(reverseDTO2);
|
|
|
|
+ // TODO 测试数据结束
|
|
|
|
+
|
|
Map<String, List<String>> filterMap = getFilterMap(wordCrfDTO);
|
|
Map<String, List<String>> filterMap = getFilterMap(wordCrfDTO);
|
|
// 设置推送信息(过滤已有)
|
|
// 设置推送信息(过滤已有)
|
|
setPushItem(pushDTO, ruleTypeList, filterMap, reverseDTOList, pushVo.getLength());
|
|
setPushItem(pushDTO, ruleTypeList, filterMap, reverseDTOList, pushVo.getLength());
|