|
@@ -5,12 +5,16 @@ import com.diagbot.dto.KlDiagnoseRecordDTO;
|
|
import com.diagbot.dto.KlDiagnoseRecordDetailDTO;
|
|
import com.diagbot.dto.KlDiagnoseRecordDetailDTO;
|
|
import com.diagbot.entity.KlConcept;
|
|
import com.diagbot.entity.KlConcept;
|
|
import com.diagbot.entity.KlDiagnose;
|
|
import com.diagbot.entity.KlDiagnose;
|
|
|
|
+import com.diagbot.entity.KlDiagnoseRecord;
|
|
|
|
+import com.diagbot.entity.KlDiagnoseRecordDetail;
|
|
import com.diagbot.enums.CommonEnum;
|
|
import com.diagbot.enums.CommonEnum;
|
|
import com.diagbot.enums.DiagnoseLexiconTypeEnum;
|
|
import com.diagbot.enums.DiagnoseLexiconTypeEnum;
|
|
import com.diagbot.enums.IsDeleteEnum;
|
|
import com.diagbot.enums.IsDeleteEnum;
|
|
import com.diagbot.enums.LexiconEnum;
|
|
import com.diagbot.enums.LexiconEnum;
|
|
import com.diagbot.enums.LexiconExtEnum;
|
|
import com.diagbot.enums.LexiconExtEnum;
|
|
import com.diagbot.service.KlConceptService;
|
|
import com.diagbot.service.KlConceptService;
|
|
|
|
+import com.diagbot.service.KlDiagnoseRecordDetailService;
|
|
|
|
+import com.diagbot.service.KlDiagnoseRecordService;
|
|
import com.diagbot.util.BeanUtil;
|
|
import com.diagbot.util.BeanUtil;
|
|
import com.diagbot.util.CoreUtil;
|
|
import com.diagbot.util.CoreUtil;
|
|
import com.diagbot.util.EntityUtil;
|
|
import com.diagbot.util.EntityUtil;
|
|
@@ -58,6 +62,12 @@ public class KlDiagnoseImportFacade {
|
|
private KlConceptService klConceptService;
|
|
private KlConceptService klConceptService;
|
|
@Autowired
|
|
@Autowired
|
|
KlDiagnoseFacade klDiagnoseFacade;
|
|
KlDiagnoseFacade klDiagnoseFacade;
|
|
|
|
+ @Autowired
|
|
|
|
+ @Qualifier("klDiagnoseRecordServiceImpl")
|
|
|
|
+ KlDiagnoseRecordService klDiagnoseRecordService;
|
|
|
|
+ @Autowired
|
|
|
|
+ @Qualifier("klDiagnoseRecordDetailServiceImpl")
|
|
|
|
+ KlDiagnoseRecordDetailService klDiagnoseRecordDetailService;
|
|
|
|
|
|
public Map<String, Object> importDiagnose(MultipartFile file, DiagnoseImportVO diagnoseImportVO) {
|
|
public Map<String, Object> importDiagnose(MultipartFile file, DiagnoseImportVO diagnoseImportVO) {
|
|
long t1 = System.currentTimeMillis();
|
|
long t1 = System.currentTimeMillis();
|
|
@@ -460,10 +470,28 @@ public class KlDiagnoseImportFacade {
|
|
}
|
|
}
|
|
klDiagnoseFacade.saveDiagnoseAll(klDiagnoseSaveVO);
|
|
klDiagnoseFacade.saveDiagnoseAll(klDiagnoseSaveVO);
|
|
|
|
|
|
- // TODO 保存记录表和明细表
|
|
|
|
|
|
+ // 保存记录表和记录明细表
|
|
List<KlDiagnoseRecordDTO> recordList = importDiagnoseResVO.getRecordList();
|
|
List<KlDiagnoseRecordDTO> recordList = importDiagnoseResVO.getRecordList();
|
|
- // for (KlDiagnoseRecordDTO klDiagnoseRecordDTO)
|
|
|
|
-
|
|
|
|
|
|
+ for (KlDiagnoseRecordDTO klDiagnoseRecordDTO : recordList) {
|
|
|
|
+ // 保存记录表
|
|
|
|
+ KlDiagnoseRecord klDiagnoseRecord = new KlDiagnoseRecord();
|
|
|
|
+ BeanUtil.copyProperties(klDiagnoseRecordDTO, klDiagnoseRecord);
|
|
|
|
+ klDiagnoseRecord.setDiagnoseId(klDiagnoseSaveVO.getId());
|
|
|
|
+ klDiagnoseRecordService.save(klDiagnoseRecord);
|
|
|
|
+
|
|
|
|
+ // 保存记录明细表
|
|
|
|
+ List<KlDiagnoseRecordDetailDTO> recordDetailList = klDiagnoseRecordDTO.getRecordDetailList();
|
|
|
|
+ if (ListUtil.isNotEmpty(recordDetailList)) {
|
|
|
|
+ List<KlDiagnoseRecordDetail> recorlDetailList = Lists.newArrayList();
|
|
|
|
+ for (KlDiagnoseRecordDetailDTO detailDTO : recordDetailList) {
|
|
|
|
+ KlDiagnoseRecordDetail klDiagnoseRecordDetail = new KlDiagnoseRecordDetail();
|
|
|
|
+ BeanUtil.copyProperties(detailDTO, klDiagnoseRecordDetail);
|
|
|
|
+ klDiagnoseRecordDetail.setDiagnoseRecordId(klDiagnoseRecord.getId());
|
|
|
|
+ recorlDetailList.add(klDiagnoseRecordDetail);
|
|
|
|
+ }
|
|
|
|
+ klDiagnoseRecordDetailService.saveBatch(recorlDetailList);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|