优化电子病历

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

@@ -291,12 +291,16 @@ public interface EmrPatientDao {
             "                    from a_patient_mi " +
             "                    where a_patient_mi.inpatient_no = yz_temperature.inpatient_no), " +
             "       inpatient_no, " +
-            "       temp_date  = (convert(varchar(10), rec_date, 23) + ' ' + convert(varchar(10), rec_time, 24)), " +
-            "       temperature_1, " +
+            "       temp_date  = (convert(varchar(10), rec_date, 23) + ' ' + convert(varchar(10), rec_time, 24))," +
+            "       rec_date_str = (convert(varchar(10), rec_date, 23))," +
+            "       rec_time_str = (convert(varchar(5), rec_time, 24)), " +
+            "       temperature_1," +
+            "       temperature_1_type,col_1_name,col_1_am,col_2_name,col_2_am" +
+            "       patient_state, " +
             "       pulse_1, " +
             "       breathe_1, " +
             "       pressure_1_am, " +
-            "       pressure_1_pm, " +
+            "       pressure_1_pm," +
             "       spo2, " +
             "       mind, " +
             "       skin, " +
@@ -310,7 +314,7 @@ public interface EmrPatientDao {
             "from yz_temperature " +
             "where inpatient_no = #{patNo} " +
             "  and admiss_times = #{times} " +
-            "order by detail_no")
+            "order by temp_date ")
     List<YzTemperature> getYzTemperature(String patNo, Integer times);
 
     @Select("select order_name, req_no, act_order_no, start_time, inpatient_no, admiss_times, receive_flag " +

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

@@ -703,25 +703,7 @@ public class EmrServer {
 
     public ResultVo<List<YzTemperature>> getYzTemperature(String patNo, Integer times) {
         List<YzTemperature> list = dao.getYzTemperature(patNo, times);
-        Map<Date, YzTemperature> map = new HashMap<>(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);
-            }
-        }
-
-        Map<Date, YzTemperature> result = new LinkedHashMap<>(map.size());
-
-        map.entrySet()
-                .stream()
-                .sorted(Collections.reverseOrder(Map.Entry.comparingByKey()))
-                .collect(Collectors.toList()).forEach(ele -> result.put(ele.getKey(), ele.getValue()));
-
-        return ResultVoUtil.success(new ArrayList<>(result.values()));
+        return ResultVoUtil.success(list);
     }
 
     public ResultVo<List<YshYjReq>> getExamine(String patNo, Integer times) {