代码逻辑修改

kernel/src/main/java/com/lantone/qc/kernel/catalogue/hospital/ningbozhongyi/threelevelward/THR02900.java

@@ -51,7 +51,7 @@ public class THR02900 extends QCCatalogue {
                 continue;
             }
             Map<String, String> structureMap = operationRecordDoc.getStructureMap();
-            String opeAssName = structureMap.get("手术人员");
+            String opeAssName = structureMap.get("手术名称");
             firstAssistant = structureMap.get("一助");
             if(StringUtil.isBlank(firstAssistant)){
                 firstAssistant = structureMap.get("助手（一、二）");
@@ -80,14 +80,17 @@ public class THR02900 extends QCCatalogue {
             if (!CatalogueUtil.compareTime(
                     StringUtil.parseDateTime(opeEndTime),
                     StringUtil.parseDateTime(DateUtil.nowString()),
-                    Long.valueOf(24 * 60))) {//如果接收未超过6小时，规则不判断
+                    Long.valueOf(24 * 60))) {//如果接收未超过24小时，规则不判断
                 return;
-            } else {
+            }else {
                 if ((StringUtil.isNotEmpty(chiefSurgeon) || StringUtil.isNotEmpty(firstAssistant)) && ListUtil.isEmpty(allDoctorWradDocs)) {
                     status.set("-1");
                     return;
                 }
             }
+            // if (StringUtil.isNotBlank(chiefSurgeon) || StringUtil.isNotBlank(firstAssistant) && allDoctorWradDocs.size()==0){
+            //                    return;
+            //                }
             if (ListUtil.isNotEmpty(allDoctorWradDocs)) {
                 for (ThreeLevelWardDoc wardDoc : allDoctorWradDocs) {
                     Map<String, String> wardStructureMap = wardDoc.getStructureMap();
@@ -99,7 +102,7 @@ public class THR02900 extends QCCatalogue {
                     if (StringUtil.isBlank(recordTitle) || StringUtil.isBlank(pathography) || recordDate == null) {
                         continue;
                     }
-                    if (opeEndDate.before(recordDate) && !CatalogueUtil.compareTime(opeEndDate, recordDate, 24 * 60L)) {
+                    if (recordDate.before(opeEndDate) && !CatalogueUtil.compareTime(opeEndDate, recordDate, 24 * 60L)) {
                         allTitle += recordTitle;
                         allPathography += pathography;
                         if (StringUtil.isNotBlank(writTitle)) {
@@ -122,7 +125,7 @@ public class THR02900 extends QCCatalogue {
                     StringUtil.isNotBlank(firstAssistant) && !allTitle.contains(firstAssistant)) {
                 status.set("-1");
                 return;
-            } else if (StringUtil.isBlank(chiefSurgeon) && StringUtil.isBlank(firstAssistant) && split != null && split.length > 1) {
+            } else if (StringUtil.isBlank(chiefSurgeon) && StringUtil.isBlank(firstAssistant) && split != null && split.length > 1 && StringUtil.isNotBlank(opeAssName)) {
                 for (int i = 0; i < split.length; i++) {
                     if (allTitle.contains(split[i])) {
                         return;