Merge remote-tracking branch 'origin/master'

kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstcourserecord/FIRC0084.java

@@ -31,27 +31,27 @@ public class FIRC0084 extends QCCatalogue {
                 String pacs = courseRecordDocStructureMap.get("辅助检查");
                 String tretment_plan = courseRecordDocStructureMap.get("诊疗计划");
                 if(StringUtils.isNotEmpty(tretment_plan)){
-                    if(CatalogueUtil.removeSpecialChar(tretment_plan).equals("同上")){
+                    if(CatalogueUtil.removeSpecialChar(tretment_plan).contains("同上")){
                         status = "-1";
                     }
                 }else if(StringUtils.isNotEmpty(identify_diag)){
-                    if(CatalogueUtil.removeSpecialChar(identify_diag).equals("同上")){
+                    if(CatalogueUtil.removeSpecialChar(identify_diag).contains("同上")){
                         status = "-1";
                     }
                 }else if(StringUtils.isNotEmpty(characteristic)){
-                    if(CatalogueUtil.removeSpecialChar(characteristic).equals("同上")){
+                    if(CatalogueUtil.removeSpecialChar(characteristic).contains("同上")){
                         status = "-1";
                     }
                 }else if(StringUtils.isNotEmpty(initDiags)){
-                    if(CatalogueUtil.removeSpecialChar(initDiags).equals("同上")){
+                    if(CatalogueUtil.removeSpecialChar(initDiags).contains("同上")){
                         status = "-1";
                     }
                 }else if(StringUtils.isNotEmpty(condition)){
-                    if(CatalogueUtil.removeSpecialChar(condition).equals("同上")){
+                    if(CatalogueUtil.removeSpecialChar(condition).contains("同上")){
                         status = "-1";
                     }
                 }else if(StringUtils.isNotEmpty(pacs)){
-                    if(CatalogueUtil.removeSpecialChar(pacs).equals("同上")){
+                    if(CatalogueUtil.removeSpecialChar(pacs).contains("同上")){
                         status = "-1";
                     }
                 }