瀏覽代碼

提供对化验明细项的支持

MarkHuang 4 年之前
父節點
當前提交
15c469bbaa
共有 2 個文件被更改,包括 10 次插入1 次删除
  1. 7 1
      src/main/java/com/diagbot/facade/BillFacade.java
  2. 3 0
      src/main/java/com/diagbot/vo/BillNeoVO.java

+ 7 - 1
src/main/java/com/diagbot/facade/BillFacade.java

@@ -7,6 +7,7 @@ import com.diagbot.dto.BillNeoDTO;
 import com.diagbot.dto.IndicationDTO;
 import com.diagbot.dto.IndicationDTO;
 import com.diagbot.dto.WordCrfDTO;
 import com.diagbot.dto.WordCrfDTO;
 import com.diagbot.process.BillProcess;
 import com.diagbot.process.BillProcess;
+import com.diagbot.util.StringUtil;
 import com.diagbot.vo.BillNeoVO;
 import com.diagbot.vo.BillNeoVO;
 import com.diagbot.vo.IndicationPushVO;
 import com.diagbot.vo.IndicationPushVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -60,7 +61,12 @@ public class BillFacade {
 
 
         List<Lis> lislist = wordCrfDTO.getLisOrder();
         List<Lis> lislist = wordCrfDTO.getLisOrder();
         for (Lis lis : lislist) {
         for (Lis lis : lislist) {
-            billNeoVO.getLisList().put(lis.getName(), lis.getUniqueName());
+            if (StringUtil.isBlank(lis.getDetailName())) {
+                billNeoVO.getLisList().put(lis.getName(), lis.getUniqueName());
+            }
+            else {
+                billNeoVO.getLisDetailList().put(lis.getDetailName(), lis.getUniqueName());
+            }
         }
         }
 
 
         List<Item> diags = wordCrfDTO.getDiagOrder();
         List<Item> diags = wordCrfDTO.getDiagOrder();

+ 3 - 0
src/main/java/com/diagbot/vo/BillNeoVO.java

@@ -13,6 +13,9 @@ public class BillNeoVO {
     // 化验入参
     // 化验入参
     private Map<String, String> lisList = new HashMap<>();
     private Map<String, String> lisList = new HashMap<>();
 
 
+    // 化验细项入参
+    private Map<String, String> lisDetailList = new HashMap<>();
+
     // 辅检入参
     // 辅检入参
     private Map<String, String> pacsList = new HashMap<>();
     private Map<String, String> pacsList = new HashMap<>();