|
@@ -25,19 +25,56 @@ enum LabUploadTypeEnum {
|
|
|
ByTemplate,
|
|
|
}
|
|
|
|
|
|
+class FileUploadInfo {
|
|
|
+ String? uploadId;
|
|
|
+ int partNum;
|
|
|
+ String? fileUrl;
|
|
|
+ String? fileName;
|
|
|
+
|
|
|
+ FileUploadInfo({
|
|
|
+ this.uploadId,
|
|
|
+ this.partNum = 0,
|
|
|
+ this.fileUrl,
|
|
|
+ this.fileName,
|
|
|
+ });
|
|
|
+
|
|
|
+ factory FileUploadInfo.fromJson(Map<String, dynamic> map) {
|
|
|
+ return FileUploadInfo(
|
|
|
+ uploadId: map['UploadId'],
|
|
|
+ partNum: map['PartNum'],
|
|
|
+ fileUrl: map['FileUrl'],
|
|
|
+ fileName: map['FileName'],
|
|
|
+ );
|
|
|
+ }
|
|
|
+
|
|
|
+ Map<String, dynamic> toJson() {
|
|
|
+ final map = Map<String, dynamic>();
|
|
|
+ if(uploadId != null)
|
|
|
+ map['UploadId'] = uploadId;
|
|
|
+ map['PartNum'] = partNum;
|
|
|
+ if(fileUrl != null)
|
|
|
+ map['FileUrl'] = fileUrl;
|
|
|
+ if(fileName != null)
|
|
|
+ map['FileName'] = fileName;
|
|
|
+ return map;
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
class RecordLaboratoryFileRequest extends TokenRequest{
|
|
|
LabUploadTypeEnum uploadType;
|
|
|
- String? fileUrl;
|
|
|
+ List<FileUploadInfo >? fileUploadInfos;
|
|
|
bool isComprehensiveAnalysis;
|
|
|
bool isSeparateAnalysis;
|
|
|
String? folderName;
|
|
|
+ String? folderCode;
|
|
|
|
|
|
RecordLaboratoryFileRequest({
|
|
|
this.uploadType = LabUploadTypeEnum.DirectUpload,
|
|
|
- this.fileUrl,
|
|
|
+ this.fileUploadInfos,
|
|
|
this.isComprehensiveAnalysis = false,
|
|
|
this.isSeparateAnalysis = false,
|
|
|
this.folderName,
|
|
|
+ this.folderCode,
|
|
|
String? token,
|
|
|
}) : super(
|
|
|
token: token,
|
|
@@ -46,10 +83,11 @@ class RecordLaboratoryFileRequest extends TokenRequest{
|
|
|
factory RecordLaboratoryFileRequest.fromJson(Map<String, dynamic> map) {
|
|
|
return RecordLaboratoryFileRequest(
|
|
|
uploadType: LabUploadTypeEnum.values.firstWhere((e) => e.index == map['UploadType']),
|
|
|
- fileUrl: map['FileUrl'],
|
|
|
+ fileUploadInfos: map['FileUploadInfos'] != null ? (map['FileUploadInfos'] as List).map((e)=>FileUploadInfo.fromJson(e as Map<String,dynamic>)).toList() : null,
|
|
|
isComprehensiveAnalysis: map['IsComprehensiveAnalysis'],
|
|
|
isSeparateAnalysis: map['IsSeparateAnalysis'],
|
|
|
folderName: map['FolderName'],
|
|
|
+ folderCode: map['FolderCode'],
|
|
|
token: map['Token'],
|
|
|
);
|
|
|
}
|
|
@@ -57,12 +95,14 @@ class RecordLaboratoryFileRequest extends TokenRequest{
|
|
|
Map<String, dynamic> toJson() {
|
|
|
final map = super.toJson();
|
|
|
map['UploadType'] = uploadType.index;
|
|
|
- if(fileUrl != null)
|
|
|
- map['FileUrl'] = fileUrl;
|
|
|
+ if(fileUploadInfos != null)
|
|
|
+ map['FileUploadInfos'] = fileUploadInfos;
|
|
|
map['IsComprehensiveAnalysis'] = isComprehensiveAnalysis;
|
|
|
map['IsSeparateAnalysis'] = isSeparateAnalysis;
|
|
|
if(folderName != null)
|
|
|
map['FolderName'] = folderName;
|
|
|
+ if(folderCode != null)
|
|
|
+ map['FolderCode'] = folderCode;
|
|
|
return map;
|
|
|
}
|
|
|
}
|