Browse Source

禅道修改bug

hujing 5 năm trước cách đây
mục cha
commit
7abb5c3be8

+ 6 - 5
kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0323.java

@@ -5,6 +5,7 @@ import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.model.doc.operation.OperationDoc;
 import com.lantone.qc.pub.util.ListUtil;
+import com.lantone.qc.pub.util.StringUtil;
 import org.springframework.stereotype.Component;
 
 import java.text.ParseException;
@@ -37,11 +38,11 @@ public class OPE0323 extends QCCatalogue {
                         String surgeon = operationDoc.getOperationRecordDoc().getStructureMap().get("手术医师");
                         String assist1 = operationDoc.getOperationRecordDoc().getStructureMap().get("助手I");
                         String signature = operationDoc.getOperationRecordDoc().getStructureMap().get("主刀医师签名");
-
-                        String operator = surgeon + ", " + assist1;
-
-                        if (!operator.contains(signature)) {
-                            flag = true;
+                        if (StringUtil.isNotBlank(surgeon) && StringUtil.isNotBlank(assist1)) {
+                            String operator = surgeon + ", " + assist1;
+                            if (!operator.contains(signature)) {
+                                flag = true;
+                            }
                         }
                     }
                     return flag;