Merge branch 'beilun/dev-fqw' into beilun/dev

kernel/src/main/java/com/lantone/qc/kernel/catalogue/yiwu/behospitalized/BEH0025.java

@@ -6,6 +6,7 @@ import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.model.entity.Diag;
 import com.lantone.qc.pub.model.entity.Operation;
 import com.lantone.qc.pub.model.label.PastLabel;
+import com.lantone.qc.pub.model.label.PresentLabel;
 import com.lantone.qc.pub.util.ListUtil;
 import com.lantone.qc.pub.util.StringUtil;
 import org.apache.commons.lang3.StringUtils;
@@ -65,6 +66,11 @@ public class BEH0025 extends QCCatalogue {
                 || pastLabelText.contains("体外碎石")) {
             status.set("0");
         }
+        //现病史里出现手术记录也不报
+        PresentLabel presentLabel=inputInfo.getBeHospitalizedDoc().getPresentLabel();
+        if(presentLabel!=null&&presentLabel.getText().contains("手术")){
+            status.set("0");
+        }
     }
 
 }