Browse Source

1、更新jsonrpc

guanxinyi 1 year ago
parent
commit
edfb64d79d

+ 1 - 1
lib/rpc.dart

@@ -49,7 +49,7 @@ class JsonRpcProxy {
   /// 平台服务
   PlatformService get platform {
     if (_platformService == null)
-      _platformService = PlatformService("http://$platformHost", timeout: 15000);
+      _platformService = PlatformService("http://$platformHost");
     return _platformService!;
   }
 

+ 30 - 30
lib/services/aIDiagnosis.m.dart

@@ -112,8 +112,8 @@ class AIDetectedObject {
 	int label;
 	double confidence;
 	AIDiagnosisRect? boundingBox;
-	List<AIDiagnosisPoint2D>? contours;
-	List<AIDiagnosisDescription>? descriptions;
+	List<AIDiagnosisPoint2D >? contours;
+	List<AIDiagnosisDescription >? descriptions;
 
 	AIDetectedObject({
 		this.label = 0,
@@ -150,9 +150,9 @@ class AIDetectedObject {
 class AIDiagnosisResultPerOrgan {
 	DiagnosisOrganEnum organ;
 	AIDiagnosisRect? organBoundBox;
-	List<AIDiagnosisPoint2D>? organContours;
-	List<AIDiagnosisDescription>? organDescriptions;
-	List<AIDetectedObject>? detectedObjects;
+	List<AIDiagnosisPoint2D >? organContours;
+	List<AIDiagnosisDescription >? organDescriptions;
+	List<AIDetectedObject >? detectedObjects;
 
 	AIDiagnosisResultPerOrgan({
 		this.organ = DiagnosisOrganEnum.Null,
@@ -190,7 +190,7 @@ class AIDiagnosisResultPerOrgan {
 class AIDiagnosisPerImageDTO {
 	int index;
 	double priorityScore;
-	List<AIDiagnosisResultPerOrgan>? diagResultsForEachOrgan;
+	List<AIDiagnosisResultPerOrgan >? diagResultsForEachOrgan;
 
 	AIDiagnosisPerImageDTO({
 		this.index = 0,
@@ -218,8 +218,8 @@ class AIDiagnosisPerImageDTO {
 
 class DiagnosisImageResult {
 	DiagnosisConclusionEnum diagnosisConclusion;
-	List<AIDiagnosisPerImageDTO>? diagnosisResult;
-	List<DiagnosisOrganEnum>? diagnosisOrgans;
+	List<AIDiagnosisPerImageDTO >? diagnosisResult;
+	List<DiagnosisOrganEnum >? diagnosisOrgans;
 	CarotidResultDTO? carotidResult;
 
 	DiagnosisImageResult({
@@ -333,7 +333,7 @@ class GetCarotidResultRequest {
 	String? mdlToken;
 	CarotidScanTypeEnum carotidScanType;
 	CarotidScanDirectionEnum carotidScanDirection;
-	List<MeasureImageFileDTO>? measureImageFiles;
+	List<MeasureImageFileDTO >? measureImageFiles;
 	String? measureResult;
 
 	GetCarotidResultRequest({
@@ -377,7 +377,7 @@ class GetCarotidResultRequest {
 }
 
 class CreateCarotidSurfaceImagesResult {
-	List<String>? surfaceImages;
+	List<String >? surfaceImages;
 
 	CreateCarotidSurfaceImagesResult({
 		this.surfaceImages,
@@ -427,7 +427,7 @@ class DiagnosisPerImageDTO extends AIDiagnosisPerImageDTO{
 	String? aIPreviewFileToken;
 	String? perImageJson;
 	DiagnosisConclusionEnum diagnosisConclusion;
-	List<DiagnosisOrganEnum>? diagnosisOrgans;
+	List<DiagnosisOrganEnum >? diagnosisOrgans;
 
 	DiagnosisPerImageDTO({
 		this.remedicalCode,
@@ -441,7 +441,7 @@ class DiagnosisPerImageDTO extends AIDiagnosisPerImageDTO{
 		this.diagnosisOrgans,
 		int index = 0,
 		double priorityScore = 0,
-		List<AIDiagnosisResultPerOrgan>? diagResultsForEachOrgan,
+		List<AIDiagnosisResultPerOrgan >? diagResultsForEachOrgan,
 	}) : super(
 			index: index,
 			priorityScore: priorityScore,
@@ -490,7 +490,7 @@ class DiagnosisRemicalDTO {
 	String? remedicalCode;
 	RemedicalFileDataTypeEnum dataType;
 	String? fileToken;
-	List<AIDiagnosisPerImageDTO>? diagnosisResult;
+	List<AIDiagnosisPerImageDTO >? diagnosisResult;
 	CarotidResultDTO? carotidResult;
 
 	DiagnosisRemicalDTO({
@@ -528,8 +528,8 @@ class DiagnosisRemicalDTO {
 
 class DiagnosisReportResult {
 	DiagnosisConclusionEnum diagnosisConclusion;
-	List<DiagnosisPerImageDTO>? diagnosisResult;
-	List<DiagnosisRemicalDTO>? carotidResult;
+	List<DiagnosisPerImageDTO >? diagnosisResult;
+	List<DiagnosisRemicalDTO >? carotidResult;
 
 	DiagnosisReportResult({
 		this.diagnosisConclusion = DiagnosisConclusionEnum.NotRequired,
@@ -558,7 +558,7 @@ class DiagnosisReportResult {
 
 class DiagnosisReportRequest extends TokenRequest{
 	DiagnosisOrganEnum organ;
-	List<DiagnosisRemicalDTO>? remedicalList;
+	List<DiagnosisRemicalDTO >? remedicalList;
 
 	DiagnosisReportRequest({
 		this.organ = DiagnosisOrganEnum.Null,
@@ -587,7 +587,7 @@ class DiagnosisReportRequest extends TokenRequest{
 
 class GetDiagnosisConclusionResult {
 	DiagnosisConclusionEnum diagnosisConclusion;
-	List<DiagnosisOrganEnum>? diagnosisOrgans;
+	List<DiagnosisOrganEnum >? diagnosisOrgans;
 
 	GetDiagnosisConclusionResult({
 		this.diagnosisConclusion = DiagnosisConclusionEnum.NotRequired,
@@ -662,7 +662,7 @@ class EnumFieldDTO {
 
 class EnumItemDTO {
 	String? code;
-	List<EnumFieldDTO>? children;
+	List<EnumFieldDTO >? children;
 
 	EnumItemDTO({
 		this.code,
@@ -687,7 +687,7 @@ class EnumItemDTO {
 }
 
 class GetDiagnosisEnumItemsResult {
-	List<EnumItemDTO>? source;
+	List<EnumItemDTO >? source;
 
 	GetDiagnosisEnumItemsResult({
 		this.source,
@@ -810,7 +810,7 @@ class AIDiagnosisLesionSize {
 }
 
 class GetKeyPointsOfContourRequest extends TokenRequest{
-	List<AIDiagnosisPoint2D>? contours;
+	List<AIDiagnosisPoint2D >? contours;
 	AIDiagnosisLesionSize? lesionSize;
 
 	GetKeyPointsOfContourRequest({
@@ -840,7 +840,7 @@ class GetKeyPointsOfContourRequest extends TokenRequest{
 }
 
 class AffectedKeyPointsByDragActionRequest extends TokenRequest{
-	List<DiagnosisKeyPointDTO>? keyPoints;
+	List<DiagnosisKeyPointDTO >? keyPoints;
 	AIDiagnosisPoint2D? mousePoint;
 
 	AffectedKeyPointsByDragActionRequest({
@@ -870,9 +870,9 @@ class AffectedKeyPointsByDragActionRequest extends TokenRequest{
 }
 
 class ContourAndKeyPointsAfterDragResult {
-	List<AIDiagnosisPoint2D>? dstContours;
-	List<DiagnosisKeyPointDTO>? dstKeyPoints;
-	List<int>? affectedKeyPointIndexes;
+	List<AIDiagnosisPoint2D >? dstContours;
+	List<DiagnosisKeyPointDTO >? dstKeyPoints;
+	List<int >? affectedKeyPointIndexes;
 
 	ContourAndKeyPointsAfterDragResult({
 		this.dstContours,
@@ -901,8 +901,8 @@ class ContourAndKeyPointsAfterDragResult {
 }
 
 class ContourAndKeyPointsAfterDragRequest extends TokenRequest{
-	List<AIDiagnosisPoint2D>? contours;
-	List<DiagnosisKeyPointDTO>? keyPoints;
+	List<AIDiagnosisPoint2D >? contours;
+	List<DiagnosisKeyPointDTO >? keyPoints;
 	AIDiagnosisPoint2D? startPoint;
 	AIDiagnosisPoint2D? endPoint;
 
@@ -965,7 +965,7 @@ class MinimumDistanceToContourPointsResult {
 }
 
 class MinimumDistanceToContourPointsRequest extends TokenRequest{
-	List<AIDiagnosisPoint2D>? contourPoints;
+	List<AIDiagnosisPoint2D >? contourPoints;
 	AIDiagnosisPoint2D? mousePoint;
 
 	MinimumDistanceToContourPointsRequest({
@@ -995,7 +995,7 @@ class MinimumDistanceToContourPointsRequest extends TokenRequest{
 }
 
 class ContourMergeResult {
-	List<AIDiagnosisPoint2D>? dstContours;
+	List<AIDiagnosisPoint2D >? dstContours;
 	AIDiagnosisLesionSize? dstLesionSize;
 
 	ContourMergeResult({
@@ -1021,9 +1021,9 @@ class ContourMergeResult {
 }
 
 class ContourMergeRequest extends TokenRequest{
-	List<AIDiagnosisPoint2D>? contourPoints;
+	List<AIDiagnosisPoint2D >? contourPoints;
 	AIDiagnosisLesionSize? lesionSize;
-	List<AIDiagnosisPoint2D>? drawingNewContourPoints;
+	List<AIDiagnosisPoint2D >? drawingNewContourPoints;
 
 	ContourMergeRequest({
 		this.contourPoints,

+ 6 - 6
lib/services/appletAPI.m.dart

@@ -380,7 +380,7 @@ class ReportImageInfo {
 
 class ReportInfo {
 	String? id;
-	List<ReportImageInfo>? previewImages;
+	List<ReportImageInfo >? previewImages;
 
 	ReportInfo({
 		this.id,
@@ -554,9 +554,9 @@ class ConsultationInfo {
 	String? scanDoctorName;
 	String? deviceModel;
 	String? terminalId;
-	List<ImageTokenInfo>? imageTokens;
-	List<VideoTokenInfo>? videoInfos;
-	List<ReportPreviewPdf>? reportPreviewPdfs;
+	List<ImageTokenInfo >? imageTokens;
+	List<VideoTokenInfo >? videoInfos;
+	List<ReportPreviewPdf >? reportPreviewPdfs;
 
 	ConsultationInfo({
 		this.consultationId,
@@ -1184,8 +1184,8 @@ class StartConsultationResult {
 	LiveStates state;
 	int integerRoomId;
 	int appId;
-	List<LiveTerminalInfo2>? terminalInfos;
-	List<MeetingMemberInfo2>? meetingMemberInfos;
+	List<LiveTerminalInfo2 >? terminalInfos;
+	List<MeetingMemberInfo2 >? meetingMemberInfos;
 
 	StartConsultationResult({
 		this.roomId,

+ 4 - 4
lib/services/authentication.m.dart

@@ -11,8 +11,8 @@ enum StorageServerEnum {
 class AuthenticationRequest extends TokenRequest{
 	String? fileName;
 	StorageServerEnum serverType;
-	List<DataItemDTO>? urlParams;
-	List<DataItemDTO>? headerParams;
+	List<DataItemDTO >? urlParams;
+	List<DataItemDTO >? headerParams;
 	String? requestMethod;
 
 	AuthenticationRequest({
@@ -7361,7 +7361,7 @@ class GetTokensWithClientIdRequest extends BaseRequest{
 }
 
 class GetTokenWithClientIdsRequest extends BaseRequest{
-	List<String>? clientIds;
+	List<String >? clientIds;
 
 	GetTokenWithClientIdsRequest({
 		this.clientIds,
@@ -7383,7 +7383,7 @@ class GetTokenWithClientIdsRequest extends BaseRequest{
 }
 
 class GetTokenWithValuesRequest extends BaseRequest{
-	List<String>? tokenValues;
+	List<String >? tokenValues;
 
 	GetTokenWithValuesRequest({
 		this.tokenValues,

+ 3 - 3
lib/services/connect.m.dart

@@ -152,12 +152,12 @@ class CacheDeviceDTO extends DeviceInfoDTO{
 		String? systemVersion,
 		String? cPUModel,
 		String? systemLanguage,
-		List<String>? diagnosisModules,
-		List<String>? reportPosterCodes,
+		List<String >? diagnosisModules,
+		List<String >? reportPosterCodes,
 		bool mergedChannel = false,
 		int mergedVideoOutputWidth = 0,
 		int mergedVideoOutputHeight = 0,
-		List<VideoDeviceDTO>? videoDeviceInfos,
+		List<VideoDeviceDTO >? videoDeviceInfos,
 		DownloadModeSettingEnum downloadModeSetting = DownloadModeSettingEnum.Auto,
 		bool liveOpened = false,
 		bool supportRtc = false,

+ 4 - 6
lib/services/deployPlatform.dart

@@ -174,14 +174,12 @@ class DeployPlatformService extends JsonRpcClientBase {
 		return rpcRst;
 	}
 
-	Future<bool> start() async {
-		var rpcRst = await call("Start", );
-		return rpcRst;
+	Future<void> start() async {
+		await call("Start", );
 	}
 
-	Future<bool> stopServer() async {
-		var rpcRst = await call("StopServer", );
-		return rpcRst;
+	Future<void> stopServer() async {
+		await call("StopServer", );
 	}
 
 	Future<List<String>> getPublishPackageLogsAsync() async {

+ 2 - 2
lib/services/deployPlatform.m.dart

@@ -305,7 +305,7 @@ class DeployRecordInfoDTO extends BaseDTO{
 	String? generatePackageJson;
 	String? packageLogs;
 	DateTime? lastPackageTime;
-	List<DeployRecordUpgradeInfoDTO>? upgradeInfos;
+	List<DeployRecordUpgradeInfoDTO >? upgradeInfos;
 	String? deployToolDownloadUrl;
 	String? ugradeFilesDownloadUrl;
 
@@ -398,7 +398,7 @@ class SaveDeployRecordRequest {
 	String? version;
 	String? releasedBy;
 	String? internalRecord;
-	List<DeployRecordUpgradeInfoDTO>? upgradeInfos;
+	List<DeployRecordUpgradeInfoDTO >? upgradeInfos;
 
 	SaveDeployRecordRequest({
 		this.id,

+ 39 - 35
lib/services/device.m.dart

@@ -65,10 +65,10 @@ class MigrateDevicePrinterInfo extends DevicePrinterDTO{
 		String? driveModelName,
 		String? description,
 		String? osVersion,
-		List<UploadDeviceFileInfoDTO>? fileUploadInfoList,
+		List<UploadDeviceFileInfoDTO >? fileUploadInfoList,
 		int fileSize = 0,
 		String? printerBrands,
-		List<String>? printerModels,
+		List<String >? printerModels,
 		String? fileName,
 	}) : super(
 			code: code,
@@ -111,7 +111,7 @@ class MigrateDevicePrinterInfo extends DevicePrinterDTO{
 }
 
 class MigrateDevicePrinterRequest extends TokenRequest{
-	List<MigrateDevicePrinterInfo>? migrateDevicePrinterInfos;
+	List<MigrateDevicePrinterInfo >? migrateDevicePrinterInfos;
 
 	MigrateDevicePrinterRequest({
 		this.migrateDevicePrinterInfos,
@@ -142,7 +142,7 @@ class DevicePatchDTO extends BaseDTO{
 	String? deviceType;
 	String? softwareVersion;
 	String? osVersion;
-	List<UploadDeviceFileInfoDTO>? deviceFileInfoList;
+	List<UploadDeviceFileInfoDTO >? deviceFileInfoList;
 	int fileSize;
 	String? fileName;
 
@@ -215,7 +215,7 @@ class MigrateDevicePatchInfo extends DevicePatchDTO{
 		String? deviceType,
 		String? softwareVersion,
 		String? osVersion,
-		List<UploadDeviceFileInfoDTO>? deviceFileInfoList,
+		List<UploadDeviceFileInfoDTO >? deviceFileInfoList,
 		int fileSize = 0,
 		String? fileName,
 	}) : super(
@@ -257,7 +257,7 @@ class MigrateDevicePatchInfo extends DevicePatchDTO{
 }
 
 class MigrateDevicePatchRequest extends TokenRequest{
-	List<MigrateDevicePatchInfo>? migrateDevicePatchInfos;
+	List<MigrateDevicePatchInfo >? migrateDevicePatchInfos;
 
 	MigrateDevicePatchRequest({
 		this.migrateDevicePatchInfos,
@@ -315,7 +315,7 @@ class DeviceExtendInfoDTO extends DeviceInfoDTO{
 	String? organizationDirectorCode;
 	String? organizationDirectorUserName;
 	String? organizationDirectorFullName;
-	List<DictionaryLanguageConfigDTO>? languageConfigs;
+	List<DictionaryLanguageConfigDTO >? languageConfigs;
 	bool isEmergencyDevice;
 	bool isCanRemoteMaintenance;
 	bool isCanRestart;
@@ -351,12 +351,12 @@ class DeviceExtendInfoDTO extends DeviceInfoDTO{
 		String? systemVersion,
 		String? cPUModel,
 		String? systemLanguage,
-		List<String>? diagnosisModules,
-		List<String>? reportPosterCodes,
+		List<String >? diagnosisModules,
+		List<String >? reportPosterCodes,
 		bool mergedChannel = false,
 		int mergedVideoOutputWidth = 0,
 		int mergedVideoOutputHeight = 0,
-		List<VideoDeviceDTO>? videoDeviceInfos,
+		List<VideoDeviceDTO >? videoDeviceInfos,
 		DownloadModeSettingEnum downloadModeSetting = DownloadModeSettingEnum.Auto,
 		bool liveOpened = false,
 		bool supportRtc = false,
@@ -509,7 +509,7 @@ class GetPersonDeviceRequest extends PageRequest{
 	String? keyWord;
 	String? deviceType;
 	String? deviceModel;
-	List<String>? organizationCodes;
+	List<String >? organizationCodes;
 	bool? isOnline;
 
 	GetPersonDeviceRequest({
@@ -584,11 +584,13 @@ class SelectItemDTO {
 
 class GetPersonDeviceDropdownPageRequest extends PageRequest{
 	String? keyWord;
-	List<String>? restrictOrgCodes;
+	List<String >? restrictOrgCodes;
+	bool isIncloudReferral;
 
 	GetPersonDeviceDropdownPageRequest({
 		this.keyWord,
 		this.restrictOrgCodes,
+		this.isIncloudReferral = false,
 		int pageIndex = 0,
 		int pageSize = 0,
 		String? token,
@@ -602,6 +604,7 @@ class GetPersonDeviceDropdownPageRequest extends PageRequest{
 		return GetPersonDeviceDropdownPageRequest( 
 			keyWord: map['KeyWord'],
 			restrictOrgCodes: map['RestrictOrgCodes'] != null ? map['RestrictOrgCodes'].cast<String>().toList() : null,
+			isIncloudReferral: map['IsIncloudReferral'],
 			pageIndex: map['PageIndex'],
 			pageSize: map['PageSize'],
 			token: map['Token'],
@@ -614,6 +617,7 @@ class GetPersonDeviceDropdownPageRequest extends PageRequest{
 			map['KeyWord'] = keyWord;
 		if(restrictOrgCodes != null)
 			map['RestrictOrgCodes'] = restrictOrgCodes;
+		map['IsIncloudReferral'] = isIncloudReferral;
 		return map;
 	}
 }
@@ -944,7 +948,7 @@ class DictionaryDTO extends BaseDTO{
 	DictionaryTypeEnum dictionaryType;
 	String? value;
 	String? parentCode;
-	List<DictionaryLanguageConfigDTO>? languageConfigs;
+	List<DictionaryLanguageConfigDTO >? languageConfigs;
 
 	DictionaryDTO({
 		this.dictionaryCode,
@@ -1040,7 +1044,7 @@ class FindDeviceTypeItemsRequest extends TokenRequest{
 }
 
 class CreateShareDeviceToUserRequest extends TokenRequest{
-	List<String>? userCodes;
+	List<String >? userCodes;
 	String? deviceCode;
 
 	CreateShareDeviceToUserRequest({
@@ -1070,7 +1074,7 @@ class CreateShareDeviceToUserRequest extends TokenRequest{
 }
 
 class DeleteShareDeviceToUserRequest extends TokenRequest{
-	List<String>? userCodes;
+	List<String >? userCodes;
 	String? deviceCode;
 
 	DeleteShareDeviceToUserRequest({
@@ -1394,7 +1398,7 @@ class ModifyDeviceDiagnosisModuleStateRequest extends TokenRequest{
 
 class ReportVideoDeviceInfoResult {
 	bool success;
-	List<VideoDeviceDTO>? videoDeviceOutputInfos;
+	List<VideoDeviceDTO >? videoDeviceOutputInfos;
 
 	ReportVideoDeviceInfoResult({
 		this.success = false,
@@ -1467,7 +1471,7 @@ class ReportVideoDeviceInfoRequest extends TokenRequest{
 	bool supportRtc;
 	bool mergedChannel;
 	bool remoteControlOpened;
-	List<VideoDeviceInfo>? videoDeviceInfos;
+	List<VideoDeviceInfo >? videoDeviceInfos;
 
 	ReportVideoDeviceInfoRequest({
 		this.liveOpened = false,
@@ -1543,8 +1547,8 @@ class ApplicationSettingInfoDTO {
 
 class ProbeInfoDTO {
 	String? name;
-	List<String>? applications;
-	List<ApplicationSettingInfoDTO>? applicationInfos;
+	List<String >? applications;
+	List<ApplicationSettingInfoDTO >? applicationInfos;
 
 	ProbeInfoDTO({
 		this.name,
@@ -1573,7 +1577,7 @@ class ProbeInfoDTO {
 }
 
 class ProbeApplicationInfoDTO {
-	List<ProbeInfoDTO>? probes;
+	List<ProbeInfoDTO >? probes;
 	String? activeProbe;
 	String? activeApplication;
 
@@ -1605,7 +1609,7 @@ class ProbeApplicationInfoDTO {
 
 class ControlParameterDTO {
 	bool canExecute;
-	List<ControlParameterDTO>? children;
+	List<ControlParameterDTO >? children;
 	String? description;
 	String? displayValue;
 	String? parentDescription;
@@ -1720,7 +1724,7 @@ class JoinDeviceLiveRoomResult extends TokenRequest{
 	bool mergedChannel;
 	int mergedVideoOutputWidth;
 	int mergedVideoOutputHeight;
-	List<VideoDeviceInfoDTO>? videoDeviceInfos;
+	List<VideoDeviceInfoDTO >? videoDeviceInfos;
 	int reportStateIntervalSeconds;
 	bool isOldPlatform;
 	bool supportRtc;
@@ -1907,7 +1911,7 @@ class JoinDeviceLiveRoomByShareResult {
 	bool mergedChannel;
 	int mergedVideoOutputWidth;
 	int mergedVideoOutputHeight;
-	List<VideoDeviceInfoDTO>? videoDeviceInfos;
+	List<VideoDeviceInfoDTO >? videoDeviceInfos;
 	int reportStateIntervalSeconds;
 	bool isOldPlatform;
 	bool supportRtc;
@@ -2322,7 +2326,7 @@ class ControlDeviceParameterRequest extends BaseControlDeviceParameterRequest{
 	ControlDeviceParameterRequest({
 		this.deviceCode,
 		this.consultationCode,
-		List<AdditionParameterDTO>? parameters,
+		List<AdditionParameterDTO >? parameters,
 		ControlDeviceParameterEnum controlType = ControlDeviceParameterEnum.Start,
 		bool isNeedSyn = false,
 		String? token,
@@ -2611,7 +2615,7 @@ class AddDevicePatchRequest extends TokenRequest{
 	String? deviceType;
 	String? softwareVersion;
 	String? osVersion;
-	List<UploadDeviceFileInfoDTO>? fileUploadInfoList;
+	List<UploadDeviceFileInfoDTO >? fileUploadInfoList;
 	int fileSize;
 	String? fileName;
 
@@ -2802,7 +2806,7 @@ class PushDevicePatchRequest extends TokenRequest{
 class FindPushDevicePatchPageRequest extends PageRequest{
 	String? keyword;
 	String? deviceCode;
-	List<String>? findOnlyDeviceTypes;
+	List<String >? findOnlyDeviceTypes;
 
 	FindPushDevicePatchPageRequest({
 		this.keyword,
@@ -3133,10 +3137,10 @@ class AddDevicePrinterRequest extends TokenRequest{
 	String? name;
 	String? description;
 	String? osVersion;
-	List<UploadDeviceFileInfoDTO>? fileUploadInfoList;
+	List<UploadDeviceFileInfoDTO >? fileUploadInfoList;
 	int fileSize;
 	String? printerBrands;
-	List<String>? printerModels;
+	List<String >? printerModels;
 	String? fileName;
 
 	AddDevicePrinterRequest({
@@ -3287,7 +3291,7 @@ class UpdateDevicePrinterRequest extends TokenRequest{
 class SetDevicePrinterRequest extends TokenRequest{
 	String? deviceCode;
 	DevicePrinterEnum setPrinterEnum;
-	List<DevicePrinterParameter>? parameters;
+	List<DevicePrinterParameter >? parameters;
 
 	SetDevicePrinterRequest({
 		this.deviceCode,
@@ -3321,7 +3325,7 @@ class SetDevicePrinterRequest extends TokenRequest{
 class UploadDevicePrinterRequest extends TokenRequest{
 	String? userCode;
 	DevicePrinterEnum setPrinterEnum;
-	List<DevicePrinterParameterDTO>? devicePrinterList;
+	List<DevicePrinterParameterDTO >? devicePrinterList;
 	RemoteDeviceStateEnum remoteDeviceState;
 
 	UploadDevicePrinterRequest({
@@ -3630,7 +3634,7 @@ class DeviceConnectStateResult {
 }
 
 class GetDeviceStateListRequest extends TokenRequest{
-	List<String>? deviceCodes;
+	List<String >? deviceCodes;
 
 	GetDeviceStateListRequest({
 		this.deviceCodes,
@@ -3681,7 +3685,7 @@ class DeivceCancelLogDownloadRequest extends TokenRequest{
 
 class ProbeSettingInfoDTO {
 	String? name;
-	List<ApplicationSettingInfoDTO>? applications;
+	List<ApplicationSettingInfoDTO >? applications;
 
 	ProbeSettingInfoDTO({
 		this.name,
@@ -3706,7 +3710,7 @@ class ProbeSettingInfoDTO {
 }
 
 class ProbeApplicationSettingInfoDTO {
-	List<ProbeSettingInfoDTO>? probes;
+	List<ProbeSettingInfoDTO >? probes;
 	String? activeProbe;
 	String? activeApplication;
 	int maxNumberForApplication;
@@ -3927,8 +3931,8 @@ class DeviceRemoteConnectRequest {
 }
 
 class RemoteConnectsRequest {
-	List<UserRemoteConnectRequest>? userRemoteConnect;
-	List<DeviceRemoteConnectRequest>? deviceRemoteConnect;
+	List<UserRemoteConnectRequest >? userRemoteConnect;
+	List<DeviceRemoteConnectRequest >? deviceRemoteConnect;
 
 	RemoteConnectsRequest({
 		this.userRemoteConnect,

+ 155 - 115
lib/services/education.m.dart

@@ -78,8 +78,8 @@ class CourseLabelDTO extends BaseLabelInfoDTO{
 	LabelTypeEnum type;
 	OrganizationPatientTypeEnum useObjectType;
 	bool isLastLevel;
-	List<CourseLabelDTO>? childLabels;
-	List<LabelLanguageConfigDTO>? labelLanguageConfigs;
+	List<CourseLabelDTO >? childLabels;
+	List<LabelLanguageConfigDTO >? labelLanguageConfigs;
 
 	CourseLabelDTO({
 		this.languageCode,
@@ -183,6 +183,38 @@ enum CourseAudienceTypeEnum {
 	PrivateClass,
 }
 
+class ValueType {
+
+	ValueType();
+
+	factory ValueType.fromJson(Map<String, dynamic> map) {
+		return ValueType( 
+		);
+	}
+
+	Map<String, dynamic> toJson() {
+		final map = Map<String, dynamic>();
+		return map;
+	}
+}
+
+class Decimal extends ValueType{
+
+	Decimal(
+	) : super(
+		);
+
+	factory Decimal.fromJson(Map<String, dynamic> map) {
+		return Decimal( 
+		);
+	}
+
+	Map<String, dynamic> toJson() {
+		final map = super.toJson();
+		return map;
+	}
+}
+
 enum CourseAppearTypeEnum {
 	Unknown,
 	Independent,
@@ -199,18 +231,18 @@ class ApplyCourseRequest extends TokenRequest{
 	CourseTypeEnum courseType;
 	CourseAudienceTypeEnum audienceType;
 	String? coursewareToken;
-	List<String>? caseLabelCodes;
-	List<String>? courseLabelCodes;
-	List<String>? userGroupCodes;
-	double price;
-	List<String>? courseVideoCodes;
-	List<String>? courseMaterialCodes;
-	List<String>? bindExams;
+	List<String >? caseLabelCodes;
+	List<String >? courseLabelCodes;
+	List<String >? userGroupCodes;
+	Decimal? price;
+	List<String >? courseVideoCodes;
+	List<String >? courseMaterialCodes;
+	List<String >? bindExams;
 	bool isSmallClass;
-	List<String>? assistants;
-	List<String>? experts;
+	List<String >? assistants;
+	List<String >? experts;
 	bool isAgentCourse;
-	List<String>? courseAlbumCodes;
+	List<String >? courseAlbumCodes;
 	CourseAppearTypeEnum courseAppearType;
 
 	ApplyCourseRequest({
@@ -226,7 +258,7 @@ class ApplyCourseRequest extends TokenRequest{
 		this.caseLabelCodes,
 		this.courseLabelCodes,
 		this.userGroupCodes,
-		this.price = 0,
+		this.price,
 		this.courseVideoCodes,
 		this.courseMaterialCodes,
 		this.bindExams,
@@ -255,7 +287,7 @@ class ApplyCourseRequest extends TokenRequest{
 			caseLabelCodes: map['CaseLabelCodes'] != null ? map['CaseLabelCodes'].cast<String>().toList() : null,
 			courseLabelCodes: map['CourseLabelCodes'] != null ? map['CourseLabelCodes'].cast<String>().toList() : null,
 			userGroupCodes: map['UserGroupCodes'] != null ? map['UserGroupCodes'].cast<String>().toList() : null,
-			price: double.parse(map['Price'].toString()),
+			price: map['Price'] != null ? Decimal.fromJson(map['Price']) : null,
 			courseVideoCodes: map['CourseVideoCodes'] != null ? map['CourseVideoCodes'].cast<String>().toList() : null,
 			courseMaterialCodes: map['CourseMaterialCodes'] != null ? map['CourseMaterialCodes'].cast<String>().toList() : null,
 			bindExams: map['BindExams'] != null ? map['BindExams'].cast<String>().toList() : null,
@@ -292,7 +324,8 @@ class ApplyCourseRequest extends TokenRequest{
 			map['CourseLabelCodes'] = courseLabelCodes;
 		if(userGroupCodes != null)
 			map['UserGroupCodes'] = userGroupCodes;
-		map['Price'] = price;
+		if(price != null)
+			map['Price'] = price;
 		if(courseVideoCodes != null)
 			map['CourseVideoCodes'] = courseVideoCodes;
 		if(courseMaterialCodes != null)
@@ -457,8 +490,8 @@ class CourseExaminationQuestionDTO {
 	String? code;
 	String? stem;
 	QuestionTypeEnum questionType;
-	List<QuestionOptionDTO>? questionOptionList;
-	List<QuestionFileDTO>? fileList;
+	List<QuestionOptionDTO >? questionOptionList;
+	List<QuestionFileDTO >? fileList;
 	bool trueOrFalse;
 	double score;
 
@@ -502,7 +535,7 @@ class CourseExaminationQuestionDTO {
 }
 
 class CourseExaminationDTO extends BaseCourseExaminationDTO{
-	List<CourseExaminationQuestionDTO>? questionList;
+	List<CourseExaminationQuestionDTO >? questionList;
 	int submitLimitCount;
 	int passingScore;
 
@@ -669,18 +702,18 @@ class BaseCourseInfoDTO {
 	String? creatorCode;
 	String? organizationCode;
 	DateTime? createTime;
-	double price;
-	List<String>? courseLabelCodes;
-	List<String>? caseLabelCodes;
-	List<String>? userGroupCodes;
-	List<String>? courseVideoCodes;
-	List<String>? courseMaterialCodes;
-	List<CourseExaminationDTO>? bindExams;
+	Decimal? price;
+	List<String >? courseLabelCodes;
+	List<String >? caseLabelCodes;
+	List<String >? userGroupCodes;
+	List<String >? courseVideoCodes;
+	List<String >? courseMaterialCodes;
+	List<CourseExaminationDTO >? bindExams;
 	bool isSmallClass;
-	List<StudentInfoDTO>? assistants;
-	List<StudentInfoDTO>? experts;
+	List<StudentInfoDTO >? assistants;
+	List<StudentInfoDTO >? experts;
 	bool isAgentCourse;
-	List<String>? courseAlbumCodes;
+	List<String >? courseAlbumCodes;
 	CourseAppearTypeEnum courseAppearType;
 	bool isStick;
 	int sort;
@@ -710,7 +743,7 @@ class BaseCourseInfoDTO {
 		this.creatorCode,
 		this.organizationCode,
 		this.createTime,
-		this.price = 0,
+		this.price,
 		this.courseLabelCodes,
 		this.caseLabelCodes,
 		this.userGroupCodes,
@@ -753,7 +786,7 @@ class BaseCourseInfoDTO {
 			creatorCode: map['CreatorCode'],
 			organizationCode: map['OrganizationCode'],
 			createTime: map['CreateTime'] != null ? DateTime.parse(map['CreateTime']) : null,
-			price: double.parse(map['Price'].toString()),
+			price: map['Price'] != null ? Decimal.fromJson(map['Price']) : null,
 			courseLabelCodes: map['CourseLabelCodes'] != null ? map['CourseLabelCodes'].cast<String>().toList() : null,
 			caseLabelCodes: map['CaseLabelCodes'] != null ? map['CaseLabelCodes'].cast<String>().toList() : null,
 			userGroupCodes: map['UserGroupCodes'] != null ? map['UserGroupCodes'].cast<String>().toList() : null,
@@ -810,7 +843,8 @@ class BaseCourseInfoDTO {
 			map['OrganizationCode'] = organizationCode;
 		if(createTime != null)
 			map['CreateTime'] = JsonRpcUtils.dateFormat(createTime!);
-		map['Price'] = price;
+		if(price != null)
+			map['Price'] = price;
 		if(courseLabelCodes != null)
 			map['CourseLabelCodes'] = courseLabelCodes;
 		if(caseLabelCodes != null)
@@ -1030,12 +1064,12 @@ class BaseCourseAlbumDTO {
 }
 
 class CourseInfoDetailDTO extends BaseCourseInfoDTO{
-	List<BaseLabelInfoDTO>? caseLabels;
-	List<BaseLabelInfoDTO>? courseLabels;
-	List<BaseUserGroupDTO>? userGroups;
-	List<VideoInfoDTO>? courseVideos;
-	List<VideoInfoDTO>? courseMaterials;
-	List<BaseCourseAlbumDTO>? courseAlbums;
+	List<BaseLabelInfoDTO >? caseLabels;
+	List<BaseLabelInfoDTO >? courseLabels;
+	List<BaseUserGroupDTO >? userGroups;
+	List<VideoInfoDTO >? courseVideos;
+	List<VideoInfoDTO >? courseMaterials;
+	List<BaseCourseAlbumDTO >? courseAlbums;
 	bool needPay;
 	StudentCourseStatusEnum signCourseStatus;
 	bool isPay;
@@ -1076,18 +1110,18 @@ class CourseInfoDetailDTO extends BaseCourseInfoDTO{
 		String? creatorCode,
 		String? organizationCode,
 		DateTime? createTime,
-		double price = 0,
-		List<String>? courseLabelCodes,
-		List<String>? caseLabelCodes,
-		List<String>? userGroupCodes,
-		List<String>? courseVideoCodes,
-		List<String>? courseMaterialCodes,
-		List<CourseExaminationDTO>? bindExams,
+		Decimal? price,
+		List<String >? courseLabelCodes,
+		List<String >? caseLabelCodes,
+		List<String >? userGroupCodes,
+		List<String >? courseVideoCodes,
+		List<String >? courseMaterialCodes,
+		List<CourseExaminationDTO >? bindExams,
 		bool isSmallClass = false,
-		List<StudentInfoDTO>? assistants,
-		List<StudentInfoDTO>? experts,
+		List<StudentInfoDTO >? assistants,
+		List<StudentInfoDTO >? experts,
 		bool isAgentCourse = false,
-		List<String>? courseAlbumCodes,
+		List<String >? courseAlbumCodes,
 		CourseAppearTypeEnum courseAppearType = CourseAppearTypeEnum.Unknown,
 		bool isStick = false,
 		int sort = 0,
@@ -1172,7 +1206,7 @@ class CourseInfoDetailDTO extends BaseCourseInfoDTO{
 			creatorCode: map['CreatorCode'],
 			organizationCode: map['OrganizationCode'],
 			createTime: map['CreateTime'] != null ? DateTime.parse(map['CreateTime']) : null,
-			price: double.parse(map['Price'].toString()),
+			price: map['Price'] != null ? Decimal.fromJson(map['Price']) : null,
 			courseLabelCodes: map['CourseLabelCodes'] != null ? map['CourseLabelCodes'].cast<String>().toList() : null,
 			caseLabelCodes: map['CaseLabelCodes'] != null ? map['CaseLabelCodes'].cast<String>().toList() : null,
 			userGroupCodes: map['UserGroupCodes'] != null ? map['UserGroupCodes'].cast<String>().toList() : null,
@@ -1231,7 +1265,7 @@ enum QueryCourseApprovalStatusEnum {
 
 class FindCoursePagesRequest extends PageRequest{
 	String? keyword;
-	List<String>? courseLabels;
+	List<String >? courseLabels;
 	DateTime? startTime;
 	DateTime? endTime;
 	String? teacherCode;
@@ -1330,19 +1364,19 @@ class UpdateCourseRequest extends TokenRequest{
 	CourseTypeEnum courseType;
 	CourseAudienceTypeEnum audienceType;
 	String? coursewareToken;
-	List<String>? caseLabelCodes;
-	List<String>? courseLabelCodes;
-	List<String>? userGroupCodes;
-	double price;
-	List<String>? courseVideoCodes;
-	List<String>? bindExams;
+	List<String >? caseLabelCodes;
+	List<String >? courseLabelCodes;
+	List<String >? userGroupCodes;
+	Decimal? price;
+	List<String >? courseVideoCodes;
+	List<String >? bindExams;
 	bool isSmallClass;
-	List<String>? assistants;
-	List<String>? experts;
+	List<String >? assistants;
+	List<String >? experts;
 	bool isAgentCourse;
-	List<String>? courseAlbumCodes;
+	List<String >? courseAlbumCodes;
 	CourseAppearTypeEnum courseAppearType;
-	List<String>? courseMaterialCodes;
+	List<String >? courseMaterialCodes;
 
 	UpdateCourseRequest({
 		this.code,
@@ -1358,7 +1392,7 @@ class UpdateCourseRequest extends TokenRequest{
 		this.caseLabelCodes,
 		this.courseLabelCodes,
 		this.userGroupCodes,
-		this.price = 0,
+		this.price,
 		this.courseVideoCodes,
 		this.bindExams,
 		this.isSmallClass = false,
@@ -1388,7 +1422,7 @@ class UpdateCourseRequest extends TokenRequest{
 			caseLabelCodes: map['CaseLabelCodes'] != null ? map['CaseLabelCodes'].cast<String>().toList() : null,
 			courseLabelCodes: map['CourseLabelCodes'] != null ? map['CourseLabelCodes'].cast<String>().toList() : null,
 			userGroupCodes: map['UserGroupCodes'] != null ? map['UserGroupCodes'].cast<String>().toList() : null,
-			price: double.parse(map['Price'].toString()),
+			price: map['Price'] != null ? Decimal.fromJson(map['Price']) : null,
 			courseVideoCodes: map['CourseVideoCodes'] != null ? map['CourseVideoCodes'].cast<String>().toList() : null,
 			bindExams: map['BindExams'] != null ? map['BindExams'].cast<String>().toList() : null,
 			isSmallClass: map['IsSmallClass'],
@@ -1427,7 +1461,8 @@ class UpdateCourseRequest extends TokenRequest{
 			map['CourseLabelCodes'] = courseLabelCodes;
 		if(userGroupCodes != null)
 			map['UserGroupCodes'] = userGroupCodes;
-		map['Price'] = price;
+		if(price != null)
+			map['Price'] = price;
 		if(courseVideoCodes != null)
 			map['CourseVideoCodes'] = courseVideoCodes;
 		if(bindExams != null)
@@ -1514,13 +1549,13 @@ class FindMyCoursePagesRequest extends PageRequest{
 
 class CourseAlbumDTO extends BaseCourseAlbumDTO{
 	String? cover;
-	List<String>? courseCodes;
+	List<String >? courseCodes;
 	String? introduction;
-	List<String>? courseLabelCodes;
+	List<String >? courseLabelCodes;
 	String? teacherCode;
 	String? teacherName;
 	CourseViewRangeEnum viewRange;
-	double price;
+	Decimal? price;
 	DateTime? createTime;
 	int sort;
 	bool isStick;
@@ -1533,7 +1568,7 @@ class CourseAlbumDTO extends BaseCourseAlbumDTO{
 		this.teacherCode,
 		this.teacherName,
 		this.viewRange = CourseViewRangeEnum.All,
-		this.price = 0,
+		this.price,
 		this.createTime,
 		this.sort = 0,
 		this.isStick = false,
@@ -1553,7 +1588,7 @@ class CourseAlbumDTO extends BaseCourseAlbumDTO{
 			teacherCode: map['TeacherCode'],
 			teacherName: map['TeacherName'],
 			viewRange: CourseViewRangeEnum.values.firstWhere((e) => e.index == map['ViewRange']),
-			price: double.parse(map['Price'].toString()),
+			price: map['Price'] != null ? Decimal.fromJson(map['Price']) : null,
 			createTime: map['CreateTime'] != null ? DateTime.parse(map['CreateTime']) : null,
 			sort: map['Sort'],
 			isStick: map['IsStick'],
@@ -1577,7 +1612,8 @@ class CourseAlbumDTO extends BaseCourseAlbumDTO{
 		if(teacherName != null)
 			map['TeacherName'] = teacherName;
 		map['ViewRange'] = viewRange.index;
-		map['Price'] = price;
+		if(price != null)
+			map['Price'] = price;
 		if(createTime != null)
 			map['CreateTime'] = JsonRpcUtils.dateFormat(createTime!);
 		map['Sort'] = sort;
@@ -1590,7 +1626,7 @@ class UserGroupDTO extends BaseUserGroupDTO{
 	int maxPeople;
 	String? creatorCode;
 	String? creatorName;
-	List<StudentInfoDTO>? students;
+	List<StudentInfoDTO >? students;
 	int courseCount;
 	int practiceCount;
 	int examCount;
@@ -1698,8 +1734,8 @@ class UserGroupRequest extends TokenRequest{
 	String? name;
 	int maxPeople;
 	String? creatorCode;
-	List<StudentInfoDTO>? students;
-	List<String>? removeStudentCodes;
+	List<StudentInfoDTO >? students;
+	List<String >? removeStudentCodes;
 	bool isAgent;
 	bool notValidateRepeat;
 
@@ -1754,7 +1790,7 @@ class UserGroupFilterRequest extends TokenRequest{
 	String? userGroupCode;
 	String? creatorCode;
 	String? keyword;
-	List<String>? studentCodes;
+	List<String >? studentCodes;
 
 	UserGroupFilterRequest({
 		this.userGroupCode,
@@ -2264,8 +2300,8 @@ class FindCourseExaminationPaperByCodeRequest extends TokenRequest{
 class StudentSetExaminationAnswerDTO {
 	String? questionCode;
 	String? answer;
-	List<String>? files;
-	List<String>? optionCodeList;
+	List<String >? files;
+	List<String >? optionCodeList;
 
 	StudentSetExaminationAnswerDTO({
 		this.questionCode,
@@ -2300,7 +2336,7 @@ class StudentSetExaminationAnswerDTO {
 class SubmitCourseExaminationPaperRequest extends TokenRequest{
 	String? courseCode;
 	String? code;
-	List<StudentSetExaminationAnswerDTO>? answers;
+	List<StudentSetExaminationAnswerDTO >? answers;
 
 	SubmitCourseExaminationPaperRequest({
 		this.courseCode,
@@ -2412,8 +2448,8 @@ class ExaminationAnswerDTO {
 	String? questionCode;
 	QuestionTypeEnum questionType;
 	String? answer;
-	List<String>? files;
-	List<String>? optionCodeList;
+	List<String >? files;
+	List<String >? optionCodeList;
 	bool isCorrect;
 	double score;
 
@@ -2458,7 +2494,7 @@ class ExaminationAnswerDTO {
 
 class StudentExaminationDetailDTO extends BaseStudentExaminationDTO{
 	CourseExaminationDTO? examination;
-	List<ExaminationAnswerDTO>? studentAnswers;
+	List<ExaminationAnswerDTO >? studentAnswers;
 
 	StudentExaminationDetailDTO({
 		this.examination,
@@ -2554,7 +2590,7 @@ class TeacherSetExaminationAnswerDTO {
 
 class SubmitReviewStudentExaminationRequest extends TokenRequest{
 	String? code;
-	List<TeacherSetExaminationAnswerDTO>? answers;
+	List<TeacherSetExaminationAnswerDTO >? answers;
 
 	SubmitReviewStudentExaminationRequest({
 		this.code,
@@ -2671,7 +2707,7 @@ class InitiateLiveCourseResult extends LiveCourseBaseResult{
 	int appId;
 	String? userSign;
 	int heartRateInterval;
-	List<LiveCourseMember>? memberLiveDatas;
+	List<LiveCourseMember >? memberLiveDatas;
 	LiveDataDTO? courseChannel;
 	LiveDataDTO? othersScreenSharingChannel;
 	ScreenSharingChannelDTO? rtcScreenSharingChannel;
@@ -2761,8 +2797,8 @@ class JoinLiveCourseResult extends LiveCourseBaseResult{
 	TransactionStatusEnum liveProtocol;
 	int appId;
 	String? userSign;
-	List<LiveCourseMember>? memberLiveDatas;
-	List<LiveCourseMember>? deviceLiveDatas;
+	List<LiveCourseMember >? memberLiveDatas;
+	List<LiveCourseMember >? deviceLiveDatas;
 	int heartRateInterval;
 	LiveDataDTO? courseChannel;
 	ShareInfoDTO? shareInfo;
@@ -3014,7 +3050,7 @@ class SetVideoLiveCourseRequest extends InitiateLiveCourseRequest{
 }
 
 class ControlParameterInCourseRequest extends InitiateLiveCourseRequest{
-	List<AdditionParameterDTO>? parameters;
+	List<AdditionParameterDTO >? parameters;
 	ControlDeviceParameterEnum controlType;
 
 	ControlParameterInCourseRequest({
@@ -3348,16 +3384,16 @@ class StudyCompletedRequest {
 
 class AddCourseAlbumRequest extends TokenRequest{
 	String? name;
-	List<String>? courseCodes;
+	List<String >? courseCodes;
 	String? cover;
 	String? introduction;
-	List<String>? courseLabelCodes;
+	List<String >? courseLabelCodes;
 	int sort;
 	bool isStick;
 	String? teacherCode;
 	String? teacherName;
 	CourseViewRangeEnum viewRange;
-	double price;
+	Decimal? price;
 
 	AddCourseAlbumRequest({
 		this.name,
@@ -3370,7 +3406,7 @@ class AddCourseAlbumRequest extends TokenRequest{
 		this.teacherCode,
 		this.teacherName,
 		this.viewRange = CourseViewRangeEnum.All,
-		this.price = 0,
+		this.price,
 		String? token,
 	}) : super(
 			token: token,
@@ -3388,7 +3424,7 @@ class AddCourseAlbumRequest extends TokenRequest{
 			teacherCode: map['TeacherCode'],
 			teacherName: map['TeacherName'],
 			viewRange: CourseViewRangeEnum.values.firstWhere((e) => e.index == map['ViewRange']),
-			price: double.parse(map['Price'].toString()),
+			price: map['Price'] != null ? Decimal.fromJson(map['Price']) : null,
 			token: map['Token'],
 		);
 	}
@@ -3412,7 +3448,8 @@ class AddCourseAlbumRequest extends TokenRequest{
 		if(teacherName != null)
 			map['TeacherName'] = teacherName;
 		map['ViewRange'] = viewRange.index;
-		map['Price'] = price;
+		if(price != null)
+			map['Price'] = price;
 		return map;
 	}
 }
@@ -3441,14 +3478,14 @@ class DeleteCourseAlbumRequest {
 class CourseCommonInfoDTO extends BaseCourseAlbumDTO{
 	String? cover;
 	String? introduction;
-	List<String>? courseLabels;
+	List<String >? courseLabels;
 	String? teacherCode;
 	String? teacherName;
 	CourseViewRangeEnum viewRange;
-	double price;
+	Decimal? price;
 	CourseTypeEnum courseType;
-	List<BaseUserGroupDTO>? userGroupList;
-	List<BaseCourseAlbumDTO>? courseAlbumList;
+	List<BaseUserGroupDTO >? userGroupList;
+	List<BaseCourseAlbumDTO >? courseAlbumList;
 	StudentCourseStatusEnum signCourseStatus;
 	bool isPay;
 	DateTime? createTime;
@@ -3460,7 +3497,7 @@ class CourseCommonInfoDTO extends BaseCourseAlbumDTO{
 		this.teacherCode,
 		this.teacherName,
 		this.viewRange = CourseViewRangeEnum.All,
-		this.price = 0,
+		this.price,
 		this.courseType = CourseTypeEnum.Unknown,
 		this.userGroupList,
 		this.courseAlbumList,
@@ -3482,7 +3519,7 @@ class CourseCommonInfoDTO extends BaseCourseAlbumDTO{
 			teacherCode: map['TeacherCode'],
 			teacherName: map['TeacherName'],
 			viewRange: CourseViewRangeEnum.values.firstWhere((e) => e.index == map['ViewRange']),
-			price: double.parse(map['Price'].toString()),
+			price: map['Price'] != null ? Decimal.fromJson(map['Price']) : null,
 			courseType: CourseTypeEnum.values.firstWhere((e) => e.index == map['CourseType']),
 			userGroupList: map['UserGroupList'] != null ? (map['UserGroupList'] as List).map((e)=>BaseUserGroupDTO.fromJson(e as Map<String,dynamic>)).toList() : null,
 			courseAlbumList: map['CourseAlbumList'] != null ? (map['CourseAlbumList'] as List).map((e)=>BaseCourseAlbumDTO.fromJson(e as Map<String,dynamic>)).toList() : null,
@@ -3507,7 +3544,8 @@ class CourseCommonInfoDTO extends BaseCourseAlbumDTO{
 		if(teacherName != null)
 			map['TeacherName'] = teacherName;
 		map['ViewRange'] = viewRange.index;
-		map['Price'] = price;
+		if(price != null)
+			map['Price'] = price;
 		map['CourseType'] = courseType.index;
 		if(userGroupList != null)
 			map['UserGroupList'] = userGroupList;
@@ -3522,17 +3560,17 @@ class CourseCommonInfoDTO extends BaseCourseAlbumDTO{
 }
 
 class CourseAlbumExtendDTO extends BaseCourseAlbumDTO{
-	List<CourseInfoDetailDTO>? courseInfos;
+	List<CourseInfoDetailDTO >? courseInfos;
 	int signInCount;
 	String? cover;
-	List<String>? courseCodes;
+	List<String >? courseCodes;
 	String? introduction;
-	List<String>? courseLabelCodes;
-	List<String>? courseLabelNames;
+	List<String >? courseLabelCodes;
+	List<String >? courseLabelNames;
 	String? teacherCode;
 	String? teacherName;
 	CourseViewRangeEnum viewRange;
-	double price;
+	Decimal? price;
 	DateTime? createTime;
 	int sort;
 	bool isStick;
@@ -3550,7 +3588,7 @@ class CourseAlbumExtendDTO extends BaseCourseAlbumDTO{
 		this.teacherCode,
 		this.teacherName,
 		this.viewRange = CourseViewRangeEnum.All,
-		this.price = 0,
+		this.price,
 		this.createTime,
 		this.sort = 0,
 		this.isStick = false,
@@ -3575,7 +3613,7 @@ class CourseAlbumExtendDTO extends BaseCourseAlbumDTO{
 			teacherCode: map['TeacherCode'],
 			teacherName: map['TeacherName'],
 			viewRange: CourseViewRangeEnum.values.firstWhere((e) => e.index == map['ViewRange']),
-			price: double.parse(map['Price'].toString()),
+			price: map['Price'] != null ? Decimal.fromJson(map['Price']) : null,
 			createTime: map['CreateTime'] != null ? DateTime.parse(map['CreateTime']) : null,
 			sort: map['Sort'],
 			isStick: map['IsStick'],
@@ -3606,7 +3644,8 @@ class CourseAlbumExtendDTO extends BaseCourseAlbumDTO{
 		if(teacherName != null)
 			map['TeacherName'] = teacherName;
 		map['ViewRange'] = viewRange.index;
-		map['Price'] = price;
+		if(price != null)
+			map['Price'] = price;
 		if(createTime != null)
 			map['CreateTime'] = JsonRpcUtils.dateFormat(createTime!);
 		map['Sort'] = sort;
@@ -3649,7 +3688,7 @@ class FindCourseAlbumByCodeRequest extends TokenRequest{
 
 class TeacherAddStudentsInUserGroupsRequest extends TokenRequest{
 	String? userGroupCode;
-	List<String>? studentCodes;
+	List<String >? studentCodes;
 
 	TeacherAddStudentsInUserGroupsRequest({
 		this.userGroupCode,
@@ -3679,7 +3718,7 @@ class TeacherAddStudentsInUserGroupsRequest extends TokenRequest{
 
 class JoinClassApprovedRequest extends TokenRequest{
 	String? userGroupCode;
-	List<String>? students;
+	List<String >? students;
 
 	JoinClassApprovedRequest({
 		this.userGroupCode,
@@ -3709,7 +3748,7 @@ class JoinClassApprovedRequest extends TokenRequest{
 
 class JoinClassRejectedRequest extends TokenRequest{
 	String? userGroupCode;
-	List<String>? students;
+	List<String >? students;
 
 	JoinClassRejectedRequest({
 		this.userGroupCode,
@@ -3816,7 +3855,7 @@ class FindStudentListRequest extends TokenRequest{
 }
 
 class CreateVideosRequest extends TokenRequest{
-	List<SaveVideoRequest>? videoList;
+	List<SaveVideoRequest >? videoList;
 
 	CreateVideosRequest({
 		this.videoList,
@@ -3844,7 +3883,7 @@ class GetUserPagesRequest extends PageRequest{
 	String? queryType;
 	String? keyword;
 	String? queryState;
-	List<String>? excludeUserCodes;
+	List<String >? excludeUserCodes;
 	String? languageCode;
 
 	GetUserPagesRequest({
@@ -4045,16 +4084,16 @@ class DeviceLeaveLiveCourseRequest extends JoinLiveCourseRequest{
 class UpdateCourseAlbumRequest extends TokenRequest{
 	String? name;
 	String? courseAlbumCode;
-	List<String>? courseCodes;
+	List<String >? courseCodes;
 	String? cover;
 	String? introduction;
-	List<String>? courseLabelCodes;
+	List<String >? courseLabelCodes;
 	int sort;
 	bool isStick;
 	String? teacherCode;
 	String? teacherName;
 	CourseViewRangeEnum viewRange;
-	double price;
+	Decimal? price;
 
 	UpdateCourseAlbumRequest({
 		this.name,
@@ -4068,7 +4107,7 @@ class UpdateCourseAlbumRequest extends TokenRequest{
 		this.teacherCode,
 		this.teacherName,
 		this.viewRange = CourseViewRangeEnum.All,
-		this.price = 0,
+		this.price,
 		String? token,
 	}) : super(
 			token: token,
@@ -4087,7 +4126,7 @@ class UpdateCourseAlbumRequest extends TokenRequest{
 			teacherCode: map['TeacherCode'],
 			teacherName: map['TeacherName'],
 			viewRange: CourseViewRangeEnum.values.firstWhere((e) => e.index == map['ViewRange']),
-			price: double.parse(map['Price'].toString()),
+			price: map['Price'] != null ? Decimal.fromJson(map['Price']) : null,
 			token: map['Token'],
 		);
 	}
@@ -4113,7 +4152,8 @@ class UpdateCourseAlbumRequest extends TokenRequest{
 		if(teacherName != null)
 			map['TeacherName'] = teacherName;
 		map['ViewRange'] = viewRange.index;
-		map['Price'] = price;
+		if(price != null)
+			map['Price'] = price;
 		return map;
 	}
 }

+ 6 - 6
lib/services/identityApply.m.dart

@@ -5,11 +5,11 @@ class IdentityApplyDTO extends BaseDTO{
 	String? identityApplyCode;
 	String? userCode;
 	String? applyRoleCode;
-	List<String>? identityCard;
-	List<String>? licenseCard;
+	List<String >? identityCard;
+	List<String >? licenseCard;
 	ApplyStateEnum applyState;
 	String? applyNote;
-	List<String>? fieldList;
+	List<String >? fieldList;
 
 	IdentityApplyDTO({
 		this.identityApplyCode,
@@ -92,9 +92,9 @@ class ApplyForRequest {
 	String? token;
 	String? extensionData;
 	String? applyRoleCode;
-	List<String>? identityCard;
-	List<String>? licenseCard;
-	List<String>? fieldList;
+	List<String >? identityCard;
+	List<String >? licenseCard;
+	List<String >? fieldList;
 
 	ApplyForRequest({
 		this.token,

+ 1 - 1
lib/services/lab.m.dart

@@ -63,7 +63,7 @@ class FileUploadInfoDTO {
 
 class RecordLaboratoryFileRequest extends TokenRequest{
 	LabUploadTypeEnum uploadType;
-	List<FileUploadInfoDTO>? fileUploadInfos;
+	List<FileUploadInfoDTO >? fileUploadInfos;
 	bool isComprehensiveAnalysis;
 	bool isSeparateAnalysis;
 	String? folderName;

+ 84 - 84
lib/services/liveConsultation.m.dart

@@ -183,7 +183,7 @@ class UserBaseDTO extends BaseDTO{
 }
 
 class OrganizationExpertDTO extends UserBaseDTO{
-	List<String>? fieldList;
+	List<String >? fieldList;
 	UserStatusEnum userStatus;
 
 	OrganizationExpertDTO({
@@ -366,9 +366,9 @@ class DataItemDTO {
 class ApplyConsultationRequest extends TokenRequest{
 	String? expertUserCode;
 	String? deviceCode;
-	List<String>? scanPositions;
+	List<String >? scanPositions;
 	DateTime? consultationTime;
-	List<DataItemDTO>? patientDatas;
+	List<DataItemDTO >? patientDatas;
 	String? patientCode;
 	String? diseases;
 	String? scanUserCode;
@@ -442,7 +442,7 @@ class UpdateConsultationRequest extends TokenRequest{
 	String? consultationCode;
 	String? expertUserCode;
 	String? deviceCode;
-	List<String>? scanPositions;
+	List<String >? scanPositions;
 	DateTime? consultationTime;
 	String? diseases;
 	String? scanUserCode;
@@ -511,8 +511,8 @@ class UpdateConsultationRequest extends TokenRequest{
 class ImproveConsultationInfoRequest extends TokenRequest{
 	String? consultationCode;
 	String? patientCode;
-	List<DataItemDTO>? patientDatas;
-	List<String>? scanPositions;
+	List<DataItemDTO >? patientDatas;
+	List<String >? scanPositions;
 	String? diseases;
 	String? primaryDiagnosis;
 
@@ -737,9 +737,9 @@ class FindConsultationByPageRequest extends PageRequest{
 	ConsultationQueryTypeEnum consultationQueryType;
 	QueryEvaluateGradeEnum evaluateGrade;
 	String? language;
-	List<String>? expertCodes;
-	List<String>? applyOrganizationCodes;
-	List<String>? expertOrganizationCodes;
+	List<String >? expertCodes;
+	List<String >? applyOrganizationCodes;
+	List<String >? expertOrganizationCodes;
 	String? patientSex;
 	QueryPatientAgeLimitDTO? patientAgeLimit;
 	String? patientDiseases;
@@ -835,7 +835,7 @@ class ConsultationItem {
 	String? diseases;
 	String? primaryDiagnosis;
 	TransactionStatusEnum consultationStatus;
-	List<String>? scanPositions;
+	List<String >? scanPositions;
 
 	ConsultationItem({
 		this.patientName,
@@ -905,7 +905,7 @@ class ConsultationItem {
 class ConsultationExportData {
 	String? patientName;
 	String? patientCode;
-	List<ConsultationItem>? consultationItemList;
+	List<ConsultationItem >? consultationItemList;
 
 	ConsultationExportData({
 		this.patientName,
@@ -967,7 +967,7 @@ class ConsultationReportItem {
 class ConsultationReportData {
 	String? patientName;
 	String? patientCode;
-	List<ConsultationReportItem>? reportItemList;
+	List<ConsultationReportItem >? reportItemList;
 
 	ConsultationReportData({
 		this.patientName,
@@ -1051,7 +1051,7 @@ class ConsultationFileItem {
 class ConsultationFileData {
 	String? patientName;
 	String? patientCode;
-	List<ConsultationFileItem>? consultationFileItemList;
+	List<ConsultationFileItem >? consultationFileItemList;
 
 	ConsultationFileData({
 		this.patientName,
@@ -1080,9 +1080,9 @@ class ConsultationFileData {
 }
 
 class ExportConsultationDataResult {
-	List<ConsultationExportData>? consultationList;
-	List<ConsultationReportData>? reportList;
-	List<ConsultationFileData>? consultationFileDatalList;
+	List<ConsultationExportData >? consultationList;
+	List<ConsultationReportData >? reportList;
+	List<ConsultationFileData >? consultationFileDatalList;
 
 	ExportConsultationDataResult({
 		this.consultationList,
@@ -1121,9 +1121,9 @@ class ExportConsultationsRequest extends TokenRequest{
 	ConsultationQueryTypeEnum consultationQueryType;
 	QueryEvaluateGradeEnum evaluateGrade;
 	String? language;
-	List<String>? expertCodes;
-	List<String>? applyOrganizationCodes;
-	List<String>? expertOrganizationCodes;
+	List<String >? expertCodes;
+	List<String >? applyOrganizationCodes;
+	List<String >? expertOrganizationCodes;
 	String? patientSex;
 	QueryPatientAgeLimitDTO? patientAgeLimit;
 	String? patientDiseases;
@@ -1397,7 +1397,7 @@ class ConsultationDetailDTO {
 	String? scanUserCode;
 	String? patientCode;
 	OrganizationPatientTypeEnum patientType;
-	List<String>? scanPositions;
+	List<String >? scanPositions;
 	DateTime? createTime;
 	DateTime? consultationTime;
 	DateTime? consultationTimeEnd;
@@ -1412,13 +1412,13 @@ class ConsultationDetailDTO {
 	String? displayName;
 	String? patientName;
 	String? sex;
-	List<DataItemDTO>? patientDatas;
-	List<ConsultationFileDTO>? consultationFileList;
+	List<DataItemDTO >? patientDatas;
+	List<ConsultationFileDTO >? consultationFileList;
 	String? rejectReason;
 	String? location;
-	List<ConsultationMemberDTO>? consultationMembers;
+	List<ConsultationMemberDTO >? consultationMembers;
 	String? description;
-	List<ConsultationReminderDTO>? consultationReminders;
+	List<ConsultationReminderDTO >? consultationReminders;
 	String? approverCode;
 	ConsultationReportMode reportMode;
 	String? diseases;
@@ -1714,9 +1714,9 @@ class ApprovalConsultationRequest extends TokenRequest{
 	DateTime? consultationTime;
 	DateTime? consultationTimeEnd;
 	String? location;
-	List<String>? consultationMemberCodes;
+	List<String >? consultationMemberCodes;
 	String? description;
-	List<ConsultationReminderDTO>? consultationReminders;
+	List<ConsultationReminderDTO >? consultationReminders;
 
 	ApprovalConsultationRequest({
 		this.consultationCode,
@@ -1889,7 +1889,7 @@ class ConsultationFileBaseDTO {
 
 class UpdateConsultationFilesInfoRequest extends TokenRequest{
 	String? consultationCode;
-	List<ConsultationFileBaseDTO>? fileInfos;
+	List<ConsultationFileBaseDTO >? fileInfos;
 
 	UpdateConsultationFilesInfoRequest({
 		this.consultationCode,
@@ -2088,10 +2088,10 @@ class UpdateMyOrganizationAssistantRequest extends TokenRequest{
 class ClientPatientInfoBaseDTO extends BaseDTO{
 	String? patientCode;
 	bool isValid;
-	List<DataItemDTO>? patientData;
+	List<DataItemDTO >? patientData;
 	int unReadRecordCount;
 	bool isReferral;
-	List<String>? devicePatientIDs;
+	List<String >? devicePatientIDs;
 	String? organizationCode;
 	String? organizationName;
 
@@ -2223,7 +2223,7 @@ class InitiateLiveConsultationResult {
 	TransactionStatusEnum liveProtocol;
 	int appId;
 	String? userSign;
-	List<LiveConsultationMember>? memberLiveDatas;
+	List<LiveConsultationMember >? memberLiveDatas;
 
 	InitiateLiveConsultationResult({
 		this.consultationCode,
@@ -2316,7 +2316,7 @@ class InviteInLiveConsultationResult {
 
 class InviteInLiveConsultationRequest extends TokenRequest{
 	String? consultationCode;
-	List<String>? inviteCodes;
+	List<String >? inviteCodes;
 	int roomNo;
 
 	InviteInLiveConsultationRequest({
@@ -2371,7 +2371,7 @@ class CancelInvitingInLiveConsultationResult {
 
 class CancelInvitingInLiveConsultationRequest extends TokenRequest{
 	String? consultationCode;
-	List<String>? inviteCodes;
+	List<String >? inviteCodes;
 
 	CancelInvitingInLiveConsultationRequest({
 		this.consultationCode,
@@ -2483,8 +2483,8 @@ class JoinLiveConsultationResult {
 	TransactionStatusEnum liveProtocol;
 	int appId;
 	String? userSign;
-	List<LiveConsultationMember>? memberLiveDatas;
-	List<InteractiveBoardDataDTO>? interactiveBoardDatas;
+	List<LiveConsultationMember >? memberLiveDatas;
+	List<InteractiveBoardDataDTO >? interactiveBoardDatas;
 
 	JoinLiveConsultationResult({
 		this.consultationCode,
@@ -2615,8 +2615,8 @@ class AcceptLiveConsultationResult {
 	TransactionStatusEnum liveProtocol;
 	int appId;
 	String? userSign;
-	List<LiveConsultationMember>? memberLiveDatas;
-	List<InteractiveBoardDataDTO>? interactiveBoardDatas;
+	List<LiveConsultationMember >? memberLiveDatas;
+	List<InteractiveBoardDataDTO >? interactiveBoardDatas;
 
 	AcceptLiveConsultationResult({
 		this.consultationCode,
@@ -3401,7 +3401,7 @@ class BaseControlDeviceRequest extends TokenRequest{
 }
 
 class BaseControlDeviceParameterRequest extends BaseControlDeviceRequest{
-	List<AdditionParameterDTO>? parameters;
+	List<AdditionParameterDTO >? parameters;
 
 	BaseControlDeviceParameterRequest({
 		this.parameters,
@@ -3436,7 +3436,7 @@ class ControlDeviceParameterInConsultationRequest extends BaseControlDeviceParam
 
 	ControlDeviceParameterInConsultationRequest({
 		this.consultationCode,
-		List<AdditionParameterDTO>? parameters,
+		List<AdditionParameterDTO >? parameters,
 		ControlDeviceParameterEnum controlType = ControlDeviceParameterEnum.Start,
 		bool isNeedSyn = false,
 		String? token,
@@ -3603,7 +3603,7 @@ class ChildrenFetusNodeDTO {
 	String? modeName;
 	String? applicationId;
 	String? application;
-	List<String>? children;
+	List<String >? children;
 
 	ChildrenFetusNodeDTO({
 		this.typeName,
@@ -3650,7 +3650,7 @@ class ChildrenFetusNodeDTO {
 class FetusNodeDTO {
 	String? typeName;
 	String? fetusIndex;
-	List<ChildrenFetusNodeDTO>? children;
+	List<ChildrenFetusNodeDTO >? children;
 
 	FetusNodeDTO({
 		this.typeName,
@@ -3680,7 +3680,7 @@ class FetusNodeDTO {
 
 class MeasuredResultsDTO {
 	String? version;
-	List<FetusNodeDTO>? fetusNodes;
+	List<FetusNodeDTO >? fetusNodes;
 
 	MeasuredResultsDTO({
 		this.version,
@@ -3761,7 +3761,7 @@ class AdornerDTO {
 
 class BaseAreaDTO {
 	String? visualAreaTypeName;
-	List<AdornerDTO>? adorner;
+	List<AdornerDTO >? adorner;
 
 	BaseAreaDTO({
 		this.visualAreaTypeName,
@@ -3786,7 +3786,7 @@ class BaseAreaDTO {
 }
 
 class VisualAreaDTO {
-	List<BaseAreaDTO>? children;
+	List<BaseAreaDTO >? children;
 
 	VisualAreaDTO({
 		this.children,
@@ -3833,7 +3833,7 @@ class VisualKeyDTO {
 }
 
 class VisualDTO {
-	List<VisualKeyDTO>? children;
+	List<VisualKeyDTO >? children;
 
 	VisualDTO({
 		this.children,
@@ -3924,9 +3924,9 @@ class CarotidResultDTO {
 	String? mdlFile;
 	String? cDNMdlFile;
 	int mdlFileSize;
-	List<MeasureImageFileDTO>? measureImageFiles;
+	List<MeasureImageFileDTO >? measureImageFiles;
 	String? measureResult;
-	List<String>? surfaceImageList;
+	List<String >? surfaceImageList;
 	RecommendedDownloadModeEnum recommendedDownloadMode;
 
 	CarotidResultDTO({
@@ -4004,7 +4004,7 @@ class RemedicalInfoDTO extends BaseDTO{
 	ImageLocationDTO? imageLocation;
 	DiagnosisConclusionEnum diagnosisConclusion;
 	String? diagnosisResult;
-	List<DiagnosisOrganEnum>? diagnosisOrgans;
+	List<DiagnosisOrganEnum >? diagnosisOrgans;
 	MeasuredResultsDTO? measuredResult;
 	ScanImageDTO? commentResult;
 	CarotidResultDTO? carotidResult;
@@ -4156,9 +4156,9 @@ class RemedicalMeasuredInfoDTO extends BaseDTO{
 
 class ConsultationImagesDTO {
 	DateTime? imageDate;
-	List<RemedicalInfoDTO>? ultrasoundImageList;
-	List<ConsultationFileDTO>? screenshotList;
-	List<RemedicalMeasuredInfoDTO>? measurementImageList;
+	List<RemedicalInfoDTO >? ultrasoundImageList;
+	List<ConsultationFileDTO >? screenshotList;
+	List<RemedicalMeasuredInfoDTO >? measurementImageList;
 
 	ConsultationImagesDTO({
 		this.imageDate,
@@ -4293,21 +4293,21 @@ class UserDTO extends UserBaseDTO{
 	String? organizationName;
 	String? rootOrganizationCode;
 	String? rootOrganizationName;
-	List<String>? authorityGroups;
-	List<String>? bindDevices;
-	List<String>? bindDeviceOrganizations;
+	List<String >? authorityGroups;
+	List<String >? bindDevices;
+	List<String >? bindDeviceOrganizations;
 	String? lastIP;
 	int logintimes;
 	UserInfoStateEnum userState;
-	List<String>? roleCodes;
-	List<String>? rankCodes;
-	List<String>? positionCodes;
+	List<String >? roleCodes;
+	List<String >? rankCodes;
+	List<String >? positionCodes;
 	ApplyStateEnum applyState;
 	String? rankName;
 	String? positionName;
 	bool isDirector;
-	List<String>? fieldList;
-	List<String>? deletePatientCodes;
+	List<String >? fieldList;
+	List<String >? deletePatientCodes;
 	bool isBatchExportDiagnoseData;
 	String? bindAssistantUserCode;
 	String? bindAssistantDoctorUserCode;
@@ -4315,11 +4315,11 @@ class UserDTO extends UserBaseDTO{
 	String? signature;
 	String? language;
 	bool enableReportLabel;
-	List<AssociatedInfoDTO>? associatedInfos;
+	List<AssociatedInfoDTO >? associatedInfos;
 	String? commonPlatformUserId;
 	String? bindEmergencyDeviceCode;
 	String? bindEmergencyExpertCode;
-	List<String>? dashboardOrgCodes;
+	List<String >? dashboardOrgCodes;
 
 	UserDTO({
 		this.nickName,
@@ -4497,21 +4497,21 @@ class UserExtendDTO extends UserDTO{
 		String? organizationName,
 		String? rootOrganizationCode,
 		String? rootOrganizationName,
-		List<String>? authorityGroups,
-		List<String>? bindDevices,
-		List<String>? bindDeviceOrganizations,
+		List<String >? authorityGroups,
+		List<String >? bindDevices,
+		List<String >? bindDeviceOrganizations,
 		String? lastIP,
 		int logintimes = 0,
 		UserInfoStateEnum userState = UserInfoStateEnum.Nonactivated,
-		List<String>? roleCodes,
-		List<String>? rankCodes,
-		List<String>? positionCodes,
+		List<String >? roleCodes,
+		List<String >? rankCodes,
+		List<String >? positionCodes,
 		ApplyStateEnum applyState = ApplyStateEnum.NotApply,
 		String? rankName,
 		String? positionName,
 		bool isDirector = false,
-		List<String>? fieldList,
-		List<String>? deletePatientCodes,
+		List<String >? fieldList,
+		List<String >? deletePatientCodes,
 		bool isBatchExportDiagnoseData = false,
 		String? bindAssistantUserCode,
 		String? bindAssistantDoctorUserCode,
@@ -4519,11 +4519,11 @@ class UserExtendDTO extends UserDTO{
 		String? signature,
 		String? language,
 		bool enableReportLabel = false,
-		List<AssociatedInfoDTO>? associatedInfos,
+		List<AssociatedInfoDTO >? associatedInfos,
 		String? commonPlatformUserId,
 		String? bindEmergencyDeviceCode,
 		String? bindEmergencyExpertCode,
-		List<String>? dashboardOrgCodes,
+		List<String >? dashboardOrgCodes,
 		String? phone,
 		String? email,
 		String? userCode,
@@ -4673,7 +4673,7 @@ class ChangeConsultationResult {
 	String? consultationCode;
 	String? initiatorCode;
 	int roomNo;
-	List<LiveConsultationMember>? memberLiveDatas;
+	List<LiveConsultationMember >? memberLiveDatas;
 
 	ChangeConsultationResult({
 		this.consultationCode,
@@ -4760,12 +4760,12 @@ class DeviceInfoDTO extends BaseDTO{
 	String? systemVersion;
 	String? cPUModel;
 	String? systemLanguage;
-	List<String>? diagnosisModules;
-	List<String>? reportPosterCodes;
+	List<String >? diagnosisModules;
+	List<String >? reportPosterCodes;
 	bool mergedChannel;
 	int mergedVideoOutputWidth;
 	int mergedVideoOutputHeight;
-	List<VideoDeviceDTO>? videoDeviceInfos;
+	List<VideoDeviceDTO >? videoDeviceInfos;
 	DownloadModeSettingEnum downloadModeSetting;
 	bool liveOpened;
 	bool supportRtc;
@@ -4935,12 +4935,12 @@ class EmergencyDeviceInfoDTO extends DeviceInfoDTO{
 		String? systemVersion,
 		String? cPUModel,
 		String? systemLanguage,
-		List<String>? diagnosisModules,
-		List<String>? reportPosterCodes,
+		List<String >? diagnosisModules,
+		List<String >? reportPosterCodes,
 		bool mergedChannel = false,
 		int mergedVideoOutputWidth = 0,
 		int mergedVideoOutputHeight = 0,
-		List<VideoDeviceDTO>? videoDeviceInfos,
+		List<VideoDeviceDTO >? videoDeviceInfos,
 		DownloadModeSettingEnum downloadModeSetting = DownloadModeSettingEnum.Auto,
 		bool liveOpened = false,
 		bool supportRtc = false,
@@ -5028,8 +5028,8 @@ class EmergencyDeviceInfoDTO extends DeviceInfoDTO{
 }
 
 class QueryEmergencyDataResult {
-	List<EmergencyDeviceInfoDTO>? deviceInfoList;
-	List<UserDTO>? expertList;
+	List<EmergencyDeviceInfoDTO >? deviceInfoList;
+	List<UserDTO >? expertList;
 
 	QueryEmergencyDataResult({
 		this.deviceInfoList,
@@ -5225,19 +5225,19 @@ class SyncConsultationRequest {
 	String? expertUserCode;
 	String? deviceCode;
 	String? scanUser;
-	List<DataItemDTO>? patientInfo;
-	List<String>? scanPositions;
+	List<DataItemDTO >? patientInfo;
+	List<String >? scanPositions;
 	DateTime? consultationTime;
 	DateTime? consultationTimeEnd;
 	TransactionStatusEnum consultationStatus;
-	List<ConsultationFileDTO>? consultationFileList;
+	List<ConsultationFileDTO >? consultationFileList;
 	String? rejectReason;
 	String? description;
 	String? diseases;
 	String? primaryDiagnosis;
 	SyncEvaluatesRequest? evaluates;
 	FollowUpVisitStatusEnum followUpVisitStatus;
-	List<SyncFollowUpVisitRequest>? syncFollowUpVisitList;
+	List<SyncFollowUpVisitRequest >? syncFollowUpVisitList;
 
 	SyncConsultationRequest({
 		this.consultationCode,
@@ -5341,7 +5341,7 @@ class SyncConsultationRequest {
 
 class SyncBatchConsultationRequest {
 	SyncDBEnum syncType;
-	List<SyncConsultationRequest>? syncConsultations;
+	List<SyncConsultationRequest >? syncConsultations;
 
 	SyncBatchConsultationRequest({
 		this.syncType = SyncDBEnum.Migrate,

+ 1 - 1
lib/services/login.m.dart

@@ -514,7 +514,7 @@ class AssociatedFeatureInfoDTO extends AssociatedInfoDTO{
 
 class GetAssociatedAccountInfoResult {
 	bool isSuccess;
-	List<AssociatedFeatureInfoDTO>? accountInfoList;
+	List<AssociatedFeatureInfoDTO >? accountInfoList;
 
 	GetAssociatedAccountInfoResult({
 		this.isSuccess = false,

+ 32 - 24
lib/services/notification.m.dart

@@ -331,7 +331,7 @@ class AnnouncementLanguageConfigDTO {
 
 class AnnouncementNotification extends NotificationDTO{
 	AnnouncementTypeEnum announcementType;
-	List<AnnouncementLanguageConfigDTO>? announcementLanguageConfigs;
+	List<AnnouncementLanguageConfigDTO >? announcementLanguageConfigs;
 
 	AnnouncementNotification({
 		NotificationTypeEnum notificationType = NotificationTypeEnum.Unknown,
@@ -491,7 +491,7 @@ class DeviceControlledParametersNotification extends NotificationDTO{
 	String? controlUserCode;
 	String? controlUserName;
 	ControlDeviceParameterEnum controlType;
-	List<AdditionParameterDTO>? parameters;
+	List<AdditionParameterDTO >? parameters;
 	LoginSource loginSource;
 	String? deviceCode;
 
@@ -681,7 +681,7 @@ class DisconnectNotification extends NotificationDTO{
 }
 
 class ExamRecordsFinishedNotification extends NotificationDTO{
-	List<String>? codes;
+	List<String >? codes;
 
 	ExamRecordsFinishedNotification({
 		NotificationTypeEnum notificationType = NotificationTypeEnum.Unknown,
@@ -809,7 +809,7 @@ class ModifyDeviceMergedVideoSizeNotification extends NotificationDTO{
 	String? deviceCode;
 	int mergedVideoOutputWidth;
 	int mergedVideoOutputHeight;
-	List<VideoDeviceDTO>? videoDeviceInfos;
+	List<VideoDeviceDTO >? videoDeviceInfos;
 
 	ModifyDeviceMergedVideoSizeNotification({
 		NotificationTypeEnum notificationType = NotificationTypeEnum.Unknown,
@@ -989,7 +989,7 @@ class UpgradeVersionNotification extends NotificationDTO{
 	String? backUpSourceUrl;
 	UpgradeUpdateTypeEnum upgradeUpdateType;
 	String? newVersion;
-	List<DescriptionInfoDTO>? descriptions;
+	List<DescriptionInfoDTO >? descriptions;
 
 	UpgradeVersionNotification({
 		NotificationTypeEnum notificationType = NotificationTypeEnum.Unknown,
@@ -1352,7 +1352,7 @@ class StartLiveToDeviceNotification extends NotificationDTO{
 	bool mergedChannel;
 	int mergedVideoOutputWidth;
 	int mergedVideoOutputHeight;
-	List<VideoDeviceOutputInfo>? videoDeviceOutputList;
+	List<VideoDeviceOutputInfo >? videoDeviceOutputList;
 	String? deviceCode;
 	String? deviceSign;
 	String? initiatorCode;
@@ -1880,7 +1880,7 @@ class LiveCourseMember {
 	String? loginServerUrl;
 	LoginSource loginSource;
 	LiveDataDTO? liveData;
-	List<VideoDeviceOutputInfo>? videoDeviceInfos;
+	List<VideoDeviceOutputInfo >? videoDeviceInfos;
 	bool isControllingParameter;
 	bool mergedChannel;
 	int mergedVideoOutputWidth;
@@ -3140,7 +3140,7 @@ class LiveTerminalInfo {
 	int cameraHeight;
 	int terminalIntegerRoomId;
 	bool isMultiChannels;
-	List<PullChannelUrl>? channels;
+	List<PullChannelUrl >? channels;
 
 	LiveTerminalInfo({
 		this.id,
@@ -3211,8 +3211,8 @@ class LiveTerminalInfo {
 
 class MeetingMemberNotification extends NotificationDTO{
 	String? roomId;
-	List<MeetingMemberInfo>? members;
-	List<LiveTerminalInfo>? liveTerminals;
+	List<MeetingMemberInfo >? members;
+	List<LiveTerminalInfo >? liveTerminals;
 
 	MeetingMemberNotification({
 		NotificationTypeEnum notificationType = NotificationTypeEnum.Unknown,
@@ -3363,7 +3363,7 @@ class AcceptMeetingNotification extends NotificationDTO{
 
 class MeetingPendingMemberTimeoutNotification extends NotificationDTO{
 	String? roomId;
-	List<String>? userIds;
+	List<String >? userIds;
 
 	MeetingPendingMemberTimeoutNotification({
 		NotificationTypeEnum notificationType = NotificationTypeEnum.Unknown,
@@ -3636,10 +3636,10 @@ class DevicePrinterDTO extends BaseDTO{
 	String? driveModelName;
 	String? description;
 	String? osVersion;
-	List<UploadDeviceFileInfoDTO>? fileUploadInfoList;
+	List<UploadDeviceFileInfoDTO >? fileUploadInfoList;
 	int fileSize;
 	String? printerBrands;
-	List<String>? printerModels;
+	List<String >? printerModels;
 	String? fileName;
 
 	DevicePrinterDTO({
@@ -3704,7 +3704,7 @@ class DevicePrinterDTO extends BaseDTO{
 
 class DevicePrinterRequestNotification extends NotificationDTO{
 	DevicePrinterEnum setPrinterEnum;
-	List<DevicePrinterParameter>? parameters;
+	List<DevicePrinterParameter >? parameters;
 	DevicePrinterDTO? devicePrinter;
 	String? deviceCode;
 	String? operatorCode;
@@ -3756,8 +3756,8 @@ class DevicePrinterParameterDTO {
 	String? name;
 	String? pageSize;
 	String? pageOrientation;
-	List<String>? pageOrientationList;
-	List<String>? pageSizeList;
+	List<String >? pageOrientationList;
+	List<String >? pageSizeList;
 	String? brand;
 	int installPrinterProgress;
 	String? iPAddress;
@@ -3810,7 +3810,7 @@ class DevicePrinterParameterDTO {
 class DevicePrinterResultNotification extends NotificationDTO{
 	String? deviceCode;
 	DevicePrinterEnum setPrinterEnum;
-	List<DevicePrinterParameterDTO>? devicePrinterList;
+	List<DevicePrinterParameterDTO >? devicePrinterList;
 	RemoteDeviceStateEnum remoteDeviceState;
 
 	DevicePrinterResultNotification({
@@ -3968,7 +3968,7 @@ enum PushDevicePatchEnum {
 class PushDevicePatchToDeviceNotification extends NotificationDTO{
 	String? patchName;
 	String? patchCode;
-	List<UploadDeviceFileInfoDTO>? deviceFileInfoList;
+	List<UploadDeviceFileInfoDTO >? deviceFileInfoList;
 	int fileSize;
 	PushDevicePatchEnum pushEnum;
 	String? fileName;
@@ -4186,7 +4186,7 @@ class AcceptLiveConsultationNotification extends NotificationDTO{
 
 class CancelInvitingInLiveConsultationNotification extends NotificationDTO{
 	String? consultationCode;
-	List<String>? userCodes;
+	List<String >? userCodes;
 
 	CancelInvitingInLiveConsultationNotification({
 		NotificationTypeEnum notificationType = NotificationTypeEnum.Unknown,
@@ -4317,7 +4317,7 @@ class LiveConsultationMember {
 	int mergedVideoOutputWidth;
 	int mergedVideoOutputHeight;
 	LiveData? liveData;
-	List<VideoDeviceOutputInfo>? videoDeviceInfos;
+	List<VideoDeviceOutputInfo >? videoDeviceInfos;
 	bool isControllingParameter;
 	int sortNumber;
 	int sortLevel;
@@ -4413,7 +4413,7 @@ class LiveConsultationMember {
 class ChangeConsultationNotification extends NotificationDTO{
 	String? consultationCode;
 	int roomNo;
-	List<LiveConsultationMember>? memberLiveDatas;
+	List<LiveConsultationMember >? memberLiveDatas;
 
 	ChangeConsultationNotification({
 		NotificationTypeEnum notificationType = NotificationTypeEnum.Unknown,
@@ -4453,7 +4453,7 @@ class ChangeConsultationNotification extends NotificationDTO{
 class ChangeConsultationToDeviceNotification extends NotificationDTO{
 	String? consultationCode;
 	int roomNo;
-	List<LiveConsultationMember>? memberLiveDatas;
+	List<LiveConsultationMember >? memberLiveDatas;
 
 	ChangeConsultationToDeviceNotification({
 		NotificationTypeEnum notificationType = NotificationTypeEnum.Unknown,
@@ -4602,9 +4602,10 @@ class LiveConsultationJoinDeviceInfo {
 	bool mergedChannel;
 	int mergedVideoOutputWidth;
 	int mergedVideoOutputHeight;
-	List<VideoDeviceOutputInfo>? videoDeviceOutputList;
+	List<VideoDeviceOutputInfo >? videoDeviceOutputList;
 	String? deviceCode;
 	String? deviceSign;
+	bool isOldPlatform;
 
 	LiveConsultationJoinDeviceInfo({
 		this.liveProtocol = TransactionStatusEnum.Applied,
@@ -4615,6 +4616,7 @@ class LiveConsultationJoinDeviceInfo {
 		this.videoDeviceOutputList,
 		this.deviceCode,
 		this.deviceSign,
+		this.isOldPlatform = false,
 	});
 
 	factory LiveConsultationJoinDeviceInfo.fromJson(Map<String, dynamic> map) {
@@ -4627,6 +4629,7 @@ class LiveConsultationJoinDeviceInfo {
 			videoDeviceOutputList: map['VideoDeviceOutputList'] != null ? (map['VideoDeviceOutputList'] as List).map((e)=>VideoDeviceOutputInfo.fromJson(e as Map<String,dynamic>)).toList() : null,
 			deviceCode: map['DeviceCode'],
 			deviceSign: map['DeviceSign'],
+			isOldPlatform: map['IsOldPlatform'],
 		);
 	}
 
@@ -4643,6 +4646,7 @@ class LiveConsultationJoinDeviceInfo {
 			map['DeviceCode'] = deviceCode;
 		if(deviceSign != null)
 			map['DeviceSign'] = deviceSign;
+		map['IsOldPlatform'] = isOldPlatform;
 		return map;
 	}
 }
@@ -4657,6 +4661,7 @@ class LiveConsultationJoinerInfo extends LiveConsultationMemberInfo{
 	int sortNumber;
 	int sortLevel;
 	LiveConsultationJoinDeviceInfo? consultationDeviceInfo;
+	bool isOldPlatform;
 
 	LiveConsultationJoinerInfo({
 		this.isOnline = false,
@@ -4668,6 +4673,7 @@ class LiveConsultationJoinerInfo extends LiveConsultationMemberInfo{
 		this.sortNumber = 0,
 		this.sortLevel = 0,
 		this.consultationDeviceInfo,
+		this.isOldPlatform = false,
 		String? id,
 		String? name,
 		String? headImageUrl,
@@ -4688,6 +4694,7 @@ class LiveConsultationJoinerInfo extends LiveConsultationMemberInfo{
 			sortNumber: map['SortNumber'],
 			sortLevel: map['SortLevel'],
 			consultationDeviceInfo: map['ConsultationDeviceInfo'] != null ? LiveConsultationJoinDeviceInfo.fromJson(map['ConsultationDeviceInfo']) : null,
+			isOldPlatform: map['IsOldPlatform'],
 			id: map['Id'],
 			name: map['Name'],
 			headImageUrl: map['HeadImageUrl'],
@@ -4707,6 +4714,7 @@ class LiveConsultationJoinerInfo extends LiveConsultationMemberInfo{
 		map['SortLevel'] = sortLevel;
 		if(consultationDeviceInfo != null)
 			map['ConsultationDeviceInfo'] = consultationDeviceInfo;
+		map['IsOldPlatform'] = isOldPlatform;
 		return map;
 	}
 }
@@ -4857,7 +4865,7 @@ class InviteInLiveConsultationNotification extends NotificationDTO{
 	String? consultationCode;
 	int roomNo;
 	LiveConsultationMember? operator;
-	List<LiveConsultationMember>? memberLiveDatas;
+	List<LiveConsultationMember >? memberLiveDatas;
 
 	InviteInLiveConsultationNotification({
 		NotificationTypeEnum notificationType = NotificationTypeEnum.Unknown,

+ 21 - 17
lib/services/organization.m.dart

@@ -80,12 +80,12 @@ class OrganizationBasicDTO extends OrganizationBaseDTO{
 	String? logoUrl;
 	OrganizationPatientTypeEnum patientType;
 	bool isinvented;
-	List<SettingDTOClass>? settings;
-	List<String>? diagnosisModules;
+	List<SettingDTOClass >? settings;
+	List<String >? diagnosisModules;
 	bool isEncryptedShow;
 	double referralLimitHours;
-	List<String>? referralOrganizationCodes;
-	List<ReferralOrganizationDTO>? referralOrganizations;
+	List<String >? referralOrganizationCodes;
+	List<ReferralOrganizationDTO >? referralOrganizations;
 
 	OrganizationBasicDTO({
 		this.regionCode,
@@ -170,11 +170,11 @@ class OrganizationDTO extends OrganizationBasicDTO{
 	String? description;
 	String? rootCode;
 	OrganizationTypeEnum organizationType;
-	List<String>? authorityGroups;
+	List<String >? authorityGroups;
 	String? nautica;
 	OrganizationStateEnum state;
-	List<String>? directors;
-	List<String>? assignedAdmins;
+	List<String >? directors;
+	List<String >? assignedAdmins;
 	String? patientSettingJson;
 	String? examSettingJson;
 	String? consultationSettingJson;
@@ -204,12 +204,12 @@ class OrganizationDTO extends OrganizationBasicDTO{
 		String? logoUrl,
 		OrganizationPatientTypeEnum patientType = OrganizationPatientTypeEnum.Person,
 		bool isinvented = false,
-		List<SettingDTOClass>? settings,
-		List<String>? diagnosisModules,
+		List<SettingDTOClass >? settings,
+		List<String >? diagnosisModules,
 		bool isEncryptedShow = false,
 		double referralLimitHours = 0,
-		List<String>? referralOrganizationCodes,
-		List<ReferralOrganizationDTO>? referralOrganizations,
+		List<String >? referralOrganizationCodes,
+		List<ReferralOrganizationDTO >? referralOrganizations,
 		String? organizationCode,
 		String? organizationName,
 		DateTime? createTime,
@@ -480,7 +480,7 @@ class SavePersonOrganizationRequest {
 	OrganizationPatientTypeEnum patientType;
 	bool isEncryptedShow;
 	double referralLimitHours;
-	List<String>? referralOrganizationCodes;
+	List<String >? referralOrganizationCodes;
 
 	SavePersonOrganizationRequest({
 		this.token,
@@ -569,7 +569,7 @@ class OrganizationItemDTO {
 }
 
 class AddOrganizationsRequest extends TokenRequest{
-	List<OrganizationItemDTO>? organizationInfos;
+	List<OrganizationItemDTO >? organizationInfos;
 	String? languageCode;
 
 	AddOrganizationsRequest({
@@ -599,7 +599,7 @@ class AddOrganizationsRequest extends TokenRequest{
 }
 
 class RemoveOrganizationsRequest extends TokenRequest{
-	List<String>? organizationCodes;
+	List<String >? organizationCodes;
 
 	RemoveOrganizationsRequest({
 		this.organizationCodes,
@@ -723,7 +723,7 @@ class GetUserOrganizationSettingRequest extends TokenRequest{
 
 class ServerLangugeClass {
 	String? langugeKey;
-	List<String>? langugeModules;
+	List<String >? langugeModules;
 
 	ServerLangugeClass({
 		this.langugeKey,
@@ -748,7 +748,7 @@ class ServerLangugeClass {
 }
 
 class ServerSettingResult {
-	List<ServerLangugeClass>? serverLangugeList;
+	List<ServerLangugeClass >? serverLangugeList;
 	Map<String,String>? serverConfigList;
 	int heartRateSeconds;
 	int liveConsultationDefaultQueryDays;
@@ -882,7 +882,7 @@ class LangugeDataItemRequest {
 
 class LangugeDataRequest extends TokenRequest{
 	String? langugeKey;
-	List<LangugeDataItemRequest>? langugeDataItemList;
+	List<LangugeDataItemRequest >? langugeDataItemList;
 
 	LangugeDataRequest({
 		this.langugeKey,
@@ -939,10 +939,12 @@ class OrganizationSimplifyDTO {
 class GetOrganizationByUserAndDevicesRequest extends PageRequest{
 	String? keyword;
 	bool onlyOrganization;
+	bool isIncloudReferral;
 
 	GetOrganizationByUserAndDevicesRequest({
 		this.keyword,
 		this.onlyOrganization = false,
+		this.isIncloudReferral = false,
 		int pageIndex = 0,
 		int pageSize = 0,
 		String? token,
@@ -956,6 +958,7 @@ class GetOrganizationByUserAndDevicesRequest extends PageRequest{
 		return GetOrganizationByUserAndDevicesRequest( 
 			keyword: map['Keyword'],
 			onlyOrganization: map['OnlyOrganization'],
+			isIncloudReferral: map['IsIncloudReferral'],
 			pageIndex: map['PageIndex'],
 			pageSize: map['PageSize'],
 			token: map['Token'],
@@ -967,6 +970,7 @@ class GetOrganizationByUserAndDevicesRequest extends PageRequest{
 		if(keyword != null)
 			map['Keyword'] = keyword;
 		map['OnlyOrganization'] = onlyOrganization;
+		map['IsIncloudReferral'] = isIncloudReferral;
 		return map;
 	}
 }

File diff suppressed because it is too large
+ 179 - 176
lib/services/other.m.dart


+ 20 - 20
lib/services/patient.m.dart

@@ -4,8 +4,8 @@ import 'notification.m.dart';
 import 'package:fis_jsonrpc/utils.dart';
 
 class CreatePatientRequest extends TokenRequest{
-	List<DataItemDTO>? patientData;
-	List<String>? assignmentUserCodes;
+	List<DataItemDTO >? patientData;
+	List<String >? assignmentUserCodes;
 
 	CreatePatientRequest({
 		this.patientData,
@@ -65,8 +65,8 @@ class CreatePatientByUnregisteredRequest extends TokenRequest{
 
 class UpdatePatientRequest extends TokenRequest{
 	String? code;
-	List<DataItemDTO>? patientData;
-	List<String>? assignmentUserCodes;
+	List<DataItemDTO >? patientData;
+	List<String >? assignmentUserCodes;
 
 	UpdatePatientRequest({
 		this.code,
@@ -109,13 +109,13 @@ class PatientInfoBaseDTO extends BaseDTO{
 	bool isValid;
 	String? organizationCode;
 	String? rootOrganizationCode;
-	List<String>? assignmentUserCodes;
-	List<DataItemDTO>? patientData;
+	List<String >? assignmentUserCodes;
+	List<DataItemDTO >? patientData;
 	int unReadRecordCount;
 	String? headImgUrl;
 	String? patientType;
 	bool isReferral;
-	List<String>? devicePatientIDs;
+	List<String >? devicePatientIDs;
 
 	PatientInfoBaseDTO({
 		this.patientCode,
@@ -205,7 +205,7 @@ class PatientInfoBaseDTO extends BaseDTO{
 class PatientInfoDTO extends PatientInfoBaseDTO{
 	String? creatorCode;
 	String? deviceCode;
-	List<String>? updateUsers;
+	List<String >? updateUsers;
 
 	PatientInfoDTO({
 		this.creatorCode,
@@ -221,13 +221,13 @@ class PatientInfoDTO extends PatientInfoBaseDTO{
 		bool isValid = false,
 		String? organizationCode,
 		String? rootOrganizationCode,
-		List<String>? assignmentUserCodes,
-		List<DataItemDTO>? patientData,
+		List<String >? assignmentUserCodes,
+		List<DataItemDTO >? patientData,
 		int unReadRecordCount = 0,
 		String? headImgUrl,
 		String? patientType,
 		bool isReferral = false,
-		List<String>? devicePatientIDs,
+		List<String >? devicePatientIDs,
 		DateTime? createTime,
 		DateTime? updateTime,
 	}) : super(
@@ -292,7 +292,7 @@ class PatientInfoDTO extends PatientInfoBaseDTO{
 }
 
 class CreatePatientsRequest extends TokenRequest{
-	List<PatientInfoDTO>? patients;
+	List<PatientInfoDTO >? patients;
 
 	CreatePatientsRequest({
 		this.patients,
@@ -327,8 +327,8 @@ class FindPatientsPageRequest extends PageRequest{
 	DateTime? startTime;
 	DateTime? endTime;
 	PatientValidStatusEnum isValid;
-	List<String>? organizationCodes;
-	List<String>? deviceCodes;
+	List<String >? organizationCodes;
+	List<String >? deviceCodes;
 	String? patientCode;
 
 	FindPatientsPageRequest({
@@ -447,9 +447,9 @@ class GetRecordsPageDTO {
 	String? recordCode;
 	RecordStatusEnum recordStatus;
 	bool isRead;
-	List<RemedicalInfoDTO>? remedicalList;
+	List<RemedicalInfoDTO >? remedicalList;
 	DiagnosisStatusEnum diagnosisStatus;
-	List<DiagnosisInfoDTO>? diagnosisInfos;
+	List<DiagnosisInfoDTO >? diagnosisInfos;
 	bool isReferral;
 	ReferralStatusEnum referralStatus;
 	bool canCreateReport;
@@ -539,7 +539,7 @@ class ClientPatientInfoDTO extends ClientPatientInfoBaseDTO{
 	String? creatorCode;
 	String? creatorName;
 	String? deviceCode;
-	List<UserBaseDTO>? assignmentUserList;
+	List<UserBaseDTO >? assignmentUserList;
 	GetRecordsPageDTO? lastRecord;
 	String? encryptFullName;
 
@@ -552,10 +552,10 @@ class ClientPatientInfoDTO extends ClientPatientInfoBaseDTO{
 		this.encryptFullName,
 		String? patientCode,
 		bool isValid = false,
-		List<DataItemDTO>? patientData,
+		List<DataItemDTO >? patientData,
 		int unReadRecordCount = 0,
 		bool isReferral = false,
-		List<String>? devicePatientIDs,
+		List<String >? devicePatientIDs,
 		String? organizationCode,
 		String? organizationName,
 		DateTime? createTime,
@@ -697,7 +697,7 @@ class SetValidPatientRequest extends TokenRequest{
 }
 
 class RemovePatientsRequest extends TokenRequest{
-	List<String>? patientCodes;
+	List<String >? patientCodes;
 
 	RemovePatientsRequest({
 		this.patientCodes,

+ 1 - 1
lib/services/payment.m.dart

@@ -294,7 +294,7 @@ class PayCallbackDTO extends BaseDTO{
 }
 
 class PayableTypeDTO {
-	List<String>? payTypes;
+	List<String >? payTypes;
 
 	PayableTypeDTO({
 		this.payTypes,

+ 6 - 6
lib/services/position.m.dart

@@ -5,7 +5,7 @@ class PositionDTO extends BaseDTO{
 	String? positionCode;
 	String? positionName;
 	String? organizationCode;
-	List<String>? underUserCodes;
+	List<String >? underUserCodes;
 	String? fitDepartmentCode;
 
 	PositionDTO({
@@ -50,8 +50,8 @@ class PositionDTO extends BaseDTO{
 }
 
 class GetPositionsRequest extends TokenRequest{
-	List<String>? positionCodes;
-	List<String>? organizationCodes;
+	List<String >? positionCodes;
+	List<String >? organizationCodes;
 	String? fitDepartmentCode;
 
 	GetPositionsRequest({
@@ -87,7 +87,7 @@ class GetPositionsRequest extends TokenRequest{
 class PositionItemDTO {
 	String? positionName;
 	String? organizationCode;
-	List<String>? underUserCodes;
+	List<String >? underUserCodes;
 	String? fitDepartmentCode;
 	String? extendsData;
 
@@ -127,7 +127,7 @@ class PositionItemDTO {
 
 class AddPositionsRequest {
 	String? token;
-	List<PositionItemDTO>? positions;
+	List<PositionItemDTO >? positions;
 
 	AddPositionsRequest({
 		this.token,
@@ -152,7 +152,7 @@ class AddPositionsRequest {
 }
 
 class RemovePositionRequest extends TokenRequest{
-	List<String>? positionCodes;
+	List<String >? positionCodes;
 
 	RemovePositionRequest({
 		this.positionCodes,

+ 4 - 4
lib/services/rank.m.dart

@@ -65,8 +65,8 @@ class GetRankByCodeRequest extends TokenRequest{
 }
 
 class GetRanksRequest extends TokenRequest{
-	List<String>? rankCodes;
-	List<String>? organizationCodes;
+	List<String >? rankCodes;
+	List<String >? organizationCodes;
 
 	GetRanksRequest({
 		this.rankCodes,
@@ -126,7 +126,7 @@ class RankItemDTO {
 }
 
 class AddRanksRequest extends TokenRequest{
-	List<RankItemDTO>? rankInfos;
+	List<RankItemDTO >? rankInfos;
 
 	AddRanksRequest({
 		this.rankInfos,
@@ -151,7 +151,7 @@ class AddRanksRequest extends TokenRequest{
 }
 
 class RemoveRanksRequest extends TokenRequest{
-	List<String>? rankCodes;
+	List<String >? rankCodes;
 
 	RemoveRanksRequest({
 		this.rankCodes,

+ 12 - 12
lib/services/recordInfo.m.dart

@@ -6,7 +6,7 @@ import 'package:fis_jsonrpc/utils.dart';
 
 class PatientInfoExt {
 	String? patientScanType;
-	List<DataItemDTO>? content;
+	List<DataItemDTO >? content;
 
 	PatientInfoExt({
 		this.patientScanType,
@@ -33,7 +33,7 @@ class PatientInfoExt {
 class CreateRecordRequest extends TokenRequest{
 	String? patientCode;
 	String? deviceCode;
-	List<PatientInfoExt>? patientInfoExtList;
+	List<PatientInfoExt >? patientInfoExtList;
 
 	CreateRecordRequest({
 		this.patientCode,
@@ -124,15 +124,15 @@ class QueryRecordResult {
 	String? deptName;
 	String? patientName;
 	String? patientAge;
-	List<DataItemDTO>? patientAgeInfo;
+	List<DataItemDTO >? patientAgeInfo;
 	int patientSex;
 	String? creatorName;
 	String? deviceName;
 	String? displayName;
 	RecordStatusEnum recordStatus;
-	List<PatientInfoExt>? patientInfoExtList;
+	List<PatientInfoExt >? patientInfoExtList;
 	DiagnosisStatusEnum diagnosisStatus;
-	List<DiagnosisInfoDTO>? diagnosisInfos;
+	List<DiagnosisInfoDTO >? diagnosisInfos;
 	bool isCollecting;
 	DateTime? startCollectingTime;
 
@@ -232,7 +232,7 @@ class QueryRecordRequest extends TokenRequest{
 }
 
 class ProcessRecordDataResult {
-	List<DataItemDTO>? content;
+	List<DataItemDTO >? content;
 
 	ProcessRecordDataResult({
 		this.content,
@@ -263,7 +263,7 @@ enum AnimalSpeciesEnum {
 
 class ProcessRecordDataRequest extends TokenRequest{
 	String? methodName;
-	List<DataItemDTO>? content;
+	List<DataItemDTO >? content;
 	OrganizationPatientTypeEnum patientType;
 	AnimalSpeciesEnum speciesEnum;
 
@@ -397,7 +397,7 @@ class AddRemedicalMeasuredInfoDTO {
 class AddRemedicalMeasuredInfoRequest extends TokenRequest{
 	BusinessTypeEnum businessType;
 	String? recordCode;
-	List<AddRemedicalMeasuredInfoDTO>? remedicalMeasuredInfos;
+	List<AddRemedicalMeasuredInfoDTO >? remedicalMeasuredInfos;
 
 	AddRemedicalMeasuredInfoRequest({
 		this.businessType = BusinessTypeEnum.RemoteDiagnosis,
@@ -627,8 +627,8 @@ enum RecordProcessStateEnum {
 }
 
 class FindRecordPagesRequest extends PageRequest{
-	List<String>? organizationCodes;
-	List<String>? deviceCodes;
+	List<String >? organizationCodes;
+	List<String >? deviceCodes;
 	RecordQueryStateEnum recordQueryState;
 	RecordProcessStateEnum recordProcessState;
 	String? language;
@@ -697,9 +697,9 @@ class FindRecordPagesRequest extends PageRequest{
 
 class CreateRecordNewRequest extends TokenRequest{
 	String? patientCode;
-	List<DataItemDTO>? patientDatas;
+	List<DataItemDTO >? patientDatas;
 	String? deviceCode;
-	List<PatientInfoExt>? patientInfoExtList;
+	List<PatientInfoExt >? patientInfoExtList;
 
 	CreateRecordNewRequest({
 		this.patientCode,

+ 77 - 77
lib/services/remedical.m.dart

@@ -32,8 +32,8 @@ class CreateExaminfoResult {
 class CreateExaminfoRequest extends TokenRequest{
 	String? patientType;
 	String? examRecordCode;
-	List<DataItemDTO>? patientInfo;
-	List<PatientInfoExt>? patientScanInfoList;
+	List<DataItemDTO >? patientInfo;
+	List<PatientInfoExt >? patientScanInfoList;
 	bool isScreenshotVersion;
 
 	CreateExaminfoRequest({
@@ -202,10 +202,10 @@ class AddToRemedicalDiagnosisRequest extends TokenRequest{
 
 class RemedicalItemList {
 	String? patientScanTypeDesc;
-	List<String>? patientScanTypeList;
+	List<String >? patientScanTypeList;
 	String? applicationCategory;
 	String? application;
-	List<RemedicalInfoDTO>? remedicalList;
+	List<RemedicalInfoDTO >? remedicalList;
 
 	RemedicalItemList({
 		this.patientScanTypeDesc,
@@ -244,7 +244,7 @@ class RemedicalItemList {
 class RemedicalListResult {
 	String? scanDate;
 	String? recordCode;
-	List<RemedicalItemList>? remedicalItemList;
+	List<RemedicalItemList >? remedicalItemList;
 
 	RemedicalListResult({
 		this.scanDate,
@@ -307,8 +307,8 @@ class QueryDropdownListReuqest extends TokenRequest{
 
 class RservationResult {
 	String? reservationCode;
-	List<DataItemDTO>? patientInfo;
-	List<PatientInfoExt>? patientInfoExtList;
+	List<DataItemDTO >? patientInfo;
+	List<PatientInfoExt >? patientInfoExtList;
 	String? dataSource;
 
 	RservationResult({
@@ -342,7 +342,7 @@ class RservationResult {
 }
 
 class QueryReservationResult {
-	List<RservationResult>? reservationList;
+	List<RservationResult >? reservationList;
 
 	QueryReservationResult({
 		this.reservationList,
@@ -413,7 +413,7 @@ class FinishExamNotifyDetail {
 }
 
 class PushFinishExamNotifyToClientRequest {
-	List<FinishExamNotifyDetail>? records;
+	List<FinishExamNotifyDetail >? records;
 	String? userCode;
 
 	PushFinishExamNotifyToClientRequest({
@@ -439,7 +439,7 @@ class PushFinishExamNotifyToClientRequest {
 }
 
 class DeviceFinishExamRequest extends TokenRequest{
-	List<String>? records;
+	List<String >? records;
 
 	DeviceFinishExamRequest({
 		this.records,
@@ -470,10 +470,10 @@ class QueryExamInfoResult {
 	String? patientCode;
 	String? patientName;
 	String? patientAge;
-	List<DataItemDTO>? patientAgeInfo;
+	List<DataItemDTO >? patientAgeInfo;
 	String? patientSex;
-	List<PatientInfoExt>? patientInfoExtList;
-	List<String>? associatedExamCodes;
+	List<PatientInfoExt >? patientInfoExtList;
+	List<String >? associatedExamCodes;
 	RecordStatusEnum examStatus;
 
 	QueryExamInfoResult({
@@ -644,7 +644,7 @@ class OutputItemMetaDTO {
 }
 
 class CalculatorMetaDTO {
-	List<OutputItemMetaDTO>? availableOutputs;
+	List<OutputItemMetaDTO >? availableOutputs;
 
 	CalculatorMetaDTO({
 		this.availableOutputs,
@@ -668,7 +668,7 @@ class ChildItemMetaDTO {
 	String? name;
 	String? description;
 	bool isWorking;
-	List<ChildItemMetaDTO>? childItems;
+	List<ChildItemMetaDTO >? childItems;
 	CalculatorMetaDTO? calculator;
 	String? measureTypeName;
 
@@ -714,10 +714,10 @@ class ItemMetaDTO {
 	String? description;
 	String? briefAnnotation;
 	String? measureTypeName;
-	List<String>? categories;
+	List<String >? categories;
 	CalculatorMetaDTO? calculator;
-	List<ChildItemMetaDTO>? multiMethodItems;
-	List<ChildItemMetaDTO>? methodChildItems;
+	List<ChildItemMetaDTO >? multiMethodItems;
+	List<ChildItemMetaDTO >? methodChildItems;
 
 	ItemMetaDTO({
 		this.name,
@@ -767,8 +767,8 @@ class ItemMetaDTO {
 
 class MeasureFolderDTO {
 	String? name;
-	List<String>? workingItemNames;
-	List<ItemMetaDTO>? availableItems;
+	List<String >? workingItemNames;
+	List<ItemMetaDTO >? availableItems;
 
 	MeasureFolderDTO({
 		this.name,
@@ -799,7 +799,7 @@ class MeasureFolderDTO {
 class MeasureGroupDTO {
 	String? name;
 	String? description;
-	List<MeasureFolderDTO>? availableFolders;
+	List<MeasureFolderDTO >? availableFolders;
 
 	MeasureGroupDTO({
 		this.name,
@@ -829,7 +829,7 @@ class MeasureGroupDTO {
 
 class MeasureModeDTO {
 	String? modeName;
-	List<MeasureGroupDTO>? availableGroups;
+	List<MeasureGroupDTO >? availableGroups;
 
 	MeasureModeDTO({
 		this.modeName,
@@ -857,7 +857,7 @@ class MeasureApplicationDTO {
 	String? version;
 	String? id;
 	String? description;
-	List<MeasureModeDTO>? availableModes;
+	List<MeasureModeDTO >? availableModes;
 
 	MeasureApplicationDTO({
 		this.version,
@@ -892,7 +892,7 @@ class MeasureApplicationDTO {
 class GetMeasureApplicationRequest extends TokenRequest{
 	String? applicationName;
 	String? categoryName;
-	List<String>? measureModes;
+	List<String >? measureModes;
 
 	GetMeasureApplicationRequest({
 		this.applicationName,
@@ -947,7 +947,7 @@ class CommentItemDTO {
 
 class CommentItemResultDTO {
 	String? version;
-	List<CommentItemDTO>? commentItems;
+	List<CommentItemDTO >? commentItems;
 
 	CommentItemResultDTO({
 		this.version,
@@ -1007,7 +1007,7 @@ class GetCommentsByApplicationRequest extends TokenRequest{
 }
 
 class PresetCommentItemDTO {
-	List<String>? categoryList;
+	List<String >? categoryList;
 	String? text;
 
 	PresetCommentItemDTO({
@@ -1034,7 +1034,7 @@ class PresetCommentItemDTO {
 
 class PresetCommentItemResultDTO {
 	String? version;
-	List<PresetCommentItemDTO>? presetCommentItems;
+	List<PresetCommentItemDTO >? presetCommentItems;
 
 	PresetCommentItemResultDTO({
 		this.version,
@@ -1144,9 +1144,9 @@ class SaveUserDefinedCommentsRequest extends TokenRequest{
 	String? languageCode;
 	String? applicationName;
 	String? categoryName;
-	List<CommentItemDTO>? addCommentItems;
-	List<CommentItemDTO>? deletedCommentItems;
-	List<UpdateCommentItemDTO>? updateCommentItems;
+	List<CommentItemDTO >? addCommentItems;
+	List<CommentItemDTO >? deletedCommentItems;
+	List<UpdateCommentItemDTO >? updateCommentItems;
 
 	SaveUserDefinedCommentsRequest({
 		this.version,
@@ -1256,10 +1256,10 @@ class UserDefinedItemMetaDTO {
 
 class UserDefinedMeasureFolderDTO {
 	String? name;
-	List<String>? workingItemNames;
+	List<String >? workingItemNames;
 	String? defaultItem;
-	List<UserDefinedItemMetaDTO>? multiMethodItemMetas;
-	List<ItemMetaDTO>? itemMetas;
+	List<UserDefinedItemMetaDTO >? multiMethodItemMetas;
+	List<ItemMetaDTO >? itemMetas;
 	String? itemMetaJson;
 
 	UserDefinedMeasureFolderDTO({
@@ -1302,7 +1302,7 @@ class UserDefinedMeasureFolderDTO {
 
 class UserDefinedMeasureGroupDTO {
 	String? name;
-	List<UserDefinedMeasureFolderDTO>? folders;
+	List<UserDefinedMeasureFolderDTO >? folders;
 
 	UserDefinedMeasureGroupDTO({
 		this.name,
@@ -1328,7 +1328,7 @@ class UserDefinedMeasureGroupDTO {
 
 class UserDefinedMeasureModeDTO {
 	String? modeName;
-	List<UserDefinedMeasureGroupDTO>? workingGroups;
+	List<UserDefinedMeasureGroupDTO >? workingGroups;
 
 	UserDefinedMeasureModeDTO({
 		this.modeName,
@@ -1546,16 +1546,16 @@ class RecordInfoDTO extends BaseDTO{
 	String? creatorCode;
 	String? tags;
 	RecordCreateTypeEnum createType;
-	List<DataItemDTO>? patientInfo;
-	List<PatientInfoExt>? patientInfoExtList;
+	List<DataItemDTO >? patientInfo;
+	List<PatientInfoExt >? patientInfoExtList;
 	String? devicePatientID;
 	String? patientType;
-	List<String>? readUsers;
+	List<String >? readUsers;
 	String? rootOrganizationCode;
 	String? organizationCode;
-	List<String>? associatedExamCodes;
+	List<String >? associatedExamCodes;
 	DiagnosisStatusEnum diagnosisStatus;
-	List<DiagnosisInfoDTO>? diagnosisInfos;
+	List<DiagnosisInfoDTO >? diagnosisInfos;
 	bool isCollecting;
 	DateTime? startCollectingTime;
 	bool isUserReport;
@@ -1663,7 +1663,7 @@ class RecordInfoDTO extends BaseDTO{
 class RecordData {
 	String? patientName;
 	String? patientCode;
-	List<RecordInfoDTO>? recordItemList;
+	List<RecordInfoDTO >? recordItemList;
 
 	RecordData({
 		this.patientName,
@@ -1725,7 +1725,7 @@ class ReportItem {
 class ReportData {
 	String? patientName;
 	String? patientCode;
-	List<ReportItem>? reportItemList;
+	List<ReportItem >? reportItemList;
 
 	ReportData({
 		this.patientName,
@@ -1786,7 +1786,7 @@ class RemedicalItem {
 class RemedicalData {
 	String? patientName;
 	String? patientCode;
-	List<RemedicalItem>? remedicalItemList;
+	List<RemedicalItem >? remedicalItemList;
 
 	RemedicalData({
 		this.patientName,
@@ -1815,9 +1815,9 @@ class RemedicalData {
 }
 
 class ExportRemedicalDataResult {
-	List<RecordData>? recordList;
-	List<ReportData>? reportList;
-	List<RemedicalData>? remedicalList;
+	List<RecordData >? recordList;
+	List<ReportData >? reportList;
+	List<RemedicalData >? remedicalList;
 
 	ExportRemedicalDataResult({
 		this.recordList,
@@ -1851,7 +1851,7 @@ class ExportRemedicalDataRequest extends TokenRequest{
 	bool isExportReport;
 	bool isExportRecord;
 	bool isExportRemedicalData;
-	List<String>? patientCodes;
+	List<String >? patientCodes;
 
 	ExportRemedicalDataRequest({
 		this.startTime,
@@ -2018,10 +2018,10 @@ class QueryReferralRecordPageDTO extends ClientPatientInfoBaseDTO{
 		this.inUserName,
 		String? patientCode,
 		bool isValid = false,
-		List<DataItemDTO>? patientData,
+		List<DataItemDTO >? patientData,
 		int unReadRecordCount = 0,
 		bool isReferral = false,
-		List<String>? devicePatientIDs,
+		List<String >? devicePatientIDs,
 		String? organizationCode,
 		String? organizationName,
 		DateTime? createTime,
@@ -2268,12 +2268,12 @@ class ReferralRecordDTO extends BaseDTO{
 	String? referralInUserCode;
 	ReferralStatusEnum referralStatus;
 	String? rejectReason;
-	List<String>? referralCodeList;
+	List<String >? referralCodeList;
 	PatientInfoDTO? patientInfo;
-	List<String>? recordCodeList;
-	List<String>? reportCodeList;
-	List<String>? remedicalDataCodeList;
-	List<CreateReportClass>? createReportCodeList;
+	List<String >? recordCodeList;
+	List<String >? reportCodeList;
+	List<String >? remedicalDataCodeList;
+	List<CreateReportClass >? createReportCodeList;
 
 	ReferralRecordDTO({
 		this.code,
@@ -2380,12 +2380,12 @@ class ReferralRecordDetailDTO extends ReferralRecordDTO{
 		String? referralInUserCode,
 		ReferralStatusEnum referralStatus = ReferralStatusEnum.Wait,
 		String? rejectReason,
-		List<String>? referralCodeList,
+		List<String >? referralCodeList,
 		PatientInfoDTO? patientInfo,
-		List<String>? recordCodeList,
-		List<String>? reportCodeList,
-		List<String>? remedicalDataCodeList,
-		List<CreateReportClass>? createReportCodeList,
+		List<String >? recordCodeList,
+		List<String >? reportCodeList,
+		List<String >? remedicalDataCodeList,
+		List<CreateReportClass >? createReportCodeList,
 		DateTime? createTime,
 		DateTime? updateTime,
 	}) : super(
@@ -2588,13 +2588,13 @@ class ReportBaseDTO extends BaseDTO{
 	String? patientCode;
 	String? patientId;
 	String? patientName;
-	List<String>? reportLabels;
-	List<String>? platformLabels;
-	List<String>? diagnosisLabels;
+	List<String >? reportLabels;
+	List<String >? platformLabels;
+	List<String >? diagnosisLabels;
 	DiagnosisOrganEnum reportOrgan;
 	DateTime? reportTime;
 	String? reportUserName;
-	List<ReportPreviewDTO>? reportPreviewList;
+	List<ReportPreviewDTO >? reportPreviewList;
 	String? referralRecordCode;
 	ReportTypeEnum reportType;
 	bool isReferral;
@@ -2709,13 +2709,13 @@ class ReportDTO extends ReportBaseDTO{
 		String? patientCode,
 		String? patientId,
 		String? patientName,
-		List<String>? reportLabels,
-		List<String>? platformLabels,
-		List<String>? diagnosisLabels,
+		List<String >? reportLabels,
+		List<String >? platformLabels,
+		List<String >? diagnosisLabels,
 		DiagnosisOrganEnum reportOrgan = DiagnosisOrganEnum.Null,
 		DateTime? reportTime,
 		String? reportUserName,
-		List<ReportPreviewDTO>? reportPreviewList,
+		List<ReportPreviewDTO >? reportPreviewList,
 		String? referralRecordCode,
 		ReportTypeEnum reportType = ReportTypeEnum.RemoteDiagnosis,
 		bool isReferral = false,
@@ -2931,7 +2931,7 @@ class MeasureExportDetailDTO {
 }
 
 class BatchExportMeasureResultRequest extends TokenRequest{
-	List<MeasureExportDetailDTO>? remedicalMeasuredInfoCodes;
+	List<MeasureExportDetailDTO >? remedicalMeasuredInfoCodes;
 	BusinessTypeEnum businessType;
 	String? recordCode;
 	String? languageCode;
@@ -3013,7 +3013,7 @@ class RemedicalAISelectedInfoDTO {
 	String? previewFileToken;
 	String? diagnosisData;
 	DiagnosisConclusionEnum diagnosisConclusion;
-	List<DiagnosisOrganEnum>? diagnosisOrgans;
+	List<DiagnosisOrganEnum >? diagnosisOrgans;
 
 	RemedicalAISelectedInfoDTO({
 		this.remedicalAISelectedInfoCode,
@@ -3149,7 +3149,7 @@ class SaveRemedicalAISelectedInfoRequest extends TokenRequest{
 	String? previewFileToken;
 	String? diagnosisData;
 	DiagnosisConclusionEnum diagnosisConclusion;
-	List<DiagnosisOrganEnum>? diagnosisOrgans;
+	List<DiagnosisOrganEnum >? diagnosisOrgans;
 
 	SaveRemedicalAISelectedInfoRequest({
 		this.code,
@@ -3204,9 +3204,9 @@ class SyncRemedicalRecordRequest {
 	String? organizationCode;
 	String? deviceCode;
 	bool isUploadReport;
-	List<DataItemDTO>? patientInfo;
+	List<DataItemDTO >? patientInfo;
 	DiagnosisStatusEnum diagnosisStatus;
-	List<DiagnosisInfoDTO>? aIDiagnosisInfos;
+	List<DiagnosisInfoDTO >? aIDiagnosisInfos;
 	DateTime? createTime;
 	DateTime? updateTime;
 	String? creator;
@@ -3269,7 +3269,7 @@ class SyncRemedicalRecordRequest {
 
 class SyncBatchRemedicalRecordRequest {
 	SyncDBEnum syncType;
-	List<SyncRemedicalRecordRequest>? remedicalRecordList;
+	List<SyncRemedicalRecordRequest >? remedicalRecordList;
 
 	SyncBatchRemedicalRecordRequest({
 		this.syncType = SyncDBEnum.Migrate,
@@ -3307,7 +3307,7 @@ class SyncUploadRemedicalDataRequest {
 	String? application;
 	RemedicalFileDataTypeEnum fileDataType;
 	ImageLocationDTO? imageLocation;
-	List<String>? organDiagnosisInfos;
+	List<String >? organDiagnosisInfos;
 
 	SyncUploadRemedicalDataRequest({
 		this.code,
@@ -3383,7 +3383,7 @@ class SyncUploadRemedicalDataRequest {
 
 class SyncBatchUploadRemedicalDatasRequest {
 	SyncDBEnum syncType;
-	List<SyncUploadRemedicalDataRequest>? syncUploadRemedicalDataList;
+	List<SyncUploadRemedicalDataRequest >? syncUploadRemedicalDataList;
 
 	SyncBatchUploadRemedicalDatasRequest({
 		this.syncType = SyncDBEnum.Migrate,
@@ -3444,7 +3444,7 @@ class SyncAIResultRequest {
 
 class SyncBatchAIResultRequest {
 	SyncDBEnum syncType;
-	List<SyncAIResultRequest>? syncAIResultList;
+	List<SyncAIResultRequest >? syncAIResultList;
 
 	SyncBatchAIResultRequest({
 		this.syncType = SyncDBEnum.Migrate,
@@ -3469,7 +3469,7 @@ class SyncBatchAIResultRequest {
 
 class SyncBatchCarotidResultRequest {
 	SyncDBEnum syncType;
-	List<GetCarotidResultRequest>? syncCarotidResultRequest;
+	List<GetCarotidResultRequest >? syncCarotidResultRequest;
 
 	SyncBatchCarotidResultRequest({
 		this.syncType = SyncDBEnum.Migrate,

+ 19 - 19
lib/services/report.m.dart

@@ -34,8 +34,8 @@ class ReportTemplateDTO {
 	bool isDefault;
 	bool isUserDefault;
 	String? reportDatasJson;
-	List<ReportPreviewDTO>? templatePreviewList;
-	List<String>? templatePreviewUrlList;
+	List<ReportPreviewDTO >? templatePreviewList;
+	List<String >? templatePreviewUrlList;
 	String? languageCode;
 
 	ReportTemplateDTO({
@@ -207,7 +207,7 @@ class ReportLabelDTO extends BaseDTO{
 	String? labelName;
 	String? languageCode;
 	ReportLabelUsageTypeEnum usageType;
-	List<String>? labelItems;
+	List<String >? labelItems;
 
 	ReportLabelDTO({
 		this.reportLabelCode,
@@ -348,9 +348,9 @@ class AddReportRequest extends TokenRequest{
 	String? reportTemplateJson;
 	String? reportDatasJson;
 	String? patientName;
-	List<String>? reportLabels;
-	List<String>? platformLabels;
-	List<String>? diagnosisLabels;
+	List<String >? reportLabels;
+	List<String >? platformLabels;
+	List<String >? diagnosisLabels;
 	DiagnosisOrganEnum reportOrgan;
 	String? referralRecordCode;
 	bool isReferral;
@@ -424,9 +424,9 @@ class ModifyReportRequest extends AddReportRequest{
 		String? reportTemplateJson,
 		String? reportDatasJson,
 		String? patientName,
-		List<String>? reportLabels,
-		List<String>? platformLabels,
-		List<String>? diagnosisLabels,
+		List<String >? reportLabels,
+		List<String >? platformLabels,
+		List<String >? diagnosisLabels,
 		DiagnosisOrganEnum reportOrgan = DiagnosisOrganEnum.Null,
 		String? referralRecordCode,
 		bool isReferral = false,
@@ -474,7 +474,7 @@ class ModifyReportRequest extends AddReportRequest{
 
 class ModifyReportLabelsRequest extends TokenRequest{
 	String? reportCode;
-	List<String>? reportLabels;
+	List<String >? reportLabels;
 
 	ModifyReportLabelsRequest({
 		this.reportCode,
@@ -504,7 +504,7 @@ class ModifyReportLabelsRequest extends TokenRequest{
 
 class ShareReportBySmsRequest extends TokenRequest{
 	String? reportCode;
-	List<String>? mobileList;
+	List<String >? mobileList;
 	String? languageCode;
 
 	ShareReportBySmsRequest({
@@ -539,7 +539,7 @@ class ShareReportBySmsRequest extends TokenRequest{
 
 class ShareReportByEmailRequest extends TokenRequest{
 	String? reportCode;
-	List<String>? emailList;
+	List<String >? emailList;
 	String? languageCode;
 
 	ShareReportByEmailRequest({
@@ -1440,7 +1440,7 @@ class CopyOrgThesaurusRequest extends TokenRequest{
 
 class ThesaurusAllDTO {
 	ThesaurusDTO? baseInfo;
-	List<ThesaurusItemDTO>? items;
+	List<ThesaurusItemDTO >? items;
 
 	ThesaurusAllDTO({
 		this.baseInfo,
@@ -1520,7 +1520,7 @@ class SetUserDefaultThesaurusRequest extends TokenRequest{
 }
 
 class RetryPushReportRecordsByCodesRequest extends TokenRequest{
-	List<String>? codes;
+	List<String >? codes;
 
 	RetryPushReportRecordsByCodesRequest({
 		this.codes,
@@ -1716,11 +1716,11 @@ class SyncReportInfoRequest {
 	String? deviceCode;
 	String? reportTemplateJson;
 	String? reportDatasJson;
-	List<String>? reportLabels;
-	List<String>? platformLabels;
-	List<String>? diagnosisLabels;
+	List<String >? reportLabels;
+	List<String >? platformLabels;
+	List<String >? diagnosisLabels;
 	DiagnosisOrganEnum reportOrgan;
-	List<ReportPreviewDTO>? reportPreviewList;
+	List<ReportPreviewDTO >? reportPreviewList;
 
 	SyncReportInfoRequest({
 		this.reportCode,
@@ -1797,7 +1797,7 @@ class SyncReportInfoRequest {
 
 class SyncBatchReportInfoRequest {
 	SyncDBEnum syncType;
-	List<SyncReportInfoRequest>? syncReportInfos;
+	List<SyncReportInfoRequest >? syncReportInfos;
 
 	SyncBatchReportInfoRequest({
 		this.syncType = SyncDBEnum.Migrate,

+ 4 - 4
lib/services/role.m.dart

@@ -5,7 +5,7 @@ class UserRoleLanguageConfigDTO {
 	String? language;
 	String? roleName;
 	String? description;
-	List<String>? fieldList;
+	List<String >? fieldList;
 
 	UserRoleLanguageConfigDTO({
 		this.language,
@@ -41,7 +41,7 @@ class BaseRoleDTO extends BaseDTO{
 	String? roleCode;
 	String? roleName;
 	String? description;
-	List<UserRoleLanguageConfigDTO>? languageConfigs;
+	List<UserRoleLanguageConfigDTO >? languageConfigs;
 
 	BaseRoleDTO({
 		this.roleCode,
@@ -100,7 +100,7 @@ class RoleDTO extends BaseRoleDTO{
 	RoleQualificationEnum roleQualification;
 	String? userGroupCode;
 	RoleShowTypeEnum fieldShowType;
-	List<String>? fieldList;
+	List<String >? fieldList;
 
 	RoleDTO({
 		this.roleShowType = RoleShowTypeEnum.NotShow,
@@ -114,7 +114,7 @@ class RoleDTO extends BaseRoleDTO{
 		String? roleCode,
 		String? roleName,
 		String? description,
-		List<UserRoleLanguageConfigDTO>? languageConfigs,
+		List<UserRoleLanguageConfigDTO >? languageConfigs,
 		DateTime? createTime,
 		DateTime? updateTime,
 	}) : super(

+ 2 - 2
lib/services/storage.m.dart

@@ -62,8 +62,8 @@ class FileServiceRequest extends TokenRequest{
 	String? fileName;
 	bool isRechristen;
 	bool isUpgradePackage;
-	List<DataItemDTO>? urlParams;
-	List<DataItemDTO>? headerParams;
+	List<DataItemDTO >? urlParams;
+	List<DataItemDTO >? headerParams;
 	String? requestMethod;
 
 	FileServiceRequest({

+ 1 - 1
lib/services/upgrade.m.dart

@@ -153,7 +153,7 @@ class GetUserListRequest extends TokenRequest{
 	String? positionCode;
 	bool exceptSelf;
 	String? language;
-	List<String>? roleCodes;
+	List<String >? roleCodes;
 
 	GetUserListRequest({
 		this.keyword,

+ 30 - 30
lib/services/user.m.dart

@@ -87,7 +87,7 @@ class GetUserPageRequest extends PageRequest{
 	String? positionCode;
 	bool exceptSelf;
 	String? language;
-	List<String>? roleCodes;
+	List<String >? roleCodes;
 
 	GetUserPageRequest({
 		this.keyword,
@@ -144,7 +144,7 @@ class GetUserPageRequest extends PageRequest{
 }
 
 class RemoveUsersFromOrganizationRequest extends TokenRequest{
-	List<String>? userCodes;
+	List<String >? userCodes;
 
 	RemoveUsersFromOrganizationRequest({
 		this.userCodes,
@@ -170,9 +170,9 @@ class RemoveUsersFromOrganizationRequest extends TokenRequest{
 
 class SetUserOrganizationInfoRequest extends TokenRequest{
 	String? userCode;
-	List<String>? roleCodes;
-	List<String>? rankCodes;
-	List<String>? positionCodes;
+	List<String >? roleCodes;
+	List<String >? rankCodes;
+	List<String >? positionCodes;
 	String? organizationCode;
 
 	SetUserOrganizationInfoRequest({
@@ -251,7 +251,7 @@ class ShareDeviceUserDTO extends BaseDTO{
 	String? displayName;
 	String? phone;
 	String? headImageUrl;
-	List<String>? rankNames;
+	List<String >? rankNames;
 	String? rootOrganizationCode;
 	String? rootOrganizationName;
 
@@ -391,21 +391,21 @@ class UserInfoByCodeDTO extends UserDTO{
 		String? organizationName,
 		String? rootOrganizationCode,
 		String? rootOrganizationName,
-		List<String>? authorityGroups,
-		List<String>? bindDevices,
-		List<String>? bindDeviceOrganizations,
+		List<String >? authorityGroups,
+		List<String >? bindDevices,
+		List<String >? bindDeviceOrganizations,
 		String? lastIP,
 		int logintimes = 0,
 		UserInfoStateEnum userState = UserInfoStateEnum.Nonactivated,
-		List<String>? roleCodes,
-		List<String>? rankCodes,
-		List<String>? positionCodes,
+		List<String >? roleCodes,
+		List<String >? rankCodes,
+		List<String >? positionCodes,
 		ApplyStateEnum applyState = ApplyStateEnum.NotApply,
 		String? rankName,
 		String? positionName,
 		bool isDirector = false,
-		List<String>? fieldList,
-		List<String>? deletePatientCodes,
+		List<String >? fieldList,
+		List<String >? deletePatientCodes,
 		bool isBatchExportDiagnoseData = false,
 		String? bindAssistantUserCode,
 		String? bindAssistantDoctorUserCode,
@@ -413,11 +413,11 @@ class UserInfoByCodeDTO extends UserDTO{
 		String? signature,
 		String? language,
 		bool enableReportLabel = false,
-		List<AssociatedInfoDTO>? associatedInfos,
+		List<AssociatedInfoDTO >? associatedInfos,
 		String? commonPlatformUserId,
 		String? bindEmergencyDeviceCode,
 		String? bindEmergencyExpertCode,
-		List<String>? dashboardOrgCodes,
+		List<String >? dashboardOrgCodes,
 		String? phone,
 		String? email,
 		String? userCode,
@@ -831,7 +831,7 @@ class SetMessageDeliveryRequest extends TokenRequest{
 }
 
 class SetMessageInfoReqeust extends TokenRequest{
-	List<String>? messageCodes;
+	List<String >? messageCodes;
 
 	SetMessageInfoReqeust({
 		this.messageCodes,
@@ -984,7 +984,7 @@ class GetAnnouncementRequest extends TokenRequest{
 
 class NoReadMessagesDTO {
 	int count;
-	List<String>? noReadCodes;
+	List<String >? noReadCodes;
 
 	NoReadMessagesDTO({
 		this.count = 0,
@@ -1068,7 +1068,7 @@ class UserMigratoryInfo extends UserDTO{
 	bool isDelete;
 	String? secretPassword;
 	DateTime? passwordUpdateTime;
-	List<String>? passwordRecords;
+	List<String >? passwordRecords;
 	UserMigratoryRoleEnum userRole;
 
 	UserMigratoryInfo({
@@ -1082,21 +1082,21 @@ class UserMigratoryInfo extends UserDTO{
 		String? organizationName,
 		String? rootOrganizationCode,
 		String? rootOrganizationName,
-		List<String>? authorityGroups,
-		List<String>? bindDevices,
-		List<String>? bindDeviceOrganizations,
+		List<String >? authorityGroups,
+		List<String >? bindDevices,
+		List<String >? bindDeviceOrganizations,
 		String? lastIP,
 		int logintimes = 0,
 		UserInfoStateEnum userState = UserInfoStateEnum.Nonactivated,
-		List<String>? roleCodes,
-		List<String>? rankCodes,
-		List<String>? positionCodes,
+		List<String >? roleCodes,
+		List<String >? rankCodes,
+		List<String >? positionCodes,
 		ApplyStateEnum applyState = ApplyStateEnum.NotApply,
 		String? rankName,
 		String? positionName,
 		bool isDirector = false,
-		List<String>? fieldList,
-		List<String>? deletePatientCodes,
+		List<String >? fieldList,
+		List<String >? deletePatientCodes,
 		bool isBatchExportDiagnoseData = false,
 		String? bindAssistantUserCode,
 		String? bindAssistantDoctorUserCode,
@@ -1104,11 +1104,11 @@ class UserMigratoryInfo extends UserDTO{
 		String? signature,
 		String? language,
 		bool enableReportLabel = false,
-		List<AssociatedInfoDTO>? associatedInfos,
+		List<AssociatedInfoDTO >? associatedInfos,
 		String? commonPlatformUserId,
 		String? bindEmergencyDeviceCode,
 		String? bindEmergencyExpertCode,
-		List<String>? dashboardOrgCodes,
+		List<String >? dashboardOrgCodes,
 		String? phone,
 		String? email,
 		String? userCode,
@@ -1229,7 +1229,7 @@ class UserMigratoryInfo extends UserDTO{
 
 class BatchInsertUserRequest extends TokenRequest{
 	SyncDBEnum syncType;
-	List<UserMigratoryInfo>? userMigratorys;
+	List<UserMigratoryInfo >? userMigratorys;
 
 	BatchInsertUserRequest({
 		this.syncType = SyncDBEnum.Migrate,

+ 2 - 2
lib/services/vinnoServer.m.dart

@@ -1,5 +1,5 @@
 class UpdateServerInfoRequest {
-	List<String>? codes;
+	List<String >? codes;
 
 	UpdateServerInfoRequest({
 		this.codes,
@@ -102,7 +102,7 @@ class EchoResult extends BaseServerResult{
 
 class UpdateServerIPListRequest {
 	String? name;
-	List<String>? ipRange;
+	List<String >? ipRange;
 
 	UpdateServerIPListRequest({
 		this.name,

Some files were not shown because too many files changed in this diff