浏览代码

标准词转换服务

zhoutg 4 年之前
父节点
当前提交
5c18ff76d9
共有 2 个文件被更改,包括 25 次插入10 次删除
  1. 1 1
      src/main/java/com/diagbot/facade/TestFacade.java
  2. 24 9
      src/main/java/com/diagbot/process/BillProcess.java

+ 1 - 1
src/main/java/com/diagbot/facade/TestFacade.java

@@ -130,9 +130,9 @@ public class TestFacade {
                 msg.add("第【" + indicationPushVO.getIdNum() + "】行未匹配");
             }
         }
-        map.put("出错信息", msg);
         map.put("总条数", indicationPushVOList.size() + "条");
         map.put("出错条数", msg.size() + "条");
+        map.put("出错信息", msg);
         return map;
     }
 

+ 24 - 9
src/main/java/com/diagbot/process/BillProcess.java

@@ -1,21 +1,36 @@
 package com.diagbot.process;
 
-import com.diagbot.dto.*;
+import com.diagbot.dto.BillMsg;
+import com.diagbot.dto.BillNeoDTO;
+import com.diagbot.dto.BillNeoMaxDTO;
+import com.diagbot.dto.IndicationDTO;
+import com.diagbot.dto.NodeNeoDTO;
+import com.diagbot.dto.WordCrfDTO;
 import com.diagbot.enums.NeoEnum;
 import com.diagbot.facade.NeoFacade;
-import com.diagbot.model.entity.*;
+import com.diagbot.model.entity.Clinical;
+import com.diagbot.model.entity.Diag;
+import com.diagbot.model.entity.GeneralDesc;
+import com.diagbot.model.entity.Medicine;
+import com.diagbot.model.entity.Operation;
+import com.diagbot.model.entity.Vital;
 import com.diagbot.model.label.ChiefLabel;
 import com.diagbot.model.label.DiagLabel;
 import com.diagbot.model.label.PastLabel;
 import com.diagbot.model.label.PresentLabel;
-import com.diagbot.rule.*;
+import com.diagbot.rule.AgeRule;
+import com.diagbot.rule.CommonRule;
+import com.diagbot.rule.DrugRule;
+import com.diagbot.rule.LisRule;
+import com.diagbot.rule.PacsRule;
+import com.diagbot.rule.SexRule;
+import com.diagbot.rule.VitalRule;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.ListUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -71,11 +86,11 @@ public class BillProcess {
                 drug3.setName("泰舒达类");
                 billNeoDTO.getPacsBillNeoDTO().getOralmeds().add(drug3);
 
-                NodeNeoDTO vital = new NodeNeoDTO();
-                vital.setName("体温");
-                vital.setMax(new BigDecimal(39.1));
-//                vital.setMin(new BigDecimal(35.1));
-                billNeoDTO.getPacsBillNeoDTO().getOralmeds().add(vital);
+                // NodeNeoDTO vital = new NodeNeoDTO();
+                // vital.setName("体温");
+                // vital.setMax(new BigDecimal("39.1"));
+                // vital.setMin(new BigDecimal(35.1));
+                // billNeoDTO.getPacsBillNeoDTO().getVitals().add(vital);
 
             }
             // 测试数据结束