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