|
@@ -5,9 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.diagbot.entity.KlConcept;
|
|
|
import com.diagbot.entity.KlConceptDetail;
|
|
|
import com.diagbot.entity.KlConceptStatic;
|
|
|
-import com.diagbot.entity.LisConfig;
|
|
|
import com.diagbot.entity.StaticExcel;
|
|
|
-import com.diagbot.entity.wrapper.LisConfigWrapper;
|
|
|
import com.diagbot.entity.wrapper.StaticExcelWrapper;
|
|
|
import com.diagbot.enums.IsDeleteEnum;
|
|
|
import com.diagbot.enums.StatusEnum;
|
|
@@ -18,7 +16,6 @@ import com.diagbot.util.BeanUtil;
|
|
|
import com.diagbot.util.ExcelUtils;
|
|
|
import com.diagbot.util.ListUtil;
|
|
|
import com.diagbot.util.UserUtils;
|
|
|
-import com.diagbot.vo.MappingConfigVO;
|
|
|
import org.apache.commons.compress.utils.Lists;
|
|
|
import org.springframework.beans.BeanUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -27,7 +24,6 @@ import org.springframework.stereotype.Component;
|
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
|
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
-import java.util.ArrayList;
|
|
|
import java.util.Date;
|
|
|
import java.util.HashMap;
|
|
|
import java.util.List;
|
|
@@ -59,6 +55,17 @@ public class StaticImportFacade {
|
|
|
ExcelUtils.exportExcel(Lists.newArrayList(), null, "sheet1", StaticExcel.class, fileName, response, 12.8f);
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 导出文件标题
|
|
|
+ *
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ public String getTitle() {
|
|
|
+ String title = "说明\n" +
|
|
|
+ "类型:100-疾病、101-药品通用名、106-手术和操作、107-实验室检查套餐、108-实验室检查子项目、109-辅助检查项目、110-辅助检查子项目、124-量表、123-护理、130-政策法规;\n" +
|
|
|
+ "内容类型:1-静态信息,2-注意事项,3-临床路径,4-治疗方案;";
|
|
|
+ return title;
|
|
|
+ }
|
|
|
|
|
|
/**
|
|
|
* 实体批量导入
|
|
@@ -102,7 +109,7 @@ public class StaticImportFacade {
|
|
|
throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "校验失败,请根据模板进行数据导入");
|
|
|
}
|
|
|
try {
|
|
|
- originList = ExcelUtils.importExcel(file, 1, 1, StaticExcel.class);
|
|
|
+ originList = ExcelUtils.importExcel(file, 0, 1, StaticExcel.class);
|
|
|
} catch (ExcelImportException e) {
|
|
|
|
|
|
} catch (CommonException e) {
|
|
@@ -147,9 +154,6 @@ public class StaticImportFacade {
|
|
|
nameAndTypeMap_exist = conceptList.stream()
|
|
|
.collect(Collectors.toMap(k -> k.getLibName() + "_" + k.getLibType(), v -> v.getId()));
|
|
|
conceptIdList = conceptList.stream().map(KlConcept::getId).collect(Collectors.toList());
|
|
|
- } else {
|
|
|
- //标准词校验不通过,结束
|
|
|
- return null;
|
|
|
}
|
|
|
//校验标准词是否存在
|
|
|
for (StaticExcelWrapper item : list) {
|
|
@@ -161,6 +165,10 @@ public class StaticImportFacade {
|
|
|
item.setConceptId(nameAndTypeMap_exist.get(nameAndType));
|
|
|
}
|
|
|
}
|
|
|
+ //标准词校验失败
|
|
|
+ if (ListUtil.isEmpty(conceptList)) {
|
|
|
+ return list;
|
|
|
+ }
|
|
|
|
|
|
//校验静态知识是否已存在
|
|
|
List<KlConceptStatic> staticList_exist = klConceptStaticFacade.list(new QueryWrapper<KlConceptStatic>()
|