生成新结构诊断依据

src/main/java/com/diagbot/dto/ExportDiagnoseDTO.java

@@ -20,7 +20,7 @@ public class ExportDiagnoseDTO implements Serializable {
 
     @Excel(name="类型", width = 20, orderNum = "10")
     private String type = "";
-    @Excel(name="序号", width = 10, orderNum = "20")
+    @Excel(name="序号", width = 50, orderNum = "20")
     private String orderNo = "";
     @Excel(name="规则", width = 50, orderNum = "30")
     private String rule = "";

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

@@ -130,7 +130,7 @@ public class KlDiagnoseDetailFacade extends KlDiagnoseDetailServiceImpl {
 
                 if (type == 91 || type == 92 || type == 93) {
                     ReflectUtil.setProperty(exportDiagnoseDTO, "type", typeName);
-                    exportDiagnoseDTO.setRule(kdl.getFormula().replaceAll("/","、")
+                    exportDiagnoseDTO.setOrderNo(kdl.getFormula().replaceAll("/","、")
                     .replaceAll("\\(","[").replaceAll("\\)","]"));
                 }else {
                     String tName = typeName.split(":")[1];//症状

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

@@ -95,6 +95,7 @@ public class KlDiagnoseImportFacade {
             String type = importDiagnoseVO.getType();
             if (type != null && type.startsWith("【") && type.endsWith("】")) {
                 if (StringUtil.isNotBlank(addDisName)) {
+                    addDisName = RegexUtil.getRegexData(addDisName, "【(.*?)】", 1);
                     groupData.put(addDisName, importDiagnoseVOList);
                 }
                 importDiagnoseVOList = new ArrayList<>();