|
@@ -57,8 +57,8 @@ public class MzEmrService {
|
|
|
* @return: java.util.Map<java.lang.String, java.util.List < com.alibaba.fastjson.JSONObject>>
|
|
|
**/
|
|
|
public List<MzEmrPatientData> queryMzEmrTree(MzEmrPatientVo param) {
|
|
|
- List<MzEmrPatientData> result = new ArrayList();
|
|
|
- QueryWrapper<MzEmrPatientData> queryWrapper = new QueryWrapper();
|
|
|
+ List<MzEmrPatientData> result;
|
|
|
+ QueryWrapper<MzEmrPatientData> queryWrapper = new QueryWrapper<>();
|
|
|
queryWrapper.eq("pat_no", param.getPatientId());
|
|
|
String strTemplate = "";
|
|
|
List<MzEmrPatientData> list;
|
|
@@ -83,7 +83,7 @@ public class MzEmrService {
|
|
|
private List<MzEmrPatientData> getTree(List<MzEmrPatientData> list, String strTemplate) {
|
|
|
if (CollUtil.isEmpty(list)) return list;
|
|
|
List<MzEmrPatientData> result = new ArrayList<>();
|
|
|
- Map<Integer, List<MzEmrPatientData>> collect = list.stream().collect(Collectors.groupingBy(o -> o.getTimes()));
|
|
|
+ Map<Integer, List<MzEmrPatientData>> collect = list.stream().collect(Collectors.groupingBy(MzEmrPatientData::getTimes));
|
|
|
int index = 1;
|
|
|
for (Integer key : collect.keySet()) {
|
|
|
MzEmrPatientData tem = new MzEmrPatientData();
|