|
@@ -81,6 +81,15 @@ public class PushProcess {
|
|
|
}
|
|
|
}
|
|
|
Map<String, List<PushBaseDTO>> dis = new HashMap<>();
|
|
|
+ if (ruleTypeList.contains("10") && pushVo.getDiseaseName() != null) {
|
|
|
+ List<TreatDTO> collect = new ArrayList<>();
|
|
|
+ Item diaeaseName = pushVo.getDiseaseName();
|
|
|
+ TreatDTO treatDTO = new TreatDTO();
|
|
|
+ treatDTO.setName(diaeaseName.getName());
|
|
|
+ treatDTO.setUniqueName(diaeaseName.getUniqueName());
|
|
|
+ collect.add(treatDTO);
|
|
|
+ pushDTO.setTreat(collect);
|
|
|
+ }
|
|
|
if (ListUtil.isNotEmpty(pushDiags)) {
|
|
|
//先把所有疾病推出来
|
|
|
if (ruleTypeList.contains("7")) {
|
|
@@ -108,6 +117,7 @@ public class PushProcess {
|
|
|
|
|
|
}
|
|
|
|
|
|
+
|
|
|
return pushDTO;
|
|
|
}
|
|
|
|
|
@@ -306,15 +316,7 @@ public class PushProcess {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- if (ruleTypeList.contains("10") && pushVO.getDiaeaseName() != null) {
|
|
|
- List<TreatDTO> collect = new ArrayList<>();
|
|
|
- Item diaeaseName = pushVO.getDiaeaseName();
|
|
|
- TreatDTO treatDTO = new TreatDTO();
|
|
|
- treatDTO.setName(diaeaseName.getName());
|
|
|
- treatDTO.setUniqueName(diaeaseName.getUniqueName());
|
|
|
- collect.add(treatDTO);
|
|
|
- pushDTO.setTreat(collect);
|
|
|
- }
|
|
|
+
|
|
|
}
|
|
|
|
|
|
private List<PushBaseDTO> getPackagePushBaseDTO(Map<String, List<String>> typeWords, List<String> symptoms, StandConvertEnum symptom) {
|