rengb 4 rokov pred
rodič
commit
1236f92f30

+ 0 - 8
trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunThreeLevelWardDocTrans.java

@@ -39,14 +39,10 @@ import java.util.regex.Pattern;
 @Setter
 public class BeiLunThreeLevelWardDocTrans extends ModelDocTrans {
 
-    private List<String> recTitles;
     private List<OperationDoc> operationDocs;
 
     @Override
     public List<ThreeLevelWardDoc> extract(MedrecVo medrecVo) {
-        ModelHospitalFacade modelHospitalFacade = SpringContextUtil.getBean(ModelHospitalFacade.class);
-        recTitles = modelHospitalFacade.getRecTitles(1l, 4l);
-
         List<ThreeLevelWardDoc> retList = Lists.newArrayList();
         ThreeLevelWardDoc threeLevelWardDoc = new ThreeLevelWardDoc();
         List<Map<String, Object>> contentMaps = (List) medrecVo.getContent().get("content");
@@ -63,10 +59,6 @@ public class BeiLunThreeLevelWardDocTrans extends ModelDocTrans {
         String recTypeId = contentMap.get("recTypeId").toString();
         BeiLunHtmlAnalysis beiLunHtmlAnalysis = new BeiLunThreeLevelWardHtmlAnalysis();
         Map<String, String> sourceMap = beiLunHtmlAnalysis.analysis(content, recTitle, recTypeId);
-
-        if (recTitles.contains(recTitle)) {
-            sourceMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
-        }
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
         //structureMap.put("查房日期", structureMap.get("记录时间"));
 

+ 1 - 2
trans/src/main/java/com/lantone/qc/trans/beilun/util/BeiLunThreeLevelWardHtmlAnalysis.java

@@ -21,8 +21,7 @@ public class BeiLunThreeLevelWardHtmlAnalysis implements BeiLunHtmlAnalysis {
     @Override
     public Map<String, String> analysis(String... args) {
         String html = args[0];
-        String recTitle = args[1];
-        String recTypeId = args[1];
+        String recTypeId = args[2];
         Map<String, String> structureMap = Maps.newLinkedHashMap();
         String htmlText = CommonAnalysisUtil.html2String(html);
         CommonAnalysisUtil.extractWardInfo(htmlText, structureMap);