Merge remote-tracking branch 'origin/dev-shaoyf' into dev-shaoyf

kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0587.java

@@ -52,12 +52,11 @@ public class OPE0587 extends QCCatalogue {
             List<String> operDateList = new ArrayList<>();
             for (OperationDoc opera : operationDocs) {
                 OperationRecordDoc operationRecordDoc = opera.getOperationRecordDoc();
-                if(operationRecordDoc==null){
-                    return;
-                }
-                String operDate = operationRecordDoc.getStructureMap().get("手术日期")==null?null:operationRecordDoc.getStructureMap().get("手术日期");
-                if (StringUtil.isNotBlank(operDate)) {
-                    operDateList.add(operDate);
+                if (operationRecordDoc != null) {
+                    String operDate = operationRecordDoc.getStructureMap().get("手术日期") == null ? null : operationRecordDoc.getStructureMap().get("手术日期");
+                    if (StringUtil.isNotBlank(operDate)) {
+                        operDateList.add(operDate);
+                    }
                 }
             }
             if (operDateList.size() > 0) {