Merge remote-tracking branch 'origin/dev/importDiagnose20210429' into dev/importDiagnose20210429

# Conflicts:
#	src/main/java/com/diagbot/facade/KlDiagnoseDetailFacade.java

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

@@ -2,20 +2,16 @@ package com.diagbot.facade;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.dto.ExportDiagnoseDTO;
-import com.diagbot.dto.ExportDiagnoseNameDTO;
 import com.diagbot.entity.KlDiagnoseDetail;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.KlDiagnoseDetailServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.EntityUtil;
-import com.diagbot.util.ExcelUtils;
 import org.apache.commons.compress.utils.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import javax.servlet.http.HttpServletResponse;
 import java.util.LinkedHashMap;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
@@ -70,10 +66,19 @@ public class KlDiagnoseDetailFacade extends KlDiagnoseDetailServiceImpl {
         for(Map.Entry<String, List<KlDiagnoseDetail>> kd : diagnoseDetailMap.entrySet()){
             String sheetName = kd.getKey();
             List<KlDiagnoseDetail> datats = kd.getValue();
+            removeKlDiagnoseDetail(datats);
             List<ExportDiagnoseDTO> eds = Lists.newArrayList();
             for (KlDiagnoseDetail kdl:datats) {
                 ExportDiagnoseDTO exportDiagnoseDTO = new ExportDiagnoseDTO();
                 BeanUtil.copyProperties(kdl, exportDiagnoseDTO);
+                ReflectUtil.setProperty(exportDiagnoseDTO, "type", kdl.getType().toString());
+                ReflectUtil.setProperty(exportDiagnoseDTO, "orderNo", kdl.getCode());
+                if(kdl.getCode().startsWith("3.")){
+                    exportDiagnoseDTO.setRule(kdl.getRelation());
+                }else {
+                    exportDiagnoseDTO.setRule(kdl.getStandard());
+                }
+                exportDiagnoseDTO.setEq(kdl.getMidResult());
                 exportDiagnoseDTO.setType("1223");
                 eds.add(exportDiagnoseDTO);
             }
@@ -98,4 +103,65 @@ public class KlDiagnoseDetailFacade extends KlDiagnoseDetailServiceImpl {
         return exportDiagnoseNameDTOList;
     }
 
+    /**
+     * 移除公式编码中没有的数据
+     * @param klDiagnoseDetails
+     */
+    public void removeKlDiagnoseDetail(List<KlDiagnoseDetail> klDiagnoseDetails){
+        Map<String, List<String>> allFormula = getAllFormula(klDiagnoseDetails);
+        List<String> regexData = getCodes(allFormula);
+        Iterator<KlDiagnoseDetail> iterator = klDiagnoseDetails.iterator();
+        while (iterator.hasNext()){
+            KlDiagnoseDetail next = iterator.next();
+            String code = next.getCode();
+            if(!regexData.contains(code) && StringUtil.isNotBlank(code)){
+                iterator.remove();
+            }
+        }
+    }
+
+
+    /**
+     * 获取每个诊断依据的公式
+     * @param klDiagnoseDetails
+     * @return
+     */
+    private Map<String,List<String>> getAllFormula(List<KlDiagnoseDetail> klDiagnoseDetails){
+        Map<String,List<String>> typeFormulaMap = new HashMap<>();
+        for (KlDiagnoseDetail klDiagnoseDetail : klDiagnoseDetails) {
+            Integer type = klDiagnoseDetail.getType();
+            String formula = klDiagnoseDetail.getFormula();
+            if((type == 91 || type == 92 || type == 93)&& StringUtil.isNotBlank(formula)){
+                if(typeFormulaMap.containsKey(type.toString())){
+                    List<String> formulas = typeFormulaMap.get(type.toString());
+                    formulas.add(formula);
+                    typeFormulaMap.put(type.toString(),formulas);
+                }else {
+                    List<String> formulas = Lists.newArrayList();
+                    formulas.add(formula);
+                    typeFormulaMap.put(type.toString(),formulas);
+                }
+            }
+        }
+        return typeFormulaMap;
+    }
+
+    /**
+     * 获取公式中的所有编码
+     * @param getAllFormula
+     * @return
+     */
+    private List<String> getCodes(Map<String,List<String>> getAllFormula) {
+        StringBuffer sb = new StringBuffer();
+        String pateern = "([1-9]\\d*\\.?\\d*)|(0\\.\\d*[1-9])";
+        if(MapUtils.isNotEmpty(getAllFormula)){
+            getAllFormula.forEach((x,y) ->{
+                String collect = y.stream().collect(Collectors.joining(","));
+                sb.append(collect).append("+");
+            });
+        }
+        //获取公式中的编码
+        return RegexUtil.getRegexDatas(sb.toString(), pateern);
+    }
+
 }

src/main/java/com/diagbot/util/RegexUtil.java

@@ -2,6 +2,7 @@ package com.diagbot.util;
 
 import com.google.common.collect.Lists;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -152,7 +153,7 @@ public class RegexUtil {
      * @param regex
      * @return
      */
-    private static List<String> getRegexData(String content, String regex) {
+    public static List<String> getRegexData(String content, String regex) {
         return getRegexDataCommon(content, regex, false);
     }
 
@@ -196,17 +197,35 @@ public class RegexUtil {
         return list;
     }
 
+    public static List<String> getRegexDatas(String content, String pattern){
+        List<String> numbers=new ArrayList<>();
+        // 创建 Pattern 对象
+        Pattern r = Pattern.compile(pattern);
+        // 现在创建 matcher 对象
+        Matcher matcher = r.matcher(content);
+        while (matcher.find()) {
+            //获取当前匹配的值
+            numbers.add(matcher.group());
+        }
+
+        return numbers;
+    }
+
     /**
      * 测试
      *
      * @param args
      */
     public static void main(String[] args) {
-        String regex1 = "(血小板计数)\\s*(\\d+(\\.\\d+)?)";
+        String regex1 = "([1-9]\\d*\\.?\\d*)|(0\\.\\d*[1-9])";
         // System.out.println(getRegexData("血小板计数  30.3", regex1, 2));
-        System.out.println(getRegexData("血小板计数  30.3", regex1));
+        System.out.println(getRegexData("拟诊+(3.3/3.4)任一", regex1));
 
         String s1 = "ABC";
         System.out.println(getRegexRes(s1, "Abc", true));
+
+        System.out.println(getRegexDatas("拟诊+(3.3/3.4)任一","([1-9]\\d*\\.?\\d*)|(0\\.\\d*[1-9])"));
+
+
     }
 }