诊断依据导入

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

@@ -29,16 +29,16 @@ public class ExportDiagnoseDTO implements Serializable {
     @Excel(name="最大值", width = 10, orderNum = "50")
     private String max;
     @Excel(name="最大值符号", width = 10, orderNum = "60")
-    private String minSymbol;
+    private String maxSymbol;
     @Excel(name="最小值", width = 10, orderNum = "70")
     private String min;
     @Excel(name="最小值符号", width = 10, orderNum = "80")
-    private String maxSymbol;
+    private String minSymbol;
     @Excel(name="单位", width = 10, orderNum = "90")
     private String unit;
-    @Excel(name="关联词", width = 30, orderNum = "35")
+    @Excel(name="关联词", width = 10, orderNum = "35")
     private String relation;
-    @Excel(name="校验", width = 50, orderNum = "33")
+    @Excel(name="校验", width = 10, orderNum = "33")
     private String check;
 
 }

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

@@ -169,10 +169,19 @@ public class KlDiagnoseImportFacade {
                 List<ImportDiagnoseVO> importDiagnoseVOS = groupData.get(disName);
                 List<KlDiagnoseRecordDTO> klDiagnoseRecordList = Lists.newArrayList();
                 int recordOrder = 1;
+                List<Integer> rowIds = Lists.newArrayList();
                 for (ImportDiagnoseVO importDiagnoseVO : importDiagnoseVOS) {
+                    if (rowIds.contains(importDiagnoseVO.getRowNum())) {
+                        continue;
+                    }
                     KlDiagnoseRecordDTO klDiagnoseRecordDTO = new KlDiagnoseRecordDTO();
                     BeanUtil.copyProperties(importDiagnoseVO, klDiagnoseRecordDTO);
                     klDiagnoseRecordDTO.setCode(importDiagnoseVO.getOrderNo());
+                    if ("确诊".equals(importDiagnoseVO.getType())) {
+                        if (StringUtil.isNotBlank(importDiagnoseVO.getParentRule())) {
+                            klDiagnoseRecordDTO.setRule(importDiagnoseVO.getParentRule());
+                        }
+                    }
                     klDiagnoseRecordDTO.setOrderNo(recordOrder);
                     klDiagnoseRecordList.add(klDiagnoseRecordDTO);
                     if (ListUtil.isNotEmpty(importDiagnoseVO.getConceptId())) {
@@ -189,6 +198,7 @@ public class KlDiagnoseImportFacade {
                         klDiagnoseRecordDTO.setRecordDetailList(klDiagnoseRecordDetailList);
                     }
                     recordOrder++;
+                    rowIds.add(importDiagnoseVO.getRowNum());
                 }
                 importDiagnoseResVO.setRecordList(klDiagnoseRecordList);
             } else {