ソースを参照

核查任务来源接口-患者类型接口修改

songxinlu 3 年 前
コミット
1cc6bbb848
1 ファイル変更5 行追加3 行削除
  1. 5 3
      src/main/java/com/diagbot/facade/RecordCheckFacade.java

+ 5 - 3
src/main/java/com/diagbot/facade/RecordCheckFacade.java

@@ -34,6 +34,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -226,13 +227,14 @@ public class RecordCheckFacade {
             }
         });
         Long hospitalId = Long.parseLong(SysUserUtils.getCurrentHospitalID());
-        List<Integer> valus = medBehospitalTypeServiceImpl.list(new QueryWrapper<MedBehospitalType>()
+        Map<String,Integer> valueMaps = medBehospitalTypeServiceImpl.list(new QueryWrapper<MedBehospitalType>()
                 .eq("hospital_id", hospitalId)
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .isNotNull("value")
-                .groupBy("value")).stream().map(MedBehospitalType::getValue).collect(Collectors.toList());
+                .select("behospital_type,value")
+                .groupBy("value")).stream().collect(Collectors.toMap(MedBehospitalType::getBehospitalType, MedBehospitalType::getValue,(k1, k2) -> k1, LinkedHashMap::new));
         out.put("source", checkTypes);
-        out.put("value", valus);
+        out.put("value", valueMaps);
         return out;
     }
 }