|
@ -163,9 +163,9 @@ public class JMJkEduArticleService extends BaseService {
|
|
|
result.put(one.getArticleId(), heapm);
|
|
|
}
|
|
|
List<HealthEduArticlePatientModel> resultList = new ArrayList<>();
|
|
|
for (Map.Entry<String, HealthEduArticlePatientModel> entry : result.entrySet()) {
|
|
|
resultList.add(entry.getValue());
|
|
|
}
|
|
|
// for (Map.Entry<String, HealthEduArticlePatientModel> entry : result.entrySet()) {
|
|
|
// resultList.add(entry.getValue());
|
|
|
// }
|
|
|
return resultList;
|
|
|
}
|
|
|
|
|
@ -610,9 +610,9 @@ public class JMJkEduArticleService extends BaseService {
|
|
|
if (!StringUtils.isEmpty(labelSex)) {
|
|
|
whereSql += " and p.sex in (" + labelSex + ") ";
|
|
|
}
|
|
|
if (!StringUtils.isEmpty(labelUnit)) {
|
|
|
whereSql += " and w.hospital in (" + labelUnit + ") ";
|
|
|
}
|
|
|
// if (!StringUtils.isEmpty(labelUnit)) {
|
|
|
// whereSql += " and w.hospital in (" + labelUnit + ") ";
|
|
|
// }
|
|
|
List<String> groupPatient = jdbcTemplate.queryForList(tableSql + whereSql, String.class);
|
|
|
patientSet.addAll(groupPatient);
|
|
|
}
|