代码格式化

aipt-service/src/main/java/com/diagbot/facade/DisclaimerInformationFacade.java

@@ -25,7 +25,8 @@ public class DisclaimerInformationFacade extends DisclaimerInformationServiceImp
     public List<DisclaimerInformationDTO> getDisclaimerInformation() {
 
         QueryWrapper<DisclaimerInformation> disclaimerInformation = new QueryWrapper<>();
-        disclaimerInformation.eq("is_deleted", IsDeleteEnum.N.getKey())
+        disclaimerInformation
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("STATUS", StatusEnum.Enable.getKey())
                 .orderByAsc("order_no");
         List<DisclaimerInformation> data = list(disclaimerInformation);

aipt-service/src/main/java/com/diagbot/facade/IndexDataFacade.java

@@ -76,7 +76,7 @@ public class IndexDataFacade {
         for (String key : dataMap.keySet()) {
             IndexDTO itemIndexDTO = new IndexDTO();
             itemIndexDTO.setItemName(key);
-            
+
             List<String> indexUnits = new ArrayList<String>();
             List<String> indexValues = new ArrayList<String>();
             List<Integer> isAbnormals = new ArrayList<Integer>();

aipt-service/src/main/java/com/diagbot/facade/VersionInfoFacade.java

@@ -44,7 +44,8 @@ public class VersionInfoFacade extends VersionInfoServiceImpl {
         }
         //查询最新的一条版本信息
         QueryWrapper<VersionInfo> versionInfoQuery = new QueryWrapper<>();
-        versionInfoQuery.eq("is_deleted", IsDeleteEnum.N.getKey())
+        versionInfoQuery
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("product_type", versionVO.getProductType())
                 .eq("STATUS", StatusEnum.Enable.getKey())
                 .orderByDesc("gmt_modified");

icss-service/src/main/java/com/diagbot/facade/LisExcelResFacade.java

@@ -46,7 +46,7 @@ public class LisExcelResFacade {
     TranServiceClient tranServiceClient;
 
     @SuppressWarnings("null")
-	public RespDTO<LitAssayVO> lisExcelAnalysis(MultipartFile file, LisHospitalCodeVO lisHospitalCodeVO, HttpServletRequest request) {
+    public RespDTO<LitAssayVO> lisExcelAnalysis(MultipartFile file, LisHospitalCodeVO lisHospitalCodeVO, HttpServletRequest request) {
 
         List<String> messages = new ArrayList<>();
         List<LisExcelWrapperVO> lisExcelWrapperList = new ArrayList<>();
@@ -110,15 +110,15 @@ public class LisExcelResFacade {
                                     }
                                     LisExcelWrapperVO lisExcelWrapper = new LisExcelWrapperVO();
 
-                                    
+
                                     lisExcelWrapper.setMealName(mealName);
                                     lisExcelWrapper.setItemName(itemName);
-                                    String assembly = mealName+"--";
-                                    if (!assemblys.contains(assembly)){
+                                    String assembly = mealName + "--";
+                                    if (!assemblys.contains(assembly)) {
                                         assemblys.add(assembly);
                                     }
-                                    assembly = mealName+"--"+itemName;
-                                    if (!assemblys.contains(assembly)){
+                                    assembly = mealName + "--" + itemName;
+                                    if (!assemblys.contains(assembly)) {
                                         assemblys.add(assembly);
                                     }
                                     //  lisExcelWrapper.setUniqueName(uniqueName);
@@ -167,12 +167,12 @@ public class LisExcelResFacade {
                         .collect(Collectors.toMap(LisConfigDTO::getAssembly, LisConfigDTO::getUniqueName));
                 List<LisExcelWrapperVO> lisExcelWrapperListNew = new ArrayList<>();
                 for (LisExcelWrapperVO lisExcelWrapperNew : lisExcelWrapperList) {
-                    String assemblymeal = lisExcelWrapperNew.getMealName()+"--";
-                    if(null != listMap.get(assemblymeal)){
+                    String assemblymeal = lisExcelWrapperNew.getMealName() + "--";
+                    if (null != listMap.get(assemblymeal)) {
                         lisExcelWrapperNew.setUniquemealName(listMap.get(assemblymeal));
                     }
-                    String item = lisExcelWrapperNew.getMealName()+"--"+lisExcelWrapperNew.getItemName();
-                    if(null != listMap.get(item)){
+                    String item = lisExcelWrapperNew.getMealName() + "--" + lisExcelWrapperNew.getItemName();
+                    if (null != listMap.get(item)) {
                         lisExcelWrapperNew.setUniqueName(listMap.get(item));
                     }
                     lisExcelWrapperListNew.add(lisExcelWrapperNew);

icss-service/src/main/java/com/diagbot/facade/TemplateInfoFacade.java

@@ -75,7 +75,8 @@ public class TemplateInfoFacade extends TemplateInfoServiceImpl {
     public boolean updateByIdUsName(TemplateInfoRevampVO templateInfoRevampVO) {
         //1.先判断数据是否存在有效
         QueryWrapper<TemplateInfo> templateInfoFand = new QueryWrapper<>();
-        templateInfoFand.eq("is_deleted", IsDeleteEnum.N.getKey())
+        templateInfoFand
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("id", templateInfoRevampVO.getId());
         int sum = count(templateInfoFand);
         if (sum == 0) {
@@ -166,7 +167,8 @@ public class TemplateInfoFacade extends TemplateInfoServiceImpl {
         String[] splitIds = substring.split(",");
         //把分割的id数据传入对象中，在表中批量删除
         UpdateWrapper<TemplateInfo> templateInfoNew = new UpdateWrapper<>();
-        templateInfoNew.in("id", ListUtil.arrayToList(splitIds))
+        templateInfoNew
+                .in("id", ListUtil.arrayToList(splitIds))
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .set("is_deleted", IsDeleteEnum.Y.getKey())
                 //.set("modifier",UserUtils.getCurrentPrincipleID())
@@ -177,52 +179,30 @@ public class TemplateInfoFacade extends TemplateInfoServiceImpl {
     }
 
     /**
-     * 
      * @param page
      * @param templateInfoPageVO
      * @return
      */
-	public IPage<TemplateInfoPageDTO> getTemplatePageAlls(Page page, TemplateInfoPageVO templateInfoPageVO) {
-/*		  //根据传入的医生id和部门id还有医院id在数据表中查出相应的模板数据
+    public IPage<TemplateInfoPageDTO> getTemplatePageAlls(Page page, TemplateInfoPageVO templateInfoPageVO) {
+        IPage<TemplateInfoPageDTO> TemplateInfoData = getTemplatePages(templateInfoPageVO);
+        return TemplateInfoData;
+    }
 
+    /**
+     * @param templateIdVO
+     * @return
+     */
+    public TemplateInfoDTO getTemplateIdAlls(TemplateIdVO templateIdVO) {
+        //根据传入的医生id和部门id还有医院id在数据表中查出相应的模板数据
         QueryWrapper<TemplateInfo> templateInfoQuery = new QueryWrapper<>();
-        Map<String, Object> mapAll = new HashMap<>();
-        mapAll.put("hospital_dept_id", templateInfoPageVO.getHospitalDeptId());
-        mapAll.put("doctor_id", templateInfoPageVO.getDoctorId());
-        mapAll.put("hospital_id", templateInfoPageVO.getHospitalId());
-        mapAll.put("is_deleted", IsDeleteEnum.N.getKey());
-        mapAll.put("type", templateInfoPageVO.getType());
-        if (templateInfoPageVO.getSex() != null) {
-            templateInfoQuery.allEq(mapAll).in("sex", 3, templateInfoPageVO.getSex()).orderByDesc("gmt_create");
-        } else {
-            templateInfoQuery.allEq(mapAll).orderByDesc("gmt_create");
-        }
-        IPage<TemplateInfoPageDTO> TemplateInfoData =page(page, templateInfoQuery);
-        List<TemplateInfoPageDTO> datas = TemplateInfoData.getRecords();
-        List<TemplateInfoPageDTO> data = new ArrayList<TemplateInfoPageDTO>();
-        //过滤
-        data = BeanUtil.listCopyTo(datas, TemplateInfoPageDTO.class);
-        
-		return TemplateInfoData.setRecords(data);*/
-		IPage<TemplateInfoPageDTO> TemplateInfoData = getTemplatePages(templateInfoPageVO);
-		return TemplateInfoData;
-	}
-
-	/**
-	 * 
-	 * @param templateIdVO
-	 * @return
-	 */
-	public TemplateInfoDTO getTemplateIdAlls(TemplateIdVO templateIdVO) {
-		 //根据传入的医生id和部门id还有医院id在数据表中查出相应的模板数据
-        QueryWrapper<TemplateInfo> templateInfoQuery = new QueryWrapper<>();
-        templateInfoQuery.eq("id", templateIdVO.getId())
-        .eq("is_deleted", IsDeleteEnum.N.getKey());    
+        templateInfoQuery
+                .eq("id", templateIdVO.getId())
+                .eq("is_deleted", IsDeleteEnum.N.getKey());
         TemplateInfoDTO data = new TemplateInfoDTO();
         TemplateInfo datas = getOne(templateInfoQuery, false);
         //过滤
         BeanUtil.copyProperties(datas, data);
         return data;
-	}
+    }
 
 }

knowledgeman-service/src/main/java/com/diagbot/facade/DiagnoseImportFacade.java

@@ -46,7 +46,6 @@ import com.diagbot.vo.DiagnosticAllExportVO;
 import com.diagbot.vo.DiagnosticBasisExportVO;
 
 /**
- * 
  * @author wangfeng
  * @Description: TODO
  * @date 2019年8月8日 下午1:30:53
@@ -54,329 +53,324 @@ import com.diagbot.vo.DiagnosticBasisExportVO;
 @Component
 public class DiagnoseImportFacade {
 
-	@Autowired
-	DiagnoseQuestionService diagnoseQuestionService;
-	@Autowired
-	@Qualifier("diagnoseDetailServiceImpl")
-	DiagnoseDetailService diagnoseDetailService;
-
-	@SuppressWarnings("null")
-	public RespDTO<DiagnoseImportDTO> importDiagnosticBasisAll(MultipartFile file, HttpServletRequest request) {
-
-		List<String> messages = new ArrayList<>();
-		InputStream inputStream = null;
-		DiagnoseImportDTO diagnoseImportDTO = new DiagnoseImportDTO();
-		List<FeatureDTO> featureList = new ArrayList<FeatureDTO>();
-		List<EquationDTO> equationList = new ArrayList<EquationDTO>();
-		List<String> assemblys = new ArrayList<String>();
-		Workbook wb = null;
-		try {
-			if (!file.isEmpty()) {
-				inputStream = file.getInputStream();
-				if (inputStream.available() > 512000) {
-					messages.add("化验文件最大支持500KB！");
-				} else {
-					String fileName = file.getOriginalFilename();
-					if (fileName.lastIndexOf(".") != -1) {
-						String type = fileName.substring(fileName.lastIndexOf("."));
-						if (type.equals(".xls")) {
-							wb = new HSSFWorkbook(inputStream);
-						} else if (type.equals(".xlsx")) {
-							wb = new XSSFWorkbook(inputStream);
-						}
-						if (wb != null) {
-							Sheet sheet = wb.getSheetAt(0);
-							diagnoseImportDTO.setDisName(sheet.getSheetName());
-							int count = 0;
-							String name, code, standardWord, associatedWord, consequence;
-							for (Row row : sheet) {
-								count++;
-								try {
-									if (row != null) {
-										name = getValue(row.getCell(0)).trim().replace(" ", "");
-										code = getValue(row.getCell(1)).trim().replace(" ", "");
-										standardWord = getValue(row.getCell(2)).trim();
-										associatedWord = getValue(row.getCell(3)).trim();
-										consequence = getValue(row.getCell(4)).trim();
-
-									} else {
-										name = null;
-										code = null;
-										standardWord = null;
-										associatedWord = null;
-										consequence = null;
-
-									}
-
-									/*
-									 * if (StringUtil.isEmpty(name) &&
-									 * StringUtil.isEmpty(itemName) &&
-									 * StringUtil.isEmpty(value) &&
-									 * StringUtil.isEmpty(name)) { continue; }
-									 */
-
-									if (count == 1 && name.equals("类型")) {
-										continue;
-									}
-
-									if (StringUtil.isEmpty(name)) {
-										messages.add("第" + count + "行数据不规范,类型必填;");
-										continue;
-									}
-									FeatureDTO feature = new FeatureDTO();
-									EquationDTO equation = new EquationDTO();
-									if (code.equals("")) {
-										equation.setType(name);
-										equation.setAssociated(associatedWord);
-										equationList.add(equation);
-									} else {
-										feature.setType(name);
-										feature.setCode(code);
-										feature.setResult(consequence);
-										feature.setAssociated(associatedWord);
-										feature.setStandard(standardWord);
-										featureList.add(feature);
-
-									}
-
-								} catch (Exception e) {
-									e.printStackTrace();
-									throw new CommonException(CommonErrorCode.NOT_EXISTS, e.toString());
-									// logger.error("",e);
-								}
-							}
-						} else {
-							// throw new
-							// CommonException(CommonErrorCode.NOT_EXISTS,
-							// "非excel文件无法解析！");
-							messages.add("非excel文件无法解析！");
-						}
-					} else {
-						// throw new CommonException(CommonErrorCode.NOT_EXISTS,
-						// "未知文件无法解析！");
-						messages.add("未知文件无法解析！");
-					}
-				}
-			} else {
-				// throw new CommonException(CommonErrorCode.NOT_EXISTS,
-				// "无文件上传！");
-				messages.add("无文件上传！");
-			}
-
-			diagnoseImportDTO.setEquation(equationList);
-			diagnoseImportDTO.setFeature(featureList);
-			diagnoseImportDTO.setMessages(messages);
-			return RespDTO.onSuc(diagnoseImportDTO);
-		} catch (Exception e) {
-			e.printStackTrace();
-			throw new CommonException(CommonErrorCode.NOT_EXISTS, "化验excel文件解析出错！");
-			// return response.failure("化验excel文件解析出错！");
-		} finally {
-			try {
-				if (inputStream != null) {
-					inputStream.close();
-				}
-				if (wb != null) {
-					wb.close();
-				}
-			} catch (Exception e) {
-			}
-		}
-	}
-
-	private String getValue(Cell cell) {
-		try {
-			Object obj = null;
-			switch (cell.getCellTypeEnum()) {
-			case BOOLEAN:
-				obj = cell.getBooleanCellValue();
-				break;
-			case ERROR:
-				obj = cell.getErrorCellValue();
-				break;
-			case NUMERIC:
-				if (HSSFDateUtil.isCellDateFormatted(cell)) {
-					Date date = cell.getDateCellValue();
-					obj = DateFormatUtils.format(date, "yyyy-MM-dd");
-				} else {
-					obj = cell.getNumericCellValue();
-					DecimalFormat df = new DecimalFormat();
-					obj = df.format(obj);
-				}
-
-				// obj = cell.getNumericCellValue();
-				break;
-			case STRING:
-				obj = cell.getStringCellValue();
-				break;
-			default:
-				break;
-			}
-			return obj.toString();
-		} catch (Exception e) {
-			return "";
-		}
-	}
-
-	public void exportDiagnosticBasis(DiagnosticBasisExportVO diaExportVO, HttpServletResponse response) {
-		QueryWrapper<DiagnoseQuestion> diaQuery = new QueryWrapper<>();
-		diaQuery.like("dis_name", diaExportVO.getDisName()).like("question_name", diaExportVO.getQuestion())
-				.like("type", diaExportVO.getType()).eq("is_deleted", IsDeleteEnum.N.getKey()).orderByDesc("gmt_modified");
-		List<DiagnoseQuestion> datas = diagnoseQuestionService.list(diaQuery);
-
-		GsonUtil.toJson(datas);
-		System.out.println(GsonUtil.toJson(datas));
-		List<String> listName = new ArrayList<>();
-
-		listName.add("归属诊断");
-		listName.add("标准术语*");
-		listName.add("类型*");
-		listName.add("术语同义词*(多个时用\",\"隔开,必须需要包含本体)");
-		listName.add("标准术语说明");
-		listName.add("性别");
-		listName.add("最小年龄");
-		listName.add("最大年龄");
-
-		List<String> listId = new ArrayList<>();
-		listId.add("disName");
-		listId.add("term");
-		listId.add("type");
-		listId.add("termSynonym");
-		listId.add("TermNote");
-		listId.add("sex");
-		listId.add("minAge");
-		listId.add("maxAge");
-
-		List<DiagnosticBasisExportDTO> list = new ArrayList<>();
-		for (int i = 0; i < datas.size(); i++) {
-			DiagnoseQuestion diagnose = datas.get(i);
-			list.add(new DiagnosticBasisExportDTO(diagnose.getDisName(), diagnose.getQuestionName(),
-					getType(diagnose.getType(), diagnose.getQuestionType()), diagnose.getQuestionName(), "", "通用", "0",
-					"200"));
-
-		}
-		response.setContentType("text/html;charset=UTF-8");
-		ExportBeanExcelUtil ex = new ExportBeanExcelUtil();
-		ex.exportExcelNew("诊断依据问题词", listName, listId, list, response);
-
-	}
-
-	/**
-	 * 
-	 * @param diaAllExportVO
-	 * @param response
-	 */
-	public void exportDiagnosticAll(DiagnosticAllExportVO diaAllExportVO, HttpServletResponse response) {
-		QueryWrapper<DiagnoseDetail> diaQuery = new QueryWrapper<>();
-		diaQuery.eq("diagnose_id", diaAllExportVO.getDiagnoseId()).eq("is_deleted", IsDeleteEnum.N.getKey());
-		List<DiagnoseDetail> datas = diagnoseDetailService.list(diaQuery);
-
-		GsonUtil.toJson(datas);
-		System.out.println(GsonUtil.toJson(datas));
-		List<String> listName = new ArrayList<>();
-
-		listName.add("类型");
-		listName.add("序号");
-		listName.add("标准词*");
-		listName.add("是否需要病史采集");
-		listName.add("关联词");
-		listName.add("结果");
-
-		List<String> listId = new ArrayList<>();
-		listId.add("type");
-		listId.add("code");
-		listId.add("standard");
-		listId.add("historyTaking");
-		listId.add("relation");
-		listId.add("result");
-
-		
-		String disName =(datas.size()>0)?datas.get(0).getDisName():" ";
-		List<DiagnosticAllExportDTO> list = new ArrayList<>();
-		for (int i = 0; i < datas.size(); i++) {
-			DiagnoseDetail diagnose = datas.get(i);
-			disName = diagnose.getDisName();
-			list.add(new DiagnosticAllExportDTO(getDisType(diagnose.getType()), diagnose.getCode(),
-					diagnose.getStandard(), "", getRelation(diagnose.getType(),diagnose), diagnose.getResult()));
-
-		}
-		response.setContentType("text/html;charset=UTF-8");
-		ExportBeanExcelUtil ex = new ExportBeanExcelUtil();
-		ex.exportExcelNew(disName, listName, listId, list, response);
-
-	}
-
-	/**
-	 * 导出类型转换
-	 * 
-	 * @param type
-	 * @param questionType
-	 * @return
-	 */
-	public String getType(Integer type, Integer questionType) {
-		String typeName = "";
-		if (type == DiagnoseFeatureTypeEnum.Dis.getKey()) {
-			typeName = TermEnum.getName(0);
-		} else if (type == DiagnoseFeatureTypeEnum.Symptom.getKey()) {
-			typeName = TermEnum.getName(1);
-		} else if (type == DiagnoseFeatureTypeEnum.Vital.getKey()) {
-			typeName = TermEnum.getName(2);
-		} else if (type == DiagnoseFeatureTypeEnum.Lis.getKey()) {
-			if (questionType == 2) {
-				typeName = TermEnum.getName(3);
-			}
-			if (questionType == 3) {
-				typeName = TermEnum.getName(4);
-			}
-			if (questionType == 4) {
-				typeName = TermEnum.getName(5);
-			}
-		} else if (type == DiagnoseFeatureTypeEnum.Pacs.getKey()) {
-			if (questionType == 2) {
-				typeName = TermEnum.getName(6);
-			}
-			if (questionType == 3) {
-				typeName = TermEnum.getName(7);
-			}
-		} else if (type == DiagnoseFeatureTypeEnum.Antidiastole.getKey()) {
-			typeName = TermEnum.getName(8);
-		} else if (type == DiagnoseFeatureTypeEnum.History.getKey()) {
-			typeName = TermEnum.getName(8);
-		} else if (type == DiagnoseFeatureTypeEnum.Cause.getKey()) {
-			typeName = TermEnum.getName(9);
-		} else if (type == DiagnoseFeatureTypeEnum.CourseOfDisease.getKey()) {
-			typeName = TermEnum.getName(10);
-		} else if (type == DiagnoseFeatureTypeEnum.Other.getKey()) {
-			typeName = TermEnum.getName(10);
-		}
-		return typeName;
-	}
-	/**
-	 * 导出公式类型转换
-	 * 
-	 */
-	public String getDisType(Integer type) {
-		String typeName = "";
-		
-		typeName = DiagnoseFeatureTypeEnum.getName(type);
-		if(typeName == null){
-			typeName = DiagnoseTypeEnum.getName(type);
-		}
-		return typeName;
-	}
-	/**
-	 * 导出公式和标准词切换
-	 * 
-	 */
-	public String getRelation(Integer type, DiagnoseDetail diagnose ) {
-		String typeName = "";
-		String relation = "";
-		typeName = DiagnoseFeatureTypeEnum.getName(type);
-		relation =  diagnose.getRelation();
-		if(typeName == null ){
-			relation =  diagnose.getFormula();
-		}
-		return relation;
-	}
-	
+    @Autowired
+    DiagnoseQuestionService diagnoseQuestionService;
+    @Autowired
+    @Qualifier("diagnoseDetailServiceImpl")
+    DiagnoseDetailService diagnoseDetailService;
+
+    @SuppressWarnings("null")
+    public RespDTO<DiagnoseImportDTO> importDiagnosticBasisAll(MultipartFile file, HttpServletRequest request) {
+
+        List<String> messages = new ArrayList<>();
+        InputStream inputStream = null;
+        DiagnoseImportDTO diagnoseImportDTO = new DiagnoseImportDTO();
+        List<FeatureDTO> featureList = new ArrayList<FeatureDTO>();
+        List<EquationDTO> equationList = new ArrayList<EquationDTO>();
+        List<String> assemblys = new ArrayList<String>();
+        Workbook wb = null;
+        try {
+            if (!file.isEmpty()) {
+                inputStream = file.getInputStream();
+                if (inputStream.available() > 512000) {
+                    messages.add("化验文件最大支持500KB！");
+                } else {
+                    String fileName = file.getOriginalFilename();
+                    if (fileName.lastIndexOf(".") != -1) {
+                        String type = fileName.substring(fileName.lastIndexOf("."));
+                        if (type.equals(".xls")) {
+                            wb = new HSSFWorkbook(inputStream);
+                        } else if (type.equals(".xlsx")) {
+                            wb = new XSSFWorkbook(inputStream);
+                        }
+                        if (wb != null) {
+                            Sheet sheet = wb.getSheetAt(0);
+                            diagnoseImportDTO.setDisName(sheet.getSheetName());
+                            int count = 0;
+                            String name, code, standardWord, associatedWord, consequence;
+                            for (Row row : sheet) {
+                                count++;
+                                try {
+                                    if (row != null) {
+                                        name = getValue(row.getCell(0)).trim().replace(" ", "");
+                                        code = getValue(row.getCell(1)).trim().replace(" ", "");
+                                        standardWord = getValue(row.getCell(2)).trim();
+                                        associatedWord = getValue(row.getCell(3)).trim();
+                                        consequence = getValue(row.getCell(4)).trim();
+
+                                    } else {
+                                        name = null;
+                                        code = null;
+                                        standardWord = null;
+                                        associatedWord = null;
+                                        consequence = null;
+
+                                    }
+
+                                    if (count == 1 && name.equals("类型")) {
+                                        continue;
+                                    }
+
+                                    if (StringUtil.isEmpty(name)) {
+                                        messages.add("第" + count + "行数据不规范,类型必填;");
+                                        continue;
+                                    }
+                                    FeatureDTO feature = new FeatureDTO();
+                                    EquationDTO equation = new EquationDTO();
+                                    if (code.equals("")) {
+                                        equation.setType(name);
+                                        equation.setAssociated(associatedWord);
+                                        equationList.add(equation);
+                                    } else {
+                                        feature.setType(name);
+                                        feature.setCode(code);
+                                        feature.setResult(consequence);
+                                        feature.setAssociated(associatedWord);
+                                        feature.setStandard(standardWord);
+                                        featureList.add(feature);
+
+                                    }
+
+                                } catch (Exception e) {
+                                    e.printStackTrace();
+                                    throw new CommonException(CommonErrorCode.NOT_EXISTS, e.toString());
+                                    // logger.error("",e);
+                                }
+                            }
+                        } else {
+                            // throw new
+                            // CommonException(CommonErrorCode.NOT_EXISTS,
+                            // "非excel文件无法解析！");
+                            messages.add("非excel文件无法解析！");
+                        }
+                    } else {
+                        // throw new CommonException(CommonErrorCode.NOT_EXISTS,
+                        // "未知文件无法解析！");
+                        messages.add("未知文件无法解析！");
+                    }
+                }
+            } else {
+                // throw new CommonException(CommonErrorCode.NOT_EXISTS,
+                // "无文件上传！");
+                messages.add("无文件上传！");
+            }
+
+            diagnoseImportDTO.setEquation(equationList);
+            diagnoseImportDTO.setFeature(featureList);
+            diagnoseImportDTO.setMessages(messages);
+            return RespDTO.onSuc(diagnoseImportDTO);
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new CommonException(CommonErrorCode.NOT_EXISTS, "化验excel文件解析出错！");
+            // return response.failure("化验excel文件解析出错！");
+        } finally {
+            try {
+                if (inputStream != null) {
+                    inputStream.close();
+                }
+                if (wb != null) {
+                    wb.close();
+                }
+            } catch (Exception e) {
+            }
+        }
+    }
+
+    private String getValue(Cell cell) {
+        try {
+            Object obj = null;
+            switch (cell.getCellTypeEnum()) {
+                case BOOLEAN:
+                    obj = cell.getBooleanCellValue();
+                    break;
+                case ERROR:
+                    obj = cell.getErrorCellValue();
+                    break;
+                case NUMERIC:
+                    if (HSSFDateUtil.isCellDateFormatted(cell)) {
+                        Date date = cell.getDateCellValue();
+                        obj = DateFormatUtils.format(date, "yyyy-MM-dd");
+                    } else {
+                        obj = cell.getNumericCellValue();
+                        DecimalFormat df = new DecimalFormat();
+                        obj = df.format(obj);
+                    }
+
+                    // obj = cell.getNumericCellValue();
+                    break;
+                case STRING:
+                    obj = cell.getStringCellValue();
+                    break;
+                default:
+                    break;
+            }
+            return obj.toString();
+        } catch (Exception e) {
+            return "";
+        }
+    }
+
+    public void exportDiagnosticBasis(DiagnosticBasisExportVO diaExportVO, HttpServletResponse response) {
+        QueryWrapper<DiagnoseQuestion> diaQuery = new QueryWrapper<>();
+        diaQuery.like("dis_name", diaExportVO.getDisName()).like("question_name", diaExportVO.getQuestion())
+                .like("type", diaExportVO.getType()).eq("is_deleted", IsDeleteEnum.N.getKey()).orderByDesc("gmt_modified");
+        List<DiagnoseQuestion> datas = diagnoseQuestionService.list(diaQuery);
+
+        GsonUtil.toJson(datas);
+        System.out.println(GsonUtil.toJson(datas));
+        List<String> listName = new ArrayList<>();
+
+        listName.add("归属诊断");
+        listName.add("标准术语*");
+        listName.add("类型*");
+        listName.add("术语同义词*(多个时用\",\"隔开,必须需要包含本体)");
+        listName.add("标准术语说明");
+        listName.add("性别");
+        listName.add("最小年龄");
+        listName.add("最大年龄");
+
+        List<String> listId = new ArrayList<>();
+        listId.add("disName");
+        listId.add("term");
+        listId.add("type");
+        listId.add("termSynonym");
+        listId.add("TermNote");
+        listId.add("sex");
+        listId.add("minAge");
+        listId.add("maxAge");
+
+        List<DiagnosticBasisExportDTO> list = new ArrayList<>();
+        for (int i = 0; i < datas.size(); i++) {
+            DiagnoseQuestion diagnose = datas.get(i);
+            list.add(new DiagnosticBasisExportDTO(diagnose.getDisName(),
+                    diagnose.getQuestionName(),
+                    getType(diagnose.getType(), diagnose.getQuestionType()),
+                    diagnose.getQuestionName(), "", "通用", "0",
+                    "200"));
+
+        }
+        response.setContentType("text/html;charset=UTF-8");
+        ExportBeanExcelUtil ex = new ExportBeanExcelUtil();
+        ex.exportExcelNew("诊断依据问题词", listName, listId, list, response);
+
+    }
+
+    /**
+     * @param diaAllExportVO
+     * @param response
+     */
+    public void exportDiagnosticAll(DiagnosticAllExportVO diaAllExportVO, HttpServletResponse response) {
+        QueryWrapper<DiagnoseDetail> diaQuery = new QueryWrapper<>();
+        diaQuery.eq("diagnose_id", diaAllExportVO.getDiagnoseId())
+                .eq("is_deleted", IsDeleteEnum.N.getKey());
+        List<DiagnoseDetail> datas = diagnoseDetailService.list(diaQuery);
+
+        System.out.println(GsonUtil.toJson(datas));
+        List<String> listName = new ArrayList<>();
+
+        listName.add("类型");
+        listName.add("序号");
+        listName.add("标准词*");
+        listName.add("是否需要病史采集");
+        listName.add("关联词");
+        listName.add("结果");
+
+        List<String> listId = new ArrayList<>();
+        listId.add("type");
+        listId.add("code");
+        listId.add("standard");
+        listId.add("historyTaking");
+        listId.add("relation");
+        listId.add("result");
+
+
+        String disName = (datas.size() > 0) ? datas.get(0).getDisName() : " ";
+        List<DiagnosticAllExportDTO> list = new ArrayList<>();
+        for (int i = 0; i < datas.size(); i++) {
+            DiagnoseDetail diagnose = datas.get(i);
+            disName = diagnose.getDisName();
+            list.add(new DiagnosticAllExportDTO(getDisType(diagnose.getType()), diagnose.getCode(),
+                    diagnose.getStandard(), "", getRelation(diagnose.getType(), diagnose),
+                    diagnose.getResult()));
+
+        }
+        response.setContentType("text/html;charset=UTF-8");
+        ExportBeanExcelUtil ex = new ExportBeanExcelUtil();
+        ex.exportExcelNew(disName, listName, listId, list, response);
+
+    }
+
+    /**
+     * 导出类型转换
+     *
+     * @param type
+     * @param questionType
+     * @return
+     */
+    public String getType(Integer type, Integer questionType) {
+        String typeName = "";
+        if (type == DiagnoseFeatureTypeEnum.Dis.getKey()) {
+            typeName = TermEnum.getName(0);
+        } else if (type == DiagnoseFeatureTypeEnum.Symptom.getKey()) {
+            typeName = TermEnum.getName(1);
+        } else if (type == DiagnoseFeatureTypeEnum.Vital.getKey()) {
+            typeName = TermEnum.getName(2);
+        } else if (type == DiagnoseFeatureTypeEnum.Lis.getKey()) {
+            if (questionType == 2) {
+                typeName = TermEnum.getName(3);
+            }
+            if (questionType == 3) {
+                typeName = TermEnum.getName(4);
+            }
+            if (questionType == 4) {
+                typeName = TermEnum.getName(5);
+            }
+        } else if (type == DiagnoseFeatureTypeEnum.Pacs.getKey()) {
+            if (questionType == 2) {
+                typeName = TermEnum.getName(6);
+            }
+            if (questionType == 3) {
+                typeName = TermEnum.getName(7);
+            }
+        } else if (type == DiagnoseFeatureTypeEnum.Antidiastole.getKey()) {
+            typeName = TermEnum.getName(8);
+        } else if (type == DiagnoseFeatureTypeEnum.History.getKey()) {
+            typeName = TermEnum.getName(8);
+        } else if (type == DiagnoseFeatureTypeEnum.Cause.getKey()) {
+            typeName = TermEnum.getName(9);
+        } else if (type == DiagnoseFeatureTypeEnum.CourseOfDisease.getKey()) {
+            typeName = TermEnum.getName(10);
+        } else if (type == DiagnoseFeatureTypeEnum.Other.getKey()) {
+            typeName = TermEnum.getName(10);
+        }
+        return typeName;
+    }
+
+    /**
+     * 导出公式类型转换
+     */
+    public String getDisType(Integer type) {
+        String typeName = "";
+
+        typeName = DiagnoseFeatureTypeEnum.getName(type);
+        if (typeName == null) {
+            typeName = DiagnoseTypeEnum.getName(type);
+        }
+        return typeName;
+    }
+
+    /**
+     * 导出公式和标准词切换
+     */
+    public String getRelation(Integer type, DiagnoseDetail diagnose) {
+        String typeName = "";
+        String relation = "";
+        typeName = DiagnoseFeatureTypeEnum.getName(type);
+        relation = diagnose.getRelation();
+        if (typeName == null) {
+            relation = diagnose.getFormula();
+        }
+        return relation;
+    }
+
 }

knowledgeman-service/src/main/java/com/diagbot/facade/DiagnoseQuestionFacade.java

@@ -25,13 +25,15 @@ public class DiagnoseQuestionFacade  {
 	public IPage<DiagnoseQuestionPageDTO> queryQuestionPage(DiagnoseQuestionPageVO diagnoseQuestionPageVO) {
 		
 		QueryWrapper<DiagnoseQuestion> diaQuery = new QueryWrapper<>();
-		diaQuery.like("type",diagnoseQuestionPageVO.getType());
-		diaQuery.like("dis_name",diagnoseQuestionPageVO.getDisName()).like("question_name",diagnoseQuestionPageVO.getQuestionCode()).eq("is_deleted",IsDeleteEnum.N.getKey()).orderByDesc("gmt_modified");
+		diaQuery.like("type",diagnoseQuestionPageVO.getType())
+				.like("dis_name",diagnoseQuestionPageVO.getDisName())
+				.like("question_name",diagnoseQuestionPageVO.getQuestionCode())
+				.eq("is_deleted",IsDeleteEnum.N.getKey())
+				.orderByDesc("gmt_modified");
 				
 		IPage<DiagnoseQuestionPageDTO> datas = diagnoseQuestionService.page(diagnoseQuestionPageVO, diaQuery);
 		
 		return datas;
 	}
-	
 
 }

knowledgeman-service/src/main/java/com/diagbot/facade/EvaluationFacade.java

@@ -80,12 +80,14 @@ public class EvaluationFacade extends EvaluationServiceImpl {
 
     /**
      * 获取慢病标签组维护
+     *
      * @param evaluationModuleDiseaseIdVO
      * @return
      */
     public List<EvaluationModuleAllDTO> getEvaluationModuleList(EvaluationDiseaseIdVO evaluationModuleDiseaseIdVO) {
         QueryWrapper<Evaluation> evaluationModuleQuery = new QueryWrapper<>();
-        evaluationModuleQuery.eq("concept_id", evaluationModuleDiseaseIdVO.getDiseaseId())
+        evaluationModuleQuery
+                .eq("concept_id", evaluationModuleDiseaseIdVO.getDiseaseId())
                 .eq("is_deleted", IsDeleteEnum.N.getKey());
         List<Evaluation> datas = list(evaluationModuleQuery);
         // 过滤
@@ -95,6 +97,7 @@ public class EvaluationFacade extends EvaluationServiceImpl {
 
     /**
      * 修改获取慢病标签组维护
+     *
      * @param evaluationModuleListVO
      * @return
      */
@@ -127,6 +130,7 @@ public class EvaluationFacade extends EvaluationServiceImpl {
 
     /**
      * 添加管理评估
+     *
      * @param evaluationModuleListVO
      * @return
      */
@@ -168,16 +172,17 @@ public class EvaluationFacade extends EvaluationServiceImpl {
 
     /**
      * 删除慢病标签组维护
+     *
      * @param evaluationDiseaseIdVO
      * @return
      */
     public boolean cancelEvaluationModuleAll(EvaluationDiseaseIdVO evaluationDiseaseIdVO) {
         UpdateWrapper<Evaluation> evaluaNew = new UpdateWrapper<>();
         evaluaNew.eq("concept_id", evaluationDiseaseIdVO.getDiseaseId())
-                .eq("is_deleted", IsDeleteEnum.N.getKey())
-                .set("is_deleted", IsDeleteEnum.Y.getKey())
-                .set("modifier", UserUtils.getCurrentPrincipleID())
-                .set("gmt_modified", DateUtil.now());
+                 .eq("is_deleted", IsDeleteEnum.N.getKey())
+                 .set("is_deleted", IsDeleteEnum.Y.getKey())
+                 .set("modifier", UserUtils.getCurrentPrincipleID())
+                 .set("gmt_modified", DateUtil.now());
         return update(new Evaluation(), evaluaNew);
     }
 

knowledgeman-service/src/main/java/com/diagbot/facade/IndexConfigFacade.java

@@ -43,162 +43,173 @@ import com.diagbot.vo.IndexConfigVO;
 @Component
 public class IndexConfigFacade extends IndexConfigServiceImpl {
 
-	@Autowired
-	@Qualifier("indexConfigServiceImpl")
-	IndexConfigService indexConfigService;
-	@Autowired
-	UserServiceClient userServiceClient;
-	@Autowired
-	ConceptFacade conceptFacade;
-
-	/**
-	 * 分页模糊查询慢病指标值关联维护
-	 * @param indexConfigDiseaseNameVO
-	 * @return
-	 */
-	public IPage<IndexConfigDTO> queryIndexConfigPage(IndexConfigDiseaseNameVO indexConfigDiseaseNameVO) {
-		IPage<IndexConfigDTO> datas = this.queryIndexConfigPageAlls(indexConfigDiseaseNameVO);
-		List<IndexConfigDTO> data = datas.getRecords();
-		List<String> modifierid = data.stream().map(ac -> ac.getModifier()).collect(Collectors.toList());
-		Map<String, String> userNames = new HashMap<>();
-		if (ListUtil.isNotEmpty(modifierid)) {
-			RespDTO<Map<String, String>> userNamesDTO = userServiceClient.getUserInfoByIds(modifierid);
-			if (RespDTOUtil.respIsNG(userNamesDTO)) {
-				throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "获取所有用户信息失败");
-			}
-			userNames = userNamesDTO.data;
-		}
-
-		for (IndexConfigDTO evalua : data) {
-			evalua.setModifier(userNames.get(evalua.getModifier()));
-		}
-		return datas;
-	}
-
-	/**
-	 * 获取慢病指标值关联维护
-	 * @param indexConfigDiseaseIdVO
-	 * @return
-	 */
-	public List<IndexConfigAllDTO> getIndexConfigLists(IndexConfigDiseaseIdVO indexConfigDiseaseIdVO) {
-		QueryWrapper<IndexConfig> IndexConfigQuery = new QueryWrapper<IndexConfig>();
-		IndexConfigQuery.eq("disease_id", indexConfigDiseaseIdVO.getDiseaseId()).eq("is_deleted",
-				IsDeleteEnum.N.getKey());
-		List<IndexConfig> datas = list(IndexConfigQuery);
-		// 过滤
-		List<IndexConfigAllDTO> data = BeanUtil.listCopyTo(datas, IndexConfigAllDTO.class);
-
-		List<Long> conceptIds = data.stream().map(ac -> ac.getConceptId()).collect(Collectors.toList());
-		ConceptSearchVO conceptSearchVO = new ConceptSearchVO();
-		conceptSearchVO.setConceptIds(conceptIds);
-		Map<Long, String> indexUniques = new HashMap<>();
-		if (ListUtil.isNotEmpty(conceptIds)) {
-			indexUniques = conceptFacade.getConceptNameMap(conceptSearchVO);
-		}
-
-		for (IndexConfigAllDTO evalua : data) {
-			evalua.setIndexUnique(indexUniques.get(evalua.getConceptId()));
-		}
-
-		return data;
-	}
-
-	/**
-	 * 慢病指标值关联维护修改
-	 * @param indexConfigListVO
-	 * @return
-	 */
-	public boolean updateIndexConfigList(IndexConfigListVO indexConfigListVO) {
-		boolean res = false;
-		if (indexConfigListVO != null && ListUtil.isNotEmpty(indexConfigListVO.getIndexConfigData())) {
-			IndexConfigDiseaseIdVO indexConfigDiseaseIdVO = new IndexConfigDiseaseIdVO();
-			indexConfigDiseaseIdVO.setDiseaseId(indexConfigListVO.getDiseaseId());
-			
-			UpdateWrapper<IndexConfig> IndexConfigNew = new UpdateWrapper<>();
-			IndexConfigNew.eq("disease_id", indexConfigListVO.getDiseaseId());
-			res = indexConfigService.remove(IndexConfigNew);
-			List<IndexConfig> IndexConfigLsit = new ArrayList<IndexConfig>();
-			List<IndexConfigVO> data = indexConfigListVO.getIndexConfigData();
-			Date optDate = DateUtil.now();
-			String operator = UserUtils.getCurrentPrincipleID();
-			for (IndexConfigVO dataNew : data) {
-				IndexConfig IndexConfig = new IndexConfig();
-				BeanUtil.copyProperties(dataNew, IndexConfig);
-				IndexConfig.setGmtCreate(optDate);
-				IndexConfig.setGmtModified(optDate);
-				IndexConfig.setCreator(operator);
-				IndexConfig.setModifier(operator);
-				IndexConfigLsit.add(IndexConfig);
-			}
-
-			res = indexConfigService.saveBatch(IndexConfigLsit);
-
-		}
-
-		return res;
-	}
-
-	/**
-	 * 慢病指标值关联维护添加
-	 * @param indexConfigListVO
-	 * @return
-	 */
-	public boolean saveIndexConfigList(IndexConfigListVO indexConfigListVO) {
-		boolean res = false;
-		if (indexConfigListVO != null && ListUtil.isNotEmpty(indexConfigListVO.getIndexConfigData())) {
-			List<IndexConfigVO> indexConfigData = indexConfigListVO.getIndexConfigData();
-			List<Long> conceptId = new ArrayList<>();
-			for (IndexConfigVO e : indexConfigData) {
-				conceptId.add(e.getConceptId());
-			}
-
-			QueryWrapper<IndexConfig> IndexConfigQuery = new QueryWrapper<>();
-
-			IndexConfigQuery.eq("disease_id", indexConfigListVO.getDiseaseId()).in("concept_id", conceptId);
-			List<IndexConfig> dataUnique = list(IndexConfigQuery);
-			if (ListUtil.isNotEmpty(dataUnique)) {
-				throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
-						"该'" + dataUnique.get(0).getConceptId() + "'已存在");
-			}
-
-			List<IndexConfig> IndexConfigLsit = new ArrayList<IndexConfig>();
-			List<IndexConfigVO> data = indexConfigListVO.getIndexConfigData();
-			Date optDate = DateUtil.now();
-			String operator = UserUtils.getCurrentPrincipleID();
-			for (IndexConfigVO dataNew : data) {
-				IndexConfig IndexConfig = new IndexConfig();
-				BeanUtil.copyProperties(dataNew, IndexConfig);
-				IndexConfig.setGmtCreate(optDate);
-				IndexConfig.setGmtModified(optDate);
-				IndexConfig.setCreator(operator);
-				IndexConfig.setModifier(operator);
-				IndexConfigLsit.add(IndexConfig);
-			}
-			res = indexConfigService.saveBatch(IndexConfigLsit);
-		}
-
-		return res;
-	}
-
-	/**
-	 * 删除慢病指标值关联维护
-	 * @param indexConfigDiseaseIdVO
-	 * @return
-	 */
-	public boolean cancelIndexConfigAlls(IndexConfigDiseaseIdVO indexConfigDiseaseIdVO) {
-		UpdateWrapper<IndexConfig> IndexConfigNew = new UpdateWrapper<>();
-		if(indexConfigDiseaseIdVO.getState().equals(IsDeleteEnum.Y.getKey())){		
-		IndexConfigNew.eq("disease_id", indexConfigDiseaseIdVO.getDiseaseId()).eq("is_deleted", IsDeleteEnum.N.getKey())
-				.set("is_deleted", IsDeleteEnum.Y.getKey()).set("modifier", UserUtils.getCurrentPrincipleID())
-				.set("gmt_modified", DateUtil.now());	
-		}else if (indexConfigDiseaseIdVO.getState().equals(IsDeleteEnum.N.getKey())){
-			IndexConfigNew.eq("disease_id", indexConfigDiseaseIdVO.getDiseaseId()).eq("is_deleted", IsDeleteEnum.Y.getKey())
-			.set("is_deleted", IsDeleteEnum.N.getKey()).set("modifier", UserUtils.getCurrentPrincipleID())
-			.set("gmt_modified", DateUtil.now());		
-		}else{
-			throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,"state传参有误，应为'Y'或'N'");
-		}
-		return update(new IndexConfig(), IndexConfigNew);
-	}
+    @Autowired
+    @Qualifier("indexConfigServiceImpl")
+    IndexConfigService indexConfigService;
+    @Autowired
+    UserServiceClient userServiceClient;
+    @Autowired
+    ConceptFacade conceptFacade;
+
+    /**
+     * 分页模糊查询慢病指标值关联维护
+     *
+     * @param indexConfigDiseaseNameVO
+     * @return
+     */
+    public IPage<IndexConfigDTO> queryIndexConfigPage(IndexConfigDiseaseNameVO indexConfigDiseaseNameVO) {
+        IPage<IndexConfigDTO> datas = this.queryIndexConfigPageAlls(indexConfigDiseaseNameVO);
+        List<IndexConfigDTO> data = datas.getRecords();
+        List<String> modifierid = data.stream().map(ac -> ac.getModifier()).collect(Collectors.toList());
+        Map<String, String> userNames = new HashMap<>();
+        if (ListUtil.isNotEmpty(modifierid)) {
+            RespDTO<Map<String, String>> userNamesDTO = userServiceClient.getUserInfoByIds(modifierid);
+            if (RespDTOUtil.respIsNG(userNamesDTO)) {
+                throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "获取所有用户信息失败");
+            }
+            userNames = userNamesDTO.data;
+        }
+
+        for (IndexConfigDTO evalua : data) {
+            evalua.setModifier(userNames.get(evalua.getModifier()));
+        }
+        return datas;
+    }
+
+    /**
+     * 获取慢病指标值关联维护
+     *
+     * @param indexConfigDiseaseIdVO
+     * @return
+     */
+    public List<IndexConfigAllDTO> getIndexConfigLists(IndexConfigDiseaseIdVO indexConfigDiseaseIdVO) {
+        QueryWrapper<IndexConfig> IndexConfigQuery = new QueryWrapper<IndexConfig>();
+        IndexConfigQuery.eq("disease_id", indexConfigDiseaseIdVO.getDiseaseId()).eq("is_deleted",
+                IsDeleteEnum.N.getKey());
+        List<IndexConfig> datas = list(IndexConfigQuery);
+        // 过滤
+        List<IndexConfigAllDTO> data = BeanUtil.listCopyTo(datas, IndexConfigAllDTO.class);
+
+        List<Long> conceptIds = data.stream().map(ac -> ac.getConceptId()).collect(Collectors.toList());
+        ConceptSearchVO conceptSearchVO = new ConceptSearchVO();
+        conceptSearchVO.setConceptIds(conceptIds);
+        Map<Long, String> indexUniques = new HashMap<>();
+        if (ListUtil.isNotEmpty(conceptIds)) {
+            indexUniques = conceptFacade.getConceptNameMap(conceptSearchVO);
+        }
+
+        for (IndexConfigAllDTO evalua : data) {
+            evalua.setIndexUnique(indexUniques.get(evalua.getConceptId()));
+        }
+
+        return data;
+    }
+
+    /**
+     * 慢病指标值关联维护修改
+     *
+     * @param indexConfigListVO
+     * @return
+     */
+    public boolean updateIndexConfigList(IndexConfigListVO indexConfigListVO) {
+        boolean res = false;
+        if (indexConfigListVO != null && ListUtil.isNotEmpty(indexConfigListVO.getIndexConfigData())) {
+            IndexConfigDiseaseIdVO indexConfigDiseaseIdVO = new IndexConfigDiseaseIdVO();
+            indexConfigDiseaseIdVO.setDiseaseId(indexConfigListVO.getDiseaseId());
+
+            UpdateWrapper<IndexConfig> IndexConfigNew = new UpdateWrapper<>();
+            IndexConfigNew.eq("disease_id", indexConfigListVO.getDiseaseId());
+            res = indexConfigService.remove(IndexConfigNew);
+            List<IndexConfig> IndexConfigLsit = new ArrayList<IndexConfig>();
+            List<IndexConfigVO> data = indexConfigListVO.getIndexConfigData();
+            Date optDate = DateUtil.now();
+            String operator = UserUtils.getCurrentPrincipleID();
+            for (IndexConfigVO dataNew : data) {
+                IndexConfig IndexConfig = new IndexConfig();
+                BeanUtil.copyProperties(dataNew, IndexConfig);
+                IndexConfig.setGmtCreate(optDate);
+                IndexConfig.setGmtModified(optDate);
+                IndexConfig.setCreator(operator);
+                IndexConfig.setModifier(operator);
+                IndexConfigLsit.add(IndexConfig);
+            }
+
+            res = indexConfigService.saveBatch(IndexConfigLsit);
+
+        }
+
+        return res;
+    }
+
+    /**
+     * 慢病指标值关联维护添加
+     *
+     * @param indexConfigListVO
+     * @return
+     */
+    public boolean saveIndexConfigList(IndexConfigListVO indexConfigListVO) {
+        boolean res = false;
+        if (indexConfigListVO != null && ListUtil.isNotEmpty(indexConfigListVO.getIndexConfigData())) {
+            List<IndexConfigVO> indexConfigData = indexConfigListVO.getIndexConfigData();
+            List<Long> conceptId = new ArrayList<>();
+            for (IndexConfigVO e : indexConfigData) {
+                conceptId.add(e.getConceptId());
+            }
+
+            QueryWrapper<IndexConfig> IndexConfigQuery = new QueryWrapper<>();
+
+            IndexConfigQuery.eq("disease_id", indexConfigListVO.getDiseaseId()).in("concept_id", conceptId);
+            List<IndexConfig> dataUnique = list(IndexConfigQuery);
+            if (ListUtil.isNotEmpty(dataUnique)) {
+                throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
+                        "该'" + dataUnique.get(0).getConceptId() + "'已存在");
+            }
+
+            List<IndexConfig> IndexConfigLsit = new ArrayList<IndexConfig>();
+            List<IndexConfigVO> data = indexConfigListVO.getIndexConfigData();
+            Date optDate = DateUtil.now();
+            String operator = UserUtils.getCurrentPrincipleID();
+            for (IndexConfigVO dataNew : data) {
+                IndexConfig IndexConfig = new IndexConfig();
+                BeanUtil.copyProperties(dataNew, IndexConfig);
+                IndexConfig.setGmtCreate(optDate);
+                IndexConfig.setGmtModified(optDate);
+                IndexConfig.setCreator(operator);
+                IndexConfig.setModifier(operator);
+                IndexConfigLsit.add(IndexConfig);
+            }
+            res = indexConfigService.saveBatch(IndexConfigLsit);
+        }
+
+        return res;
+    }
+
+    /**
+     * 删除慢病指标值关联维护
+     *
+     * @param indexConfigDiseaseIdVO
+     * @return
+     */
+    public boolean cancelIndexConfigAlls(IndexConfigDiseaseIdVO indexConfigDiseaseIdVO) {
+        UpdateWrapper<IndexConfig> IndexConfigNew = new UpdateWrapper<>();
+        if (indexConfigDiseaseIdVO.getState().equals(IsDeleteEnum.Y.getKey())) {
+            IndexConfigNew
+                    .eq("disease_id", indexConfigDiseaseIdVO.getDiseaseId())
+                    .eq("is_deleted", IsDeleteEnum.N.getKey())
+                    .set("is_deleted", IsDeleteEnum.Y.getKey())
+                    .set("modifier", UserUtils.getCurrentPrincipleID())
+                    .set("gmt_modified", DateUtil.now());
+        } else if (indexConfigDiseaseIdVO.getState().equals(IsDeleteEnum.N.getKey())) {
+            IndexConfigNew
+                    .eq("disease_id", indexConfigDiseaseIdVO.getDiseaseId())
+                    .eq("is_deleted", IsDeleteEnum.Y.getKey())
+                    .set("is_deleted", IsDeleteEnum.N.getKey())
+                    .set("modifier", UserUtils.getCurrentPrincipleID())
+                    .set("gmt_modified", DateUtil.now());
+        } else {
+            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "state传参有误，应为'Y'或'N'");
+        }
+        return update(new IndexConfig(), IndexConfigNew);
+    }
 
 }

knowledgeman-service/src/main/java/com/diagbot/facade/VersionDetailFacade.java

@@ -57,7 +57,9 @@ public class VersionDetailFacade extends VersionDetailServiceImpl {
     public List<VersionDetailDTO> getById(Long id) {
         QueryWrapper<VersionDetail> versionDetailQuery = new QueryWrapper<>();
 
-        versionDetailQuery.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("STATUS", StatusEnum.Enable.getKey())
+        versionDetailQuery
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("STATUS", StatusEnum.Enable.getKey())
                 .eq("version_id", id).orderByAsc("order_no");
 
         VersionDetail versionDetail = new VersionDetail();
@@ -116,8 +118,11 @@ public class VersionDetailFacade extends VersionDetailServiceImpl {
     public List<VersionDetailDTO> getByIds(List<Long> ids) {
         QueryWrapper<VersionDetail> versionDetailQuery = new QueryWrapper<>();
 
-        versionDetailQuery.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("STATUS", StatusEnum.Enable.getKey())
-                .in("version_id", ids).orderByAsc("order_no");
+        versionDetailQuery
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("STATUS", StatusEnum.Enable.getKey())
+                .in("version_id", ids)
+                .orderByAsc("order_no");
 
         List<VersionDetail> datas = list(versionDetailQuery);
         List<VersionDetailDTO> dataNew = new ArrayList<VersionDetailDTO>();
@@ -194,7 +199,8 @@ public class VersionDetailFacade extends VersionDetailServiceImpl {
         //验证主表是否是可修改状态
         checkExistMain(versionDetailres.getVersionId());
         UpdateWrapper<VersionDetail> versionDetailNew = new UpdateWrapper<>();
-        versionDetailNew.in("id", versionDetailIdVO.getId())
+        versionDetailNew
+                .in("id", versionDetailIdVO.getId())
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .set("is_deleted", IsDeleteEnum.Y.getKey())
                 .set("modifier", UserUtils.getCurrentPrincipleID())

knowledgeman-service/src/main/java/com/diagbot/facade/VersionInfoFacade.java

@@ -63,13 +63,7 @@ public class VersionInfoFacade extends VersionInfoServiceImpl {
      * @return
      */
     public IPage<VersionWrapperDTO> getVersionInfoAll(Page page, VersionWrapperNameVO versionWrapperNameVO) {
-        // 模糊查询最新的一条版本信息
-       /* QueryWrapper<VersionInfo> versionInfoQuery = new QueryWrapper<>();
-        versionInfoQuery.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("STATUS", StatusEnum.Enable.getKey())
-                .like("name", name).orderByDesc("refresh_time");
-      
-        // 分页查询
-*/        //IPage<VersionInfo> queryUserInformation = page(page, versionInfoQuery);
+
         IPage<VersionWrapperDTO> queryUserInformation = getVersionInfoAPage(page, versionWrapperNameVO);
         List<VersionWrapperDTO> versionInfos = queryUserInformation.getRecords();
         List<VersionWrapperDTO> versionLists = new ArrayList<VersionWrapperDTO>();
@@ -212,7 +206,8 @@ public class VersionInfoFacade extends VersionInfoServiceImpl {
         }
         // 2.判断该版本号是否存在名字相同的数据
         QueryWrapper<VersionInfo> templateInfoFand = new QueryWrapper<>();
-        templateInfoFand.eq("product_type", versionInfoVO.getProductType())
+        templateInfoFand
+                .eq("product_type", versionInfoVO.getProductType())
                 .eq("name", versionInfoVO.getName())
                 .eq("is_deleted", IsDeleteEnum.N.getKey());
 
@@ -256,7 +251,8 @@ public class VersionInfoFacade extends VersionInfoServiceImpl {
         // 1.先判断数据是否存在有效
         checkExist(versionInfoVO.getId());
         UpdateWrapper<VersionInfo> versionInfoNew = new UpdateWrapper<>();
-        versionInfoNew.in("id", versionInfoVO.getId())
+        versionInfoNew
+                .in("id", versionInfoVO.getId())
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .set("is_deleted", IsDeleteEnum.Y.getKey())
                 .set("modifier", UserUtils.getCurrentPrincipleID())
@@ -272,8 +268,7 @@ public class VersionInfoFacade extends VersionInfoServiceImpl {
     private VersionInfo checkExist(Long id) {
         // 1.先判断数据是否存在有效
         QueryWrapper<VersionInfo> VersionInfoFand = new QueryWrapper<>();
-        VersionInfoFand.eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("id", id);
+        VersionInfoFand.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("id", id);
         VersionInfo versionInfo = getOne(VersionInfoFand, false);
         if (null == versionInfo) {
             throw new CommonException(CommonErrorCode.NOT_EXISTS, "该数据不存在");
@@ -297,7 +292,8 @@ public class VersionInfoFacade extends VersionInfoServiceImpl {
         }
         //查询最新的一条版本信息
         QueryWrapper<VersionInfo> versionInfoQuery = new QueryWrapper<>();
-        versionInfoQuery.eq("is_deleted", IsDeleteEnum.N.getKey())
+        versionInfoQuery
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("product_type", versionVO.getProductType())
                 .eq("STATUS", StatusEnum.Enable.getKey())
                 .orderByDesc("gmt_modified");