Merge branch 'master' of 172.16.32.165:lighter/web-server

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

@@ -375,11 +375,12 @@ public class EmrServer {
         Map<String, JSONObject> surgicalSequencing = new TreeMap<>();
         for (String s : idList) {
             JSONObject jsonObject = emr.getEditorJsonDataByDocumentId(s);
-            String key = DateUtil.formatDatetime(jsonObject.getJSONObject("手术日期").getDate("value"));
-            if (StringUtil.isBlank(key)) {
-                continue;
+            try {
+                String key = DateUtil.formatDatetime(jsonObject.getJSONObject("手术日期").getDate("value"));
+                surgicalSequencing.put(key, jsonObject);
+            } catch (Exception ignored) {
             }
-            surgicalSequencing.put(key, jsonObject);
+
         }
         if (!surgicalSequencing.isEmpty()) {
             for (Map.Entry<String, JSONObject> item : surgicalSequencing.entrySet()) {