Selaa lähdekoodia

导出诊断依据

zhoutg 4 vuotta sitten
vanhempi
commit
8961a4fa0b

+ 0 - 86
src/main/java/com/diagbot/entity/KlDiagnoseDetail.java

@@ -1,11 +1,8 @@
 package com.diagbot.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * <p>
@@ -20,42 +17,6 @@ public class KlDiagnoseDetail implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 主键
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 是否删除,N:未删除,Y:删除
-     */
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间,如果时间是1970年则表示纪录未修改
-     */
-    private Date gmtModified;
-
-    /**
-     * 创建人姓名
-     */
-    private String creator;
-
-    /**
-     * 修改人姓名
-     */
-    private String modifier;
-
-    /**
-     * 诊断依据表主键
-     */
-    private Long diagnoseId;
-
     /**
      * 诊断名称
      */
@@ -81,60 +42,13 @@ public class KlDiagnoseDetail implements Serializable {
      */
     private String relation;
 
-    /**
-     * 公表名称
-     */
-    private String uniqueName;
-
     /**
      * 中间结果(例如:升高|阳性,不需要校验)
      */
     private String midResult;
 
-    /**
-     * 结果
-     */
-    private String result;
-
     /**
      * 公式
      */
     private String formula;
-
-    /**
-     * 排序号
-     */
-    private Integer orderNo;
-
-    /**
-     * 校验编码错误提示
-     */
-    private String verifyCode;
-
-    /**
-     * 校验标准词错误提示
-     */
-    private String verifyStandard;
-
-    /**
-     * 校验关联词错误提示
-     */
-    private String verifyRelation;
-
-    /**
-     * 校验公表错误提示
-     */
-    private String verifyUnique;
-
-    /**
-     * 校验结果错误提示
-     */
-    private String verifyResult;
-
-    /**
-     * 校验公式错误提示
-     */
-    private String verifyFormula;
-
-
 }

+ 12 - 2
src/main/java/com/diagbot/facade/KlDiagnoseDetailFacade.java

@@ -1,7 +1,12 @@
 package com.diagbot.facade;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.diagbot.entity.KlDiagnoseDetail;
+import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.KlDiagnoseDetailServiceImpl;
+import com.diagbot.util.EntityUtil;
 import com.diagbot.vo.KlDiagnoseDetailVO;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.HashMap;
@@ -19,12 +24,17 @@ import java.util.Map;
 @Service
 public class KlDiagnoseDetailFacade extends KlDiagnoseDetailServiceImpl {
 
+    @Autowired
+    KlDiagnoseDetailFacade klDiagnoseDetailFacade;
+
     /**
      * 导出诊断依据【初版】
      */
     public void exportDiagnose() {
-        // TODO 获取全部数据、分组   Map<String, List<KlDiagnoseDetailVO>>
-
+        // 获取全部数据、分组
+        List<KlDiagnoseDetail> klDiagnoseDetailList = klDiagnoseDetailFacade.list(new QueryWrapper<KlDiagnoseDetail>()
+                .eq("is_deleted", IsDeleteEnum.N.getKey()));
+        Map<String, List<KlDiagnoseDetail>> diagnoseDetailMap = EntityUtil.makeEntityListMap(klDiagnoseDetailList, "disName");
         // TODO 获取公式,分隔编码,替换编码,组装导出数据  Map<String, List<ExportDiagnoseDTO>>
 
         // TODO 导出数据

+ 1 - 1
src/main/java/com/diagbot/web/KlDiagnoseImportController.java

@@ -24,7 +24,7 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("/klDiagnoseImport")
-@Api(tags = { "A诊断依据导入API" })
+@Api(tags = { "A诊断依据导入导出API" })
 @SuppressWarnings("unchecked")
 public class KlDiagnoseImportController {