|
@@ -244,7 +244,7 @@ public class CatalogueUtil {
|
|
|
//按时间排好序查房记录的第一条主治医师查房记录存进doctorRecord
|
|
|
for (Map<String, String> record : sortRecord) {
|
|
|
String roundTitle = record.get("查房标题");
|
|
|
- if (!isEmpty(roundTitle) && !CatalogueUtil.subTitle(record.get("查房标题")).contains(Content.indications)) {
|
|
|
+ if (isEmpty(roundTitle) || (!isEmpty(roundTitle) && !CatalogueUtil.subTitle(record.get("查房标题")).contains(Content.indications))) {
|
|
|
continue;
|
|
|
}
|
|
|
doctorRecord.put(Content.indications, record);
|
|
@@ -253,7 +253,7 @@ public class CatalogueUtil {
|
|
|
//按时间排好序查房记录的第一条主任医师/副主任医师查房记录存进doctorRecord
|
|
|
for (Map<String, String> record : sortRecord) {
|
|
|
String roundTitle = record.get("查房标题");
|
|
|
- if (!isEmpty(roundTitle) && !CatalogueUtil.subTitle(record.get("查房标题")).contains(Content.director)) {
|
|
|
+ if (isEmpty(roundTitle) || (!isEmpty(roundTitle) && !CatalogueUtil.subTitle(record.get("查房标题")).contains(Content.director))) {
|
|
|
continue;
|
|
|
}
|
|
|
doctorRecord.put(Content.director, record);
|