|
@@ -38,13 +38,24 @@ public class THR03090 extends QCCatalogue {
|
|
|
return;
|
|
|
}
|
|
|
String operationStartDate = "";
|
|
|
- if (operationDocs.get(operationDocs.size() - 1).getOperationRecordDoc() != null) {
|
|
|
- Map<String, String> operationDocStructureMap = operationDocs.get(operationDocs.size() - 1).getOperationRecordDoc().getStructureMap();
|
|
|
- operationStartDate = operationDocStructureMap.get("开始时间");
|
|
|
- if (operationStartDate.contains("年月日")) {
|
|
|
- operationStartDate = DateUtil.nowString();
|
|
|
+ String operationName = "";
|
|
|
+ for (OperationDoc operationDoc : operationDocs) {
|
|
|
+ if (operationDoc.getOperationRecordDoc() != null) {
|
|
|
+ operationStartDate = operationDoc.getOperationRecordDoc().getStructureMap().get("开始时间");
|
|
|
+ if (operationStartDate.contains("年月日")) {
|
|
|
+ operationStartDate = DateUtil.nowString();
|
|
|
+ }
|
|
|
+ operationName = operationDoc.getOperationRecordDoc().getStructureMap().get("主刀医师");
|
|
|
}
|
|
|
+
|
|
|
}
|
|
|
+// if (operationDocs.get(operationDocs.size() - 1).getOperationRecordDoc() != null) {
|
|
|
+// Map<String, String> operationDocStructureMap = operationDocs.get(operationDocs.size() - 1).getOperationRecordDoc().getStructureMap();
|
|
|
+// operationStartDate = operationDocStructureMap.get("开始时间");
|
|
|
+// if (operationStartDate.contains("年月日")) {
|
|
|
+// operationStartDate = DateUtil.nowString();
|
|
|
+// }
|
|
|
+// }
|
|
|
|
|
|
List<ThreeLevelWardDoc> allDoctorWradDocs = threeLevelWardDocs.get(0).getAllDoctorWradDocs();
|
|
|
for (ThreeLevelWardDoc threeLevelWard : allDoctorWradDocs) {
|
|
@@ -52,8 +63,9 @@ public class THR03090 extends QCCatalogue {
|
|
|
String makeTitle = structureMap.get("查房标题");
|
|
|
String writTitle = structureMap.get("文书标题");
|
|
|
String makeDate = structureMap.get("查房日期");
|
|
|
- if (StringUtil.isNotBlank(makeDate) && StringUtil.parseDateTime(makeDate).before(StringUtil.parseDateTime(operationStartDate))) {
|
|
|
- if (((StringUtil.isNotBlank(makeTitle) && makeTitle.contains("主刀")) || (StringUtil.isNotBlank(writTitle) && writTitle.contains("主刀"))
|
|
|
+ if (StringUtil.isNotBlank(makeDate) && StringUtil.isNotBlank(operationStartDate) && StringUtil.parseDateTime(makeDate).before(StringUtil.parseDateTime(operationStartDate))) {
|
|
|
+ if (((StringUtil.isNotBlank(makeTitle) && (makeTitle.contains("主刀") || (StringUtil.isNotBlank(operationName) && makeTitle.contains(operationName))))
|
|
|
+ || (StringUtil.isNotBlank(writTitle) && writTitle.contains("主刀"))
|
|
|
|| ((StringUtil.isNotBlank(makeTitle) && makeTitle.contains("术前")) || (StringUtil.isNotBlank(writTitle) && writTitle.contains("术前"))))) {
|
|
|
return;
|
|
|
}
|