|
@@ -84,10 +84,10 @@ public class THR0126 extends QCCatalogue {
|
|
|
if (firstCourseRecordDoc != null) {
|
|
|
String doctorSign = firstCourseRecordDoc.getStructureMap().get("记录医生");
|
|
|
String firstCourseProfessor = getFirstCourseProfessor(doctorSign);
|
|
|
- if (firstCourseProfessor.contains("主治") || firstCourseProfessor.contains("主任") ||
|
|
|
+ if (StringUtil.isNotBlank(doctorSign) && (firstCourseProfessor.contains("主治") || firstCourseProfessor.contains("主任") ||
|
|
|
(StringUtil.isNotBlank(deptDirector) && doctorSign.contains(deptDirector)) ||
|
|
|
(StringUtil.isNotBlank(directorDoctor) && doctorSign.contains(directorDoctor)) ||
|
|
|
- (StringUtil.isNotBlank(attendingDoctor) && doctorSign.contains(attendingDoctor))) {
|
|
|
+ (StringUtil.isNotBlank(attendingDoctor) && doctorSign.contains(attendingDoctor)))) {
|
|
|
String recordDateStr = firstCourseRecordDoc.getStructureMap().get("病历日期");
|
|
|
if (StringUtil.isNotBlank(recordDateStr)) {
|
|
|
if (!CatalogueUtil.compareTime(StringUtil.parseDateTime(admisTime), StringUtil.parseDateTime(recordDateStr), 48 * 60L)) {
|