电子病历护理记录

src/main/java/thyyxxk/webserver/controller/zhuyuanyizheng/EmrController.java

@@ -209,8 +209,8 @@ public class EmrController {
     }
 
     @GetMapping("/getYzTemperature")
-    public ResultVo<List<YzTemperature>> getYzTemperature(@RequestParam("patNo") String patNo,
-                                                          @RequestParam("times") Integer times) {
+    public ResultVo<JSONObject> getYzTemperature(@RequestParam("patNo") String patNo,
+                                                 @RequestParam("times") Integer times) {
         return server.getYzTemperature(patNo, times);
     }
 

src/main/java/thyyxxk/webserver/dao/his/zhuyuanyisheng/EmrPatientDao.java

@@ -35,7 +35,8 @@ public interface EmrPatientDao {
             "from emr_patient_data " +
             "where pat_no = #{patNo} " +
             "  and times = #{times}" +
-            " and del_flag = 0 ")
+            "  and del_flag = 0 " +
+            "  order by create_date ")
     List<EmrPatientData> getPatientData(@Param("patNo") String patNo,
                                         @Param("times") Integer times);
 

src/main/java/thyyxxk/webserver/service/zhuyuanyisheng/EmrServer.java

@@ -701,9 +701,25 @@ public class EmrServer {
     }
 
 
-    public ResultVo<List<YzTemperature>> getYzTemperature(String patNo, Integer times) {
+    public ResultVo<JSONObject> getYzTemperature(String patNo, Integer times) {
+        JSONObject js = new JSONObject();
         List<YzTemperature> list = dao.getYzTemperature(patNo, times);
-        return ResultVoUtil.success(list);
+        if (ListUtil.isBlank(list)) {
+            return ResultVoUtil.success(js);
+        }
+        Map<Date, YzTemperature> map = new LinkedHashMap<>(list.size());
+        for (YzTemperature item : list) {
+            Date key = item.getTempDate();
+            if (map.containsKey(key)) {
+                YzTemperature yz = map.get(key);
+                yz.setOtherInfo(nullToEmpty(yz.getOtherInfo()) + nullToEmpty(item.getOtherInfo()));
+            } else {
+                map.put(key, item);
+            }
+        }
+        js.put("list", list);
+        js.put("map", map);
+        return ResultVoUtil.success(js);
     }
 
     public ResultVo<List<YshYjReq>> getExamine(String patNo, Integer times) {