北仑输血记录、输血后效果评价html解析合并代码冲突

trans/src/main/java/com/lantone/qc/trans/beilun/util/BeiLunClinicBloodEffectHtmlAnalysis.java

@@ -41,7 +41,6 @@ public class BeiLunClinicBloodEffectHtmlAnalysis implements BeiLunHtmlAnalysis {
         );
 
          */
-        BeiLunHtmlAnalysisUtil.insertModuleId(recTypeId, map);
         //找不到模板id,用默认标准模板
         map.putIfAbsent("mode_id", "415");
         BeiLunHtmlAnalysisUtil.insertModuleId(modeId, recTypeId, map);

trans/src/main/java/com/lantone/qc/trans/beilun/util/BeiLunClinicalBloodHtmlAnalysis.java

@@ -40,7 +40,6 @@ public class BeiLunClinicalBloodHtmlAnalysis implements BeiLunHtmlAnalysis {
                     }
                 }
         );
-        BeiLunHtmlAnalysisUtil.insertModuleId(recTypeId, map);
         //找不到模板id,用默认标准模板
         map.putIfAbsent("mode_id", "414");
         return map;