同步Server最新接口变更

lib/services/aIDiagnosis.dart

@@ -19,14 +19,13 @@ class AIDiagnosisService extends JsonRpcClientBase {
 						timeout: timeout,
 				) {
 		/// 注册响应实体反序列化处理器
-		FJsonConvert.setDecoder((map) => IList<String>.fromJson(map));
 		FJsonConvert.setDecoder((map) => DiagnosisImageResult.fromJson(map));
 		FJsonConvert.setDecoder((map) => DiagnosisReportResult.fromJson(map));
 	}
 
-	Future<IList<String>> findDiagnosisModulesAsync(TokenRequest request) async {
+	Future<List<String>> findDiagnosisModulesAsync(TokenRequest request) async {
 		var rpcRst = await call("FindDiagnosisModulesAsync", request);
-		var result = IList<String>.fromJson(rpcRst as Map<String, dynamic>);
+		var result = (rpcRst as List).cast<String>().toList();
 		return result;
 	}
 

lib/services/aIDiagnosis.m.dart

@@ -1,24 +1,3 @@
-class IList<T> {
-	String? item;
-
-	IList({
-		this.item,
-	});
-
-	factory IList.fromJson(Map<String, dynamic> map) {
-		return IList( 
-			item: map['Item'],
-		);
-	}
-
-	Map<String, dynamic> toJson() {
-		final map = Map<String, dynamic>();
-		if(item != null)
-			map['Item'] = item;
-		return map;
-	}
-}
-
 class BaseRequest {
 
 	BaseRequest();
@@ -181,8 +160,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,
@@ -219,9 +198,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,
@@ -259,7 +238,7 @@ class AIDiagnosisResultPerOrgan {
 class AIDiagnosisPerImageDTO {
 	int index;
 	double priorityScore;
-	List<AIDiagnosisResultPerOrgan>? diagResultsForEachOrgan;
+	List<AIDiagnosisResultPerOrgan >? diagResultsForEachOrgan;
 
 	AIDiagnosisPerImageDTO({
 		this.index = 0,
@@ -331,7 +310,7 @@ class CarotidResultDTO {
 	CarotidScanDirectionEnum carotidScanDirection;
 	String? surfaceFile;
 	String? mdlFile;
-	List<MeasureImageFileDTO>? measureImageFiles;
+	List<MeasureImageFileDTO >? measureImageFiles;
 	String? measureResult;
 
 	CarotidResultDTO({
@@ -372,8 +351,8 @@ class CarotidResultDTO {
 
 class DiagnosisImageResult {
 	DiagnosisConclusionEnum diagnosisConclusion;
-	List<AIDiagnosisPerImageDTO>? diagnosisResult;
-	List<DiagnosisOrganEnum>? diagnosisOrgans;
+	List<AIDiagnosisPerImageDTO >? diagnosisResult;
+	List<DiagnosisOrganEnum >? diagnosisOrgans;
 	CarotidResultDTO? carotidResult;
 
 	DiagnosisImageResult({
@@ -453,7 +432,7 @@ class DiagnosisPerImageDTO extends AIDiagnosisPerImageDTO{
 		this.aIFileToken,
 		int index = 0,
 		double priorityScore = 0,
-		List<AIDiagnosisResultPerOrgan>? diagResultsForEachOrgan,
+		List<AIDiagnosisResultPerOrgan >? diagResultsForEachOrgan,
 	}) : super(
 			index: index,
 			priorityScore: priorityScore,
@@ -489,7 +468,7 @@ class DiagnosisPerImageDTO extends AIDiagnosisPerImageDTO{
 
 class DiagnosisReportResult {
 	DiagnosisConclusionEnum diagnosisConclusion;
-	List<DiagnosisPerImageDTO>? diagnosisResult;
+	List<DiagnosisPerImageDTO >? diagnosisResult;
 
 	DiagnosisReportResult({
 		this.diagnosisConclusion = DiagnosisConclusionEnum.NotRequired,
@@ -516,7 +495,7 @@ class DiagnosisRemicalDTO {
 	String? remedicalCode;
 	RemedicalFileDataTypeEnum dataType;
 	String? fileToken;
-	List<AIDiagnosisPerImageDTO>? diagnosisResult;
+	List<AIDiagnosisPerImageDTO >? diagnosisResult;
 
 	DiagnosisRemicalDTO({
 		this.remedicalCode,
@@ -549,7 +528,7 @@ class DiagnosisRemicalDTO {
 
 class DiagnosisReportRequest extends TokenRequest{
 	DiagnosisOrganEnum organ;
-	List<DiagnosisRemicalDTO>? remedicalList;
+	List<DiagnosisRemicalDTO >? remedicalList;
 
 	DiagnosisReportRequest({
 		this.organ = DiagnosisOrganEnum.Null,

lib/services/authentication.dart

@@ -23,7 +23,6 @@ class AuthenticationService extends JsonRpcClientBase {
 		/// 注册响应实体反序列化处理器
 		FJsonConvert.setDecoder((map) => TokenDTO.fromJson(map));
 		FJsonConvert.setDecoder((map) => ValidateTokenResult.fromJson(map));
-		FJsonConvert.setDecoder((map) => IList<TokenDTO>.fromJson(map));
 		FJsonConvert.setDecoder((map) => PageResult<TokenDTO>.fromJson(map));
 	}
 
@@ -49,21 +48,21 @@ class AuthenticationService extends JsonRpcClientBase {
 		return result;
 	}
 
-	Future<IList<TokenDTO>> getTokensWithClientIdAsync(GetTokensWithClientIdRequest request) async {
+	Future<List<TokenDTO>> getTokensWithClientIdAsync(GetTokensWithClientIdRequest request) async {
 		var rpcRst = await call("GetTokensWithClientIdAsync", request);
-		var result = IList<TokenDTO>.fromJson(rpcRst as Map<String, dynamic>);
+		var result = (rpcRst as List).map((e)=>TokenDTO.fromJson(e as Map<String, dynamic>)).toList();
 		return result;
 	}
 
-	Future<IList<TokenDTO>> getTokenWithClientIdsAsync(GetTokenWithClientIdsRequest request) async {
+	Future<List<TokenDTO>> getTokenWithClientIdsAsync(GetTokenWithClientIdsRequest request) async {
 		var rpcRst = await call("GetTokenWithClientIdsAsync", request);
-		var result = IList<TokenDTO>.fromJson(rpcRst as Map<String, dynamic>);
+		var result = (rpcRst as List).map((e)=>TokenDTO.fromJson(e as Map<String, dynamic>)).toList();
 		return result;
 	}
 
-	Future<IList<TokenDTO>> getTokenWithValuesAsync(GetTokenWithValuesRequest request) async {
+	Future<List<TokenDTO>> getTokenWithValuesAsync(GetTokenWithValuesRequest request) async {
 		var rpcRst = await call("GetTokenWithValuesAsync", request);
-		var result = IList<TokenDTO>.fromJson(rpcRst as Map<String, dynamic>);
+		var result = (rpcRst as List).map((e)=>TokenDTO.fromJson(e as Map<String, dynamic>)).toList();
 		return result;
 	}
 

lib/services/authentication.m.dart

@@ -2254,7 +2254,7 @@ class GetTokensWithClientIdRequest extends BaseRequest{
 }
 
 class GetTokenWithClientIdsRequest extends BaseRequest{
-	List<String>? clientIds;
+	List<String >? clientIds;
 
 	GetTokenWithClientIdsRequest({
 		this.clientIds,
@@ -2276,7 +2276,7 @@ class GetTokenWithClientIdsRequest extends BaseRequest{
 }
 
 class GetTokenWithValuesRequest extends BaseRequest{
-	List<String>? tokenValues;
+	List<String >? tokenValues;
 
 	GetTokenWithValuesRequest({
 		this.tokenValues,

lib/services/connect.m.dart

@@ -158,7 +158,7 @@ class DeviceInfoDTO extends BaseDTO{
 	String? systemVersion;
 	String? cPUModel;
 	String? systemLanguage;
-	List<String>? diagnosisModules;
+	List<String >? diagnosisModules;
 
 	DeviceInfoDTO({
 		this.deviceCode,
@@ -281,7 +281,7 @@ class CacheDeviceDTO extends DeviceInfoDTO{
 		String? systemVersion,
 		String? cPUModel,
 		String? systemLanguage,
-		List<String>? diagnosisModules,
+		List<String >? diagnosisModules,
 		DateTime? createTime,
 		DateTime? updateTime,
 	}) : super(

lib/services/device.m.dart

@@ -123,7 +123,7 @@ class DeviceExtendInfoDTO extends DeviceInfoDTO{
 		String? systemVersion,
 		String? cPUModel,
 		String? systemLanguage,
-		List<String>? diagnosisModules,
+		List<String >? diagnosisModules,
 		DateTime? createTime,
 		DateTime? updateTime,
 	}) : super(
@@ -559,7 +559,7 @@ class FindDeviceTypeItemsRequest extends TokenRequest{
 }
 
 class CreateShareDeviceToUserRequest extends TokenRequest{
-	List<String>? userCodes;
+	List<String >? userCodes;
 	String? deviceCode;
 
 	CreateShareDeviceToUserRequest({
@@ -589,7 +589,7 @@ class CreateShareDeviceToUserRequest extends TokenRequest{
 }
 
 class DeleteShareDeviceToUserRequest extends TokenRequest{
-	List<String>? userCodes;
+	List<String >? userCodes;
 	String? deviceCode;
 
 	DeleteShareDeviceToUserRequest({

lib/services/fastestServerInteractionCenter.m.dart

@@ -1,5 +1,5 @@
 class UpdateServerInfoRequest {
-	List<String>? codes;
+	List<String >? codes;
 
 	UpdateServerInfoRequest({
 		this.codes,
@@ -46,7 +46,7 @@ class ServerInfoDTO {
 }
 
 class QueryServerInfoRequest {
-	List<String>? codes;
+	List<String >? codes;
 
 	QueryServerInfoRequest({
 		this.codes,

lib/services/identityApply.m.dart

@@ -12,11 +12,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,
@@ -99,9 +99,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,

lib/services/organization.m.dart

@@ -91,8 +91,8 @@ class OrganizationBasicDTO extends OrganizationBaseDTO{
 	String? logoUrl;
 	OrganizationPatientTypeEnum patientType;
 	bool isinvented;
-	List<SettingDTOClass>? settings;
-	List<String>? diagnosisModules;
+	List<SettingDTOClass >? settings;
+	List<String >? diagnosisModules;
 
 	OrganizationBasicDTO({
 		this.regionCode,
@@ -163,11 +163,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? patientSettingVersion;
@@ -191,8 +191,8 @@ 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,
 		String? organizationCode,
 		String? organizationName,
 		DateTime? createTime,
@@ -452,7 +452,7 @@ class OrganizationItemDTO {
 }
 
 class AddOrganizationsRequest extends TokenRequest{
-	List<OrganizationItemDTO>? organizationInfos;
+	List<OrganizationItemDTO >? organizationInfos;
 
 	AddOrganizationsRequest({
 		this.organizationInfos,
@@ -477,7 +477,7 @@ class AddOrganizationsRequest extends TokenRequest{
 }
 
 class RemoveOrganizationsRequest extends TokenRequest{
-	List<String>? organizationCodes;
+	List<String >? organizationCodes;
 
 	RemoveOrganizationsRequest({
 		this.organizationCodes,
@@ -593,7 +593,7 @@ class GetUserOrganizationSettingRequest extends TokenRequest{
 
 class ServerLangugeClass {
 	String? langugeKey;
-	List<String>? langugeModules;
+	List<String >? langugeModules;
 
 	ServerLangugeClass({
 		this.langugeKey,
@@ -618,7 +618,7 @@ class ServerLangugeClass {
 }
 
 class ServerSettingResult {
-	List<ServerLangugeClass>? serverLangugeList;
+	List<ServerLangugeClass >? serverLangugeList;
 	Map<String,String>? serverConfigList;
 
 	ServerSettingResult({
@@ -702,7 +702,7 @@ class LangugeDataItemRequest {
 
 class LangugeDataRequest extends TokenRequest{
 	String? langugeKey;
-	List<LangugeDataItemRequest>? langugeDataItemList;
+	List<LangugeDataItemRequest >? langugeDataItemList;
 
 	LangugeDataRequest({
 		this.langugeKey,

lib/services/patient.m.dart

@@ -31,8 +31,8 @@ class DataItemDTO {
 }
 
 class CreatePatientRequest extends TokenRequest{
-	List<DataItemDTO>? patientData;
-	List<String>? assignmentUserCodes;
+	List<DataItemDTO >? patientData;
+	List<String >? assignmentUserCodes;
 
 	CreatePatientRequest({
 		this.patientData,
@@ -62,8 +62,8 @@ class CreatePatientRequest extends TokenRequest{
 
 class UpdatePatientRequest extends TokenRequest{
 	String? code;
-	List<DataItemDTO>? patientData;
-	List<String>? assignmentUserCodes;
+	List<DataItemDTO >? patientData;
+	List<String >? assignmentUserCodes;
 
 	UpdatePatientRequest({
 		this.code,
@@ -105,8 +105,8 @@ class PatientInfoBaseDTO extends BaseDTO{
 	int gender;
 	bool isValid;
 	String? organizationCode;
-	List<String>? assignmentUserCodes;
-	List<DataItemDTO>? patientData;
+	List<String >? assignmentUserCodes;
+	List<DataItemDTO >? patientData;
 	int unReadRecordCount;
 	String? headImgUrl;
 	String? patientType;
@@ -188,7 +188,7 @@ class PatientInfoBaseDTO extends BaseDTO{
 class PatientInfoDTO extends PatientInfoBaseDTO{
 	String? creatorCode;
 	String? deviceCode;
-	List<String>? updateUsers;
+	List<String >? updateUsers;
 
 	PatientInfoDTO({
 		this.creatorCode,
@@ -203,8 +203,8 @@ class PatientInfoDTO extends PatientInfoBaseDTO{
 		int gender = 0,
 		bool isValid = false,
 		String? organizationCode,
-		List<String>? assignmentUserCodes,
-		List<DataItemDTO>? patientData,
+		List<String >? assignmentUserCodes,
+		List<DataItemDTO >? patientData,
 		int unReadRecordCount = 0,
 		String? headImgUrl,
 		String? patientType,
@@ -266,7 +266,7 @@ class PatientInfoDTO extends PatientInfoBaseDTO{
 }
 
 class CreatePatientsRequest extends TokenRequest{
-	List<PatientInfoDTO>? patients;
+	List<PatientInfoDTO >? patients;
 
 	CreatePatientsRequest({
 		this.patients,
@@ -293,7 +293,7 @@ class CreatePatientsRequest extends TokenRequest{
 class ClientPatientInfoBaseDTO extends BaseDTO{
 	String? patientCode;
 	bool isValid;
-	List<DataItemDTO>? patientData;
+	List<DataItemDTO >? patientData;
 	int unReadRecordCount;
 
 	ClientPatientInfoBaseDTO({
@@ -496,7 +496,7 @@ class ChildrenFetusNodeDTO {
 	String? modeName;
 	String? applicationId;
 	String? application;
-	List<String>? children;
+	List<String >? children;
 
 	ChildrenFetusNodeDTO({
 		this.typeName,
@@ -543,7 +543,7 @@ class ChildrenFetusNodeDTO {
 class FetusNodeDTO {
 	String? typeName;
 	String? fetusIndex;
-	List<ChildrenFetusNodeDTO>? children;
+	List<ChildrenFetusNodeDTO >? children;
 
 	FetusNodeDTO({
 		this.typeName,
@@ -573,7 +573,7 @@ class FetusNodeDTO {
 
 class MeasuredResultsDTO {
 	String? version;
-	List<FetusNodeDTO>? fetusNodes;
+	List<FetusNodeDTO >? fetusNodes;
 
 	MeasuredResultsDTO({
 		this.version,
@@ -654,7 +654,7 @@ class AdornerDTO {
 
 class BaseAreaDTO {
 	String? visualAreaTypeName;
-	List<AdornerDTO>? adorner;
+	List<AdornerDTO >? adorner;
 
 	BaseAreaDTO({
 		this.visualAreaTypeName,
@@ -679,7 +679,7 @@ class BaseAreaDTO {
 }
 
 class VisualAreaDTO {
-	List<BaseAreaDTO>? children;
+	List<BaseAreaDTO >? children;
 
 	VisualAreaDTO({
 		this.children,
@@ -726,7 +726,7 @@ class VisualKeyDTO {
 }
 
 class VisualDTO {
-	List<VisualKeyDTO>? children;
+	List<VisualKeyDTO >? children;
 
 	VisualDTO({
 		this.children,
@@ -778,7 +778,7 @@ class RemedicalInfoDTO extends BaseDTO{
 	ImageLocationDTO? imageLocation;
 	DiagnosisConclusionEnum diagnosisConclusion;
 	String? diagnosisResult;
-	List<DiagnosisOrganEnum>? diagnosisOrgans;
+	List<DiagnosisOrganEnum >? diagnosisOrgans;
 	MeasuredResultsDTO? measuredResult;
 	ScanImageDTO? commentResult;
 	CarotidResultDTO? carotidResult;
@@ -880,9 +880,9 @@ class GetRecordsPageDTO {
 	String? recordCode;
 	RecordStatusEnum recordStatus;
 	bool isRead;
-	List<RemedicalInfoDTO>? remedicalList;
+	List<RemedicalInfoDTO >? remedicalList;
 	DiagnosisStatusEnum diagnosisStatus;
-	List<DiagnosisInfoDTO>? diagnosisInfos;
+	List<DiagnosisInfoDTO >? diagnosisInfos;
 
 	GetRecordsPageDTO({
 		this.createTime,
@@ -943,7 +943,7 @@ class ClientPatientInfoDTO extends ClientPatientInfoBaseDTO{
 	String? creatorCode;
 	String? creatorName;
 	String? deviceCode;
-	List<UserBaseDTO>? assignmentUserList;
+	List<UserBaseDTO >? assignmentUserList;
 	GetRecordsPageDTO? lastRecord;
 
 	ClientPatientInfoDTO({
@@ -954,7 +954,7 @@ class ClientPatientInfoDTO extends ClientPatientInfoBaseDTO{
 		this.lastRecord,
 		String? patientCode,
 		bool isValid = false,
-		List<DataItemDTO>? patientData,
+		List<DataItemDTO >? patientData,
 		int unReadRecordCount = 0,
 		DateTime? createTime,
 		DateTime? updateTime,
@@ -1084,7 +1084,7 @@ class SetValidPatientRequest extends TokenRequest{
 }
 
 class RemovePatientsRequest extends TokenRequest{
-	List<String>? patientCodes;
+	List<String >? patientCodes;
 
 	RemovePatientsRequest({
 		this.patientCodes,

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,

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,

lib/services/recordInfo.dart

@@ -5,8 +5,8 @@ import 'package:fis_common/json_convert.dart';
 
 import 'recordInfo.m.dart';
 
-import 'aIDiagnosis.m.dart';
 import 'authentication.m.dart';
+import 'aIDiagnosis.m.dart';
 import 'patient.m.dart';
 
 

lib/services/recordInfo.m.dart

@@ -8,7 +8,7 @@ import 'package:fis_jsonrpc/utils.dart';
 
 class PatientInfoExt {
 	String? patientScanType;
-	List<DataItemDTO>? content;
+	List<DataItemDTO >? content;
 
 	PatientInfoExt({
 		this.patientScanType,
@@ -35,7 +35,7 @@ class PatientInfoExt {
 class CreateRecordRequest extends TokenRequest{
 	String? patientCode;
 	String? deviceCode;
-	List<PatientInfoExt>? patientInfoExtList;
+	List<PatientInfoExt >? patientInfoExtList;
 
 	CreateRecordRequest({
 		this.patientCode,
@@ -130,9 +130,9 @@ class QueryRecordResult {
 	String? creatorName;
 	String? deviceName;
 	RecordStatusEnum recordStatus;
-	List<PatientInfoExt>? patientInfoExtList;
+	List<PatientInfoExt >? patientInfoExtList;
 	DiagnosisStatusEnum diagnosisStatus;
-	List<DiagnosisInfoDTO>? diagnosisInfos;
+	List<DiagnosisInfoDTO >? diagnosisInfos;
 
 	QueryRecordResult({
 		this.createTime,
@@ -215,7 +215,7 @@ class QueryRecordRequest extends TokenRequest{
 }
 
 class ProcessRecordDataResult {
-	List<DataItemDTO>? content;
+	List<DataItemDTO >? content;
 
 	ProcessRecordDataResult({
 		this.content,
@@ -246,7 +246,7 @@ enum AnimalSpeciesEnum {
 
 class ProcessRecordDataRequest extends TokenRequest{
 	String? methodName;
-	List<DataItemDTO>? content;
+	List<DataItemDTO >? content;
 	OrganizationPatientTypeEnum patientType;
 	AnimalSpeciesEnum speciesEnum;
 

lib/services/remedical.dart

@@ -5,10 +5,11 @@ import 'package:fis_common/json_convert.dart';
 
 import 'remedical.m.dart';
 
-import 'recordInfo.m.dart';
-import 'organization.m.dart';
 import 'patient.m.dart';
+import 'recordInfo.m.dart';
 import 'authentication.m.dart';
+import 'organization.m.dart';
+import 'aIDiagnosis.m.dart';
 
 
 class RemedicalService extends JsonRpcClientBase {
@@ -135,6 +136,8 @@ class RemedicalService extends JsonRpcClientBase {
 
 	Future<List<DiagnosisOrganEnum>> findDeviceDiagnosisAsync(FindDeviceDiagnosisRequest request) async {
 		var rpcRst = await call("FindDeviceDiagnosisAsync", request);
+		var result = (rpcRst as List).map((e)=>DiagnosisOrganEnum.values.firstWhere((i) => i.index == e)).toList();
+		return result;
 	}
 
 	Future<bool> deviceDiagnosisChanged(DeviceDiagnosisChangedNotification request) async {

lib/services/remedical.m.dart

@@ -31,8 +31,8 @@ class CreateExaminfoResult {
 class CreateExaminfoRequest extends TokenRequest{
 	String? patientType;
 	String? reservationCode;
-	List<DataItemDTO>? patientInfo;
-	List<PatientInfoExt>? patientScanInfoList;
+	List<DataItemDTO >? patientInfo;
+	List<PatientInfoExt >? patientScanInfoList;
 
 	CreateExaminfoRequest({
 		this.patientType,
@@ -183,7 +183,7 @@ class AddToRemedicalDiagnosisRequest extends TokenRequest{
 
 class RemedicalItemList {
 	String? patientScanTypeDesc;
-	List<RemedicalInfoDTO>? remedicalList;
+	List<RemedicalInfoDTO >? remedicalList;
 
 	RemedicalItemList({
 		this.patientScanTypeDesc,
@@ -210,7 +210,7 @@ class RemedicalItemList {
 class RemedicalListResult {
 	String? scanDate;
 	String? recordCode;
-	List<RemedicalItemList>? remedicalItemList;
+	List<RemedicalItemList >? remedicalItemList;
 
 	RemedicalListResult({
 		this.scanDate,
@@ -273,8 +273,8 @@ class QueryDropdownListReuqest extends TokenRequest{
 
 class RservationResult {
 	String? reservationCode;
-	List<DataItemDTO>? patientInfo;
-	List<PatientInfoExt>? patientInfoExtList;
+	List<DataItemDTO >? patientInfo;
+	List<PatientInfoExt >? patientInfoExtList;
 	String? dataSource;
 
 	RservationResult({
@@ -308,7 +308,7 @@ class RservationResult {
 }
 
 class QueryReservationResult {
-	List<RservationResult>? reservationList;
+	List<RservationResult >? reservationList;
 
 	QueryReservationResult({
 		this.reservationList,
@@ -379,7 +379,7 @@ class FinishExamNotifyDetail {
 }
 
 class PushFinishExamNotifyToClientRequest {
-	List<FinishExamNotifyDetail>? records;
+	List<FinishExamNotifyDetail >? records;
 	String? userCode;
 
 	PushFinishExamNotifyToClientRequest({
@@ -405,7 +405,7 @@ class PushFinishExamNotifyToClientRequest {
 }
 
 class DeviceFinishExamRequest extends TokenRequest{
-	List<String>? records;
+	List<String >? records;
 
 	DeviceFinishExamRequest({
 		this.records,
@@ -434,7 +434,7 @@ class QueryExamListItemResult {
 	String? patientName;
 	String? age;
 	String? sex;
-	List<String>? associatedExamCodes;
+	List<String >? associatedExamCodes;
 
 	QueryExamListItemResult({
 		this.examCode,
@@ -526,8 +526,8 @@ class QueryExamInfoResult {
 	String? patientName;
 	String? patientAge;
 	String? patientSex;
-	List<PatientInfoExt>? patientInfoExtList;
-	List<String>? associatedExamCodes;
+	List<PatientInfoExt >? patientInfoExtList;
+	List<String >? associatedExamCodes;
 
 	QueryExamInfoResult({
 		this.createTime,
@@ -901,7 +901,7 @@ class OutputItemMetaDTO {
 }
 
 class CalculatorMetaDTO {
-	List<OutputItemMetaDTO>? availableOutputs;
+	List<OutputItemMetaDTO >? availableOutputs;
 
 	CalculatorMetaDTO({
 		this.availableOutputs,
@@ -925,7 +925,7 @@ class ChildItemMetaDTO {
 	String? name;
 	String? description;
 	bool isWorking;
-	List<ChildItemMetaDTO>? childItems;
+	List<ChildItemMetaDTO >? childItems;
 	CalculatorMetaDTO? calculator;
 
 	ChildItemMetaDTO({
@@ -966,9 +966,9 @@ class ItemMetaDTO {
 	String? description;
 	String? briefAnnotation;
 	String? measureTypeName;
-	List<String>? categories;
+	List<String >? categories;
 	CalculatorMetaDTO? calculator;
-	List<ChildItemMetaDTO>? multiMethodItems;
+	List<ChildItemMetaDTO >? multiMethodItems;
 
 	ItemMetaDTO({
 		this.name,
@@ -1014,8 +1014,8 @@ class ItemMetaDTO {
 
 class MeasureFolderDTO {
 	String? name;
-	List<String>? workingItemNames;
-	List<ItemMetaDTO>? availableItems;
+	List<String >? workingItemNames;
+	List<ItemMetaDTO >? availableItems;
 
 	MeasureFolderDTO({
 		this.name,
@@ -1046,7 +1046,7 @@ class MeasureFolderDTO {
 class MeasureGroupDTO {
 	String? name;
 	String? description;
-	List<MeasureFolderDTO>? availableFolders;
+	List<MeasureFolderDTO >? availableFolders;
 
 	MeasureGroupDTO({
 		this.name,
@@ -1076,7 +1076,7 @@ class MeasureGroupDTO {
 
 class MeasureModeDTO {
 	String? modeName;
-	List<MeasureGroupDTO>? availableGroups;
+	List<MeasureGroupDTO >? availableGroups;
 
 	MeasureModeDTO({
 		this.modeName,
@@ -1104,7 +1104,7 @@ class MeasureApplicationDTO {
 	String? version;
 	String? id;
 	String? description;
-	List<MeasureModeDTO>? availableModes;
+	List<MeasureModeDTO >? availableModes;
 
 	MeasureApplicationDTO({
 		this.version,
@@ -1139,7 +1139,7 @@ class MeasureApplicationDTO {
 class GetMeasureApplicationRequest extends TokenRequest{
 	String? applicationName;
 	String? categoryName;
-	List<String>? measureModes;
+	List<String >? measureModes;
 
 	GetMeasureApplicationRequest({
 		this.applicationName,
@@ -1194,7 +1194,7 @@ class CommentItemDTO {
 
 class CommentItemResultDTO {
 	String? version;
-	List<CommentItemDTO>? commentItems;
+	List<CommentItemDTO >? commentItems;
 
 	CommentItemResultDTO({
 		this.version,
@@ -1254,7 +1254,7 @@ class GetCommentsByApplicationRequest extends TokenRequest{
 }
 
 class PresetCommentItemDTO {
-	List<String>? categoryList;
+	List<String >? categoryList;
 	String? text;
 
 	PresetCommentItemDTO({
@@ -1281,7 +1281,7 @@ class PresetCommentItemDTO {
 
 class PresetCommentItemResultDTO {
 	String? version;
-	List<PresetCommentItemDTO>? presetCommentItems;
+	List<PresetCommentItemDTO >? presetCommentItems;
 
 	PresetCommentItemResultDTO({
 		this.version,
@@ -1425,7 +1425,7 @@ class SaveUserDefinedCommentsRequest extends TokenRequest{
 	String? languageCode;
 	String? applicationName;
 	String? categoryName;
-	List<CommentItemDTO>? commentItems;
+	List<CommentItemDTO >? commentItems;
 
 	SaveUserDefinedCommentsRequest({
 		this.version,
@@ -1493,9 +1493,9 @@ class UserDefinedItemMetaDTO {
 
 class UserDefinedMeasureFolderDTO {
 	String? name;
-	List<String>? workingItemNames;
+	List<String >? workingItemNames;
 	String? defaultItem;
-	List<UserDefinedItemMetaDTO>? multiMethodItemMetas;
+	List<UserDefinedItemMetaDTO >? multiMethodItemMetas;
 
 	UserDefinedMeasureFolderDTO({
 		this.name,
@@ -1529,7 +1529,7 @@ class UserDefinedMeasureFolderDTO {
 
 class UserDefinedMeasureGroupDTO {
 	String? name;
-	List<UserDefinedMeasureFolderDTO>? folders;
+	List<UserDefinedMeasureFolderDTO >? folders;
 
 	UserDefinedMeasureGroupDTO({
 		this.name,
@@ -1555,7 +1555,7 @@ class UserDefinedMeasureGroupDTO {
 
 class UserDefinedMeasureModeDTO {
 	String? modeName;
-	List<UserDefinedMeasureGroupDTO>? workingGroups;
+	List<UserDefinedMeasureGroupDTO >? workingGroups;
 
 	UserDefinedMeasureModeDTO({
 		this.modeName,
@@ -1769,16 +1769,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;
 
 	RecordInfoDTO({
 		this.recordCode,
@@ -1868,8 +1868,8 @@ class RecordInfoDTO extends BaseDTO{
 
 class RemedicalData {
 	RecordInfoDTO? recordBaseInfo;
-	List<String>? reports;
-	List<String>? remedicalDatas;
+	List<String >? reports;
+	List<String >? remedicalDatas;
 
 	RemedicalData({
 		this.recordBaseInfo,
@@ -1898,7 +1898,7 @@ class RemedicalData {
 }
 
 class ExportRemedicalDataResult {
-	List<RemedicalData>? remedicalDataList;
+	List<RemedicalData >? remedicalDataList;
 
 	ExportRemedicalDataResult({
 		this.remedicalDataList,
@@ -1924,7 +1924,7 @@ class ExportRemedicalDataRequest extends TokenRequest{
 	bool isExportReport;
 	bool isExportRecord;
 	bool isExportRemedicalData;
-	List<String>? patientCodes;
+	List<String >? patientCodes;
 
 	ExportRemedicalDataRequest({
 		this.startTime,

lib/services/report.m.dart

@@ -30,7 +30,7 @@ class ReportTemplateDTO {
 	String? organizationCode;
 	String? personalCode;
 	String? reportTemplateJson;
-	List<String>? reportTemplateUser;
+	List<String >? reportTemplateUser;
 	bool isDefault;
 
 	ReportTemplateDTO({
@@ -178,13 +178,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;
 
 	ReportBaseDTO({
 		this.reportCode,
@@ -276,13 +276,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,
 		DateTime? createTime,
 		DateTime? updateTime,
 	}) : super(
@@ -427,7 +427,7 @@ class ReportLabelDTO extends BaseDTO{
 	String? labelName;
 	String? languageCode;
 	ReportLabelUsageTypeEnum usageType;
-	List<String>? labelItems;
+	List<String >? labelItems;
 
 	ReportLabelDTO({
 		this.reportLabelCode,
@@ -563,9 +563,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;
 
 	AddReportRequest({
@@ -626,9 +626,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? token,
 	}) : super(
@@ -668,7 +668,7 @@ class ModifyReportRequest extends AddReportRequest{
 
 class ModifyReportLabelsRequest extends TokenRequest{
 	String? reportCode;
-	List<String>? reportLabels;
+	List<String >? reportLabels;
 
 	ModifyReportLabelsRequest({
 		this.reportCode,
@@ -698,7 +698,7 @@ class ModifyReportLabelsRequest extends TokenRequest{
 
 class ShareReportBySmsRequest extends TokenRequest{
 	String? reportCode;
-	List<String>? mobileList;
+	List<String >? mobileList;
 
 	ShareReportBySmsRequest({
 		this.reportCode,
@@ -728,7 +728,7 @@ class ShareReportBySmsRequest extends TokenRequest{
 
 class ShareReportByEmailRequest extends TokenRequest{
 	String? reportCode;
-	List<String>? emailList;
+	List<String >? emailList;
 
 	ShareReportByEmailRequest({
 		this.reportCode,
@@ -1271,7 +1271,7 @@ class ThesaurusDTO {
 	ThesaurusUsageTypeEnum thesaurusUsageType;
 	String? organizationCode;
 	String? personalCode;
-	List<String>? thesaurusUser;
+	List<String >? thesaurusUser;
 	bool isDefault;
 	bool isUserDefault;
 
@@ -1626,7 +1626,7 @@ class CopyOrgThesaurusRequest extends TokenRequest{
 
 class ThesaurusAllDTO {
 	ThesaurusDTO? baseInfo;
-	List<ThesaurusItemDTO>? items;
+	List<ThesaurusItemDTO >? items;
 
 	ThesaurusAllDTO({
 		this.baseInfo,
@@ -1746,7 +1746,7 @@ class RemoveCacheReportPosterRequest extends TokenRequest{
 }
 
 class RetryPushReportRecordsByCodesRequest extends TokenRequest{
-	List<String>? codes;
+	List<String >? codes;
 
 	RetryPushReportRecordsByCodesRequest({
 		this.codes,

lib/services/role.m.dart

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

lib/services/user.m.dart

@@ -16,20 +16,20 @@ class UserDTO extends UserBaseDTO{
 	String? fullName;
 	String? organizationCode;
 	String? rootOrganizationCode;
-	List<String>? authorityGroups;
-	List<String>? bindDevices;
+	List<String >? authorityGroups;
+	List<String >? bindDevices;
 	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;
 
 	UserDTO({
@@ -277,7 +277,7 @@ class GetUserListRequest extends TokenRequest{
 }
 
 class RemoveUsersFromOrganizationRequest extends TokenRequest{
-	List<String>? userCodes;
+	List<String >? userCodes;
 
 	RemoveUsersFromOrganizationRequest({
 		this.userCodes,
@@ -303,9 +303,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({
@@ -382,7 +382,7 @@ class ShareDeviceUserDTO extends BaseDTO{
 	String? fullName;
 	String? phone;
 	String? headImageUrl;
-	List<String>? rankNames;
+	List<String >? rankNames;
 	String? rootOrganizationCode;
 	String? rootOrganizationName;