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