|
@@ -105,8 +105,8 @@ public class OPE0369 extends QCCatalogue {
|
|
|
if (StringUtil.isNotBlank(recordDateStr) && date != null
|
|
|
&& StringUtil.parseDateTime(recordDateStr).before(date)) {
|
|
|
if (!CatalogueUtil.compareTime(StringUtil.parseDateTime(recordDateStr), date, Long.valueOf(24 * 60))
|
|
|
- && ((makeTitle.contains("主刀") || (StringUtil.isNotBlank(writTitle) && writTitle.contains("主刀")))
|
|
|
- || (makeTitle.contains("术前") || (StringUtil.isNotBlank(writTitle) && writTitle.contains("术前"))))) {
|
|
|
+ && (((StringUtil.isNotBlank(makeTitle) && makeTitle.contains("主刀")) || (StringUtil.isNotBlank(writTitle) && writTitle.contains("主刀")))
|
|
|
+ || ((StringUtil.isNotBlank(makeTitle) && makeTitle.contains("术前")) || (StringUtil.isNotBlank(writTitle) && writTitle.contains("术前"))))) {
|
|
|
operateCount++;
|
|
|
}
|
|
|
}
|