开单导出

src/main/java/com/diagbot/facade/KlRuleFacade.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.dto.DefaultExportDTO;
-import com.diagbot.dto.IndicationExportDTO;
 import com.diagbot.dto.KlRuleByIdDTO;
 import com.diagbot.dto.KlRuleByIdParDTO;
 import com.diagbot.dto.KlRuleByIdSubDTO;
@@ -253,8 +252,22 @@ public class KlRuleFacade extends KlRuleServiceImpl {
      * @return
      */
     public void exportIndicationFac(HttpServletResponse response) {
-        List<IndicationExportDTO> indicationExportDTOS = exportIndication();
-        ExcelUtils.exportExcel(indicationExportDTOS, null, "开单合理性", IndicationExportDTO.class, "indication.xlsx",
+        // List<IndicationExportDTO> indicationExportDTOS = exportIndication();
+        ExportDafaultVO exportDafaultVO = new ExportDafaultVO();
+        exportDafaultVO.setRuleType(1);
+        List<OtherExportDTO> otherExportDTOList = Lists.newArrayList();
+        List<DefaultExportDTO> defaultExportDTOS = exportOther(exportDafaultVO);
+        Map<String, List<DefaultExportDTO>> multiKeyList = ExtUtil.getMultiKeyList(defaultExportDTOS, CommonEnum.splitSymbol.getName(), "ruleId", "groupType");
+        for (String key : multiKeyList.keySet()) {
+            List<DefaultExportDTO> defaultList = multiKeyList.get(key);
+            DefaultExportDTO defaultExportDTO = defaultList.get(0);
+            OtherExportDTO otherExportDTO = new OtherExportDTO();
+            otherExportDTO.setRuleGroup(defaultExportDTO.getRuleGroup());
+            otherExportDTO.setMsg(defaultExportDTO.getMsg());
+            otherExportDTO.setDefaultExportDTOList(defaultList);
+            otherExportDTOList.add(otherExportDTO);
+        }
+        ExcelUtils.exportExcel(otherExportDTOList, null, "开单合理性", OtherExportDTO.class, "indication.xlsx",
                 response, 12.8f);
     }
 
@@ -301,7 +314,7 @@ public class KlRuleFacade extends KlRuleServiceImpl {
     }
 
     /**
-     * 其他值提醒输血导出
+     * 危急值化验导出
      *
      * @return
      */
@@ -315,7 +328,7 @@ public class KlRuleFacade extends KlRuleServiceImpl {
     }
 
     /**
-     * 其他值提醒输血导出
+     * 危急值辅检导出
      *
      * @return
      */