1、更新rpc

lib/services/authentication.m.dart

@@ -2241,7 +2241,7 @@ enum CustomerRpcCode {
 	DevicePasswordErr,
 	DeviceDescriptionEmpty,
 	DeviceCannotRestart,
-	placeHolder_2039,
+	DeviceCannotSettingVideo,
 	placeHolder_2040,
 	placeHolder_2041,
 	placeHolder_2042,

lib/services/connect.m.dart

@@ -45,6 +45,7 @@ class ConnectRequest {
 	LoginSource loginSource;
 	String? installVersion;
 	bool isOldPlatform;
+	String? deviceCode;
 
 	ConnectRequest({
 		this.deviceUniqueCode,
@@ -63,6 +64,7 @@ class ConnectRequest {
 		this.loginSource = LoginSource.PC,
 		this.installVersion,
 		this.isOldPlatform = false,
+		this.deviceCode,
 	});
 
 	factory ConnectRequest.fromJson(Map<String, dynamic> map) {
@@ -83,6 +85,7 @@ class ConnectRequest {
 			loginSource: LoginSource.values.firstWhere((e) => e.index == map['LoginSource']),
 			installVersion: map['InstallVersion'],
 			isOldPlatform: map['IsOldPlatform'],
+			deviceCode: map['DeviceCode'],
 		);
 	}
 
@@ -117,6 +120,8 @@ class ConnectRequest {
 		if(installVersion != null)
 			map['InstallVersion'] = installVersion;
 		map['IsOldPlatform'] = isOldPlatform;
+		if(deviceCode != null)
+			map['DeviceCode'] = deviceCode;
 		return map;
 	}
 }

lib/services/device.dart

@@ -72,6 +72,11 @@ class DeviceService extends JsonRpcClientBase {
 		return rpcRst;
 	}
 
+	Future<bool> batchInsertDevicePatchsDataAsync(MigrateDevicePatchRequest request) async {
+		var rpcRst = await call("BatchInsertDevicePatchsDataAsync", request);
+		return rpcRst;
+	}
+
 	Future<PageCollection<DeviceExtendInfoDTO>> getOrganizationDeviceListAsync(GetPersonDeviceRequest request) async {
 		var rpcRst = await call("GetOrganizationDeviceListAsync", request);
 		var result = PageCollection<DeviceExtendInfoDTO>.fromJson(rpcRst as Map<String, dynamic>);

lib/services/device.m.dart

@@ -135,6 +135,152 @@ class MigrateDevicePrinterRequest extends TokenRequest{
 	}
 }
 
+class DevicePatchDTO extends BaseDTO{
+	String? code;
+	String? name;
+	String? description;
+	String? deviceType;
+	String? softwareVersion;
+	String? osVersion;
+	List<UploadDeviceFileInfoDTO >? deviceFileInfoList;
+	int fileSize;
+	String? fileName;
+
+	DevicePatchDTO({
+		this.code,
+		this.name,
+		this.description,
+		this.deviceType,
+		this.softwareVersion,
+		this.osVersion,
+		this.deviceFileInfoList,
+		this.fileSize = 0,
+		this.fileName,
+		DateTime? createTime,
+		DateTime? updateTime,
+	}) : super(
+			createTime: createTime,
+			updateTime: updateTime,
+		);
+
+	factory DevicePatchDTO.fromJson(Map<String, dynamic> map) {
+		return DevicePatchDTO( 
+			code: map['Code'],
+			name: map['Name'],
+			description: map['Description'],
+			deviceType: map['DeviceType'],
+			softwareVersion: map['SoftwareVersion'],
+			osVersion: map['OsVersion'],
+			deviceFileInfoList: map['DeviceFileInfoList'] != null ? (map['DeviceFileInfoList'] as List).map((e)=>UploadDeviceFileInfoDTO.fromJson(e as Map<String,dynamic>)).toList() : null,
+			fileSize: map['FileSize'],
+			fileName: map['FileName'],
+			createTime: map['CreateTime'] != null ? DateTime.parse(map['CreateTime']) : null,
+			updateTime: map['UpdateTime'] != null ? DateTime.parse(map['UpdateTime']) : null,
+		);
+	}
+
+	Map<String, dynamic> toJson() {
+		final map = super.toJson();
+		if(code != null)
+			map['Code'] = code;
+		if(name != null)
+			map['Name'] = name;
+		if(description != null)
+			map['Description'] = description;
+		if(deviceType != null)
+			map['DeviceType'] = deviceType;
+		if(softwareVersion != null)
+			map['SoftwareVersion'] = softwareVersion;
+		if(osVersion != null)
+			map['OsVersion'] = osVersion;
+		if(deviceFileInfoList != null)
+			map['DeviceFileInfoList'] = deviceFileInfoList;
+		map['FileSize'] = fileSize;
+		if(fileName != null)
+			map['FileName'] = fileName;
+		return map;
+	}
+}
+
+class MigrateDevicePatchInfo extends DevicePatchDTO{
+	bool isDelete;
+
+	MigrateDevicePatchInfo({
+		this.isDelete = false,
+		DateTime? createTime,
+		DateTime? updateTime,
+		String? code,
+		String? name,
+		String? description,
+		String? deviceType,
+		String? softwareVersion,
+		String? osVersion,
+		List<UploadDeviceFileInfoDTO >? deviceFileInfoList,
+		int fileSize = 0,
+		String? fileName,
+	}) : super(
+			code: code,
+			name: name,
+			description: description,
+			deviceType: deviceType,
+			softwareVersion: softwareVersion,
+			osVersion: osVersion,
+			deviceFileInfoList: deviceFileInfoList,
+			fileSize: fileSize,
+			fileName: fileName,
+			createTime: createTime,
+			updateTime: updateTime,
+		);
+
+	factory MigrateDevicePatchInfo.fromJson(Map<String, dynamic> map) {
+		return MigrateDevicePatchInfo( 
+			isDelete: map['IsDelete'],
+			createTime: map['CreateTime'] != null ? DateTime.parse(map['CreateTime']) : null,
+			updateTime: map['UpdateTime'] != null ? DateTime.parse(map['UpdateTime']) : null,
+			code: map['Code'],
+			name: map['Name'],
+			description: map['Description'],
+			deviceType: map['DeviceType'],
+			softwareVersion: map['SoftwareVersion'],
+			osVersion: map['OsVersion'],
+			deviceFileInfoList: map['DeviceFileInfoList'] != null ? (map['DeviceFileInfoList'] as List).map((e)=>UploadDeviceFileInfoDTO.fromJson(e as Map<String,dynamic>)).toList() : null,
+			fileSize: map['FileSize'],
+			fileName: map['FileName'],
+		);
+	}
+
+	Map<String, dynamic> toJson() {
+		final map = super.toJson();
+		map['IsDelete'] = isDelete;
+		return map;
+	}
+}
+
+class MigrateDevicePatchRequest extends TokenRequest{
+	List<MigrateDevicePatchInfo >? migrateDevicePatchInfos;
+
+	MigrateDevicePatchRequest({
+		this.migrateDevicePatchInfos,
+		String? token,
+	}) : super(
+			token: token,
+		);
+
+	factory MigrateDevicePatchRequest.fromJson(Map<String, dynamic> map) {
+		return MigrateDevicePatchRequest( 
+			migrateDevicePatchInfos: map['MigrateDevicePatchInfos'] != null ? (map['MigrateDevicePatchInfos'] as List).map((e)=>MigrateDevicePatchInfo.fromJson(e as Map<String,dynamic>)).toList() : null,
+			token: map['Token'],
+		);
+	}
+
+	Map<String, dynamic> toJson() {
+		final map = super.toJson();
+		if(migrateDevicePatchInfos != null)
+			map['MigrateDevicePatchInfos'] = migrateDevicePatchInfos;
+		return map;
+	}
+}
+
 class DictionaryLanguageConfigDTO {
 	String? language;
 	String? value;
@@ -2502,73 +2648,6 @@ class AddDevicePatchRequest extends TokenRequest{
 	}
 }
 
-class DevicePatchDTO extends BaseDTO{
-	String? code;
-	String? name;
-	String? description;
-	String? deviceType;
-	String? softwareVersion;
-	String? osVersion;
-	List<UploadDeviceFileInfoDTO >? deviceFileInfoList;
-	int fileSize;
-	String? fileName;
-
-	DevicePatchDTO({
-		this.code,
-		this.name,
-		this.description,
-		this.deviceType,
-		this.softwareVersion,
-		this.osVersion,
-		this.deviceFileInfoList,
-		this.fileSize = 0,
-		this.fileName,
-		DateTime? createTime,
-		DateTime? updateTime,
-	}) : super(
-			createTime: createTime,
-			updateTime: updateTime,
-		);
-
-	factory DevicePatchDTO.fromJson(Map<String, dynamic> map) {
-		return DevicePatchDTO( 
-			code: map['Code'],
-			name: map['Name'],
-			description: map['Description'],
-			deviceType: map['DeviceType'],
-			softwareVersion: map['SoftwareVersion'],
-			osVersion: map['OsVersion'],
-			deviceFileInfoList: map['DeviceFileInfoList'] != null ? (map['DeviceFileInfoList'] as List).map((e)=>UploadDeviceFileInfoDTO.fromJson(e as Map<String,dynamic>)).toList() : null,
-			fileSize: map['FileSize'],
-			fileName: map['FileName'],
-			createTime: map['CreateTime'] != null ? DateTime.parse(map['CreateTime']) : null,
-			updateTime: map['UpdateTime'] != null ? DateTime.parse(map['UpdateTime']) : null,
-		);
-	}
-
-	Map<String, dynamic> toJson() {
-		final map = super.toJson();
-		if(code != null)
-			map['Code'] = code;
-		if(name != null)
-			map['Name'] = name;
-		if(description != null)
-			map['Description'] = description;
-		if(deviceType != null)
-			map['DeviceType'] = deviceType;
-		if(softwareVersion != null)
-			map['SoftwareVersion'] = softwareVersion;
-		if(osVersion != null)
-			map['OsVersion'] = osVersion;
-		if(deviceFileInfoList != null)
-			map['DeviceFileInfoList'] = deviceFileInfoList;
-		map['FileSize'] = fileSize;
-		if(fileName != null)
-			map['FileName'] = fileName;
-		return map;
-	}
-}
-
 class FindDevicePatchPageRequest extends PageRequest{
 	String? keyword;
 

lib/services/other.m.dart

@@ -4369,6 +4369,72 @@ class BatchInsertReportLabelRequest extends TokenRequest{
 	}
 }
 
+class OrganizationDefaultTemplate {
+	String? organizationCode;
+	String? defaultTemplateId;
+	List<String >? reportTemplateIds;
+	List<String >? userCodes;
+
+	OrganizationDefaultTemplate({
+		this.organizationCode,
+		this.defaultTemplateId,
+		this.reportTemplateIds,
+		this.userCodes,
+	});
+
+	factory OrganizationDefaultTemplate.fromJson(Map<String, dynamic> map) {
+		return OrganizationDefaultTemplate( 
+			organizationCode: map['OrganizationCode'],
+			defaultTemplateId: map['DefaultTemplateId'],
+			reportTemplateIds: map['ReportTemplateIds'] != null ? map['ReportTemplateIds'].cast<String>().toList() : null,
+			userCodes: map['UserCodes'] != null ? map['UserCodes'].cast<String>().toList() : null,
+		);
+	}
+
+	Map<String, dynamic> toJson() {
+		final map = Map<String, dynamic>();
+		if(organizationCode != null)
+			map['OrganizationCode'] = organizationCode;
+		if(defaultTemplateId != null)
+			map['DefaultTemplateId'] = defaultTemplateId;
+		if(reportTemplateIds != null)
+			map['ReportTemplateIds'] = reportTemplateIds;
+		if(userCodes != null)
+			map['UserCodes'] = userCodes;
+		return map;
+	}
+}
+
+class BatchModifyReportTemplateRequest extends TokenRequest{
+	List<ReportTemplateMigratoryInfo >? reportTemplateMigratorys;
+	List<OrganizationDefaultTemplate >? organizationDefaultTemplates;
+
+	BatchModifyReportTemplateRequest({
+		this.reportTemplateMigratorys,
+		this.organizationDefaultTemplates,
+		String? token,
+	}) : super(
+			token: token,
+		);
+
+	factory BatchModifyReportTemplateRequest.fromJson(Map<String, dynamic> map) {
+		return BatchModifyReportTemplateRequest( 
+			reportTemplateMigratorys: map['ReportTemplateMigratorys'] != null ? (map['ReportTemplateMigratorys'] as List).map((e)=>ReportTemplateMigratoryInfo.fromJson(e as Map<String,dynamic>)).toList() : null,
+			organizationDefaultTemplates: map['OrganizationDefaultTemplates'] != null ? (map['OrganizationDefaultTemplates'] as List).map((e)=>OrganizationDefaultTemplate.fromJson(e as Map<String,dynamic>)).toList() : null,
+			token: map['Token'],
+		);
+	}
+
+	Map<String, dynamic> toJson() {
+		final map = super.toJson();
+		if(reportTemplateMigratorys != null)
+			map['ReportTemplateMigratorys'] = reportTemplateMigratorys;
+		if(organizationDefaultTemplates != null)
+			map['OrganizationDefaultTemplates'] = organizationDefaultTemplates;
+		return map;
+	}
+}
+
 class UserGroupMigratoryInfo extends BaseDTO{
 	bool isDelete;
 	String? code;

lib/services/recordInfo.m.dart

@@ -527,6 +527,9 @@ class SimpleRecordInfoDTO extends BaseDTO{
 	String? rootOrganizationCode;
 	String? rootOrganizationName;
 	String? languge;
+	bool canCreateReport;
+	bool isCollecting;
+	bool canCollcetImg;
 
 	SimpleRecordInfoDTO({
 		this.recordCode,
@@ -542,6 +545,9 @@ class SimpleRecordInfoDTO extends BaseDTO{
 		this.rootOrganizationCode,
 		this.rootOrganizationName,
 		this.languge,
+		this.canCreateReport = false,
+		this.isCollecting = false,
+		this.canCollcetImg = false,
 		DateTime? createTime,
 		DateTime? updateTime,
 	}) : super(
@@ -564,6 +570,9 @@ class SimpleRecordInfoDTO extends BaseDTO{
 			rootOrganizationCode: map['RootOrganizationCode'],
 			rootOrganizationName: map['RootOrganizationName'],
 			languge: map['Languge'],
+			canCreateReport: map['CanCreateReport'],
+			isCollecting: map['IsCollecting'],
+			canCollcetImg: map['CanCollcetImg'],
 			createTime: map['CreateTime'] != null ? DateTime.parse(map['CreateTime']) : null,
 			updateTime: map['UpdateTime'] != null ? DateTime.parse(map['UpdateTime']) : null,
 		);
@@ -595,6 +604,9 @@ class SimpleRecordInfoDTO extends BaseDTO{
 			map['RootOrganizationName'] = rootOrganizationName;
 		if(languge != null)
 			map['Languge'] = languge;
+		map['CanCreateReport'] = canCreateReport;
+		map['IsCollecting'] = isCollecting;
+		map['CanCollcetImg'] = canCollcetImg;
 		return map;
 	}
 }
@@ -623,6 +635,7 @@ class FindRecordPagesRequest extends PageRequest{
 	String? keyWord;
 	DateTime? startTime;
 	DateTime? endTime;
+	String? patientCode;
 
 	FindRecordPagesRequest({
 		this.organizationCodes,
@@ -633,6 +646,7 @@ class FindRecordPagesRequest extends PageRequest{
 		this.keyWord,
 		this.startTime,
 		this.endTime,
+		this.patientCode,
 		int pageIndex = 0,
 		int pageSize = 0,
 		String? token,
@@ -652,6 +666,7 @@ class FindRecordPagesRequest extends PageRequest{
 			keyWord: map['KeyWord'],
 			startTime: map['StartTime'] != null ? DateTime.parse(map['StartTime']) : null,
 			endTime: map['EndTime'] != null ? DateTime.parse(map['EndTime']) : null,
+			patientCode: map['PatientCode'],
 			pageIndex: map['PageIndex'],
 			pageSize: map['PageSize'],
 			token: map['Token'],
@@ -674,6 +689,8 @@ class FindRecordPagesRequest extends PageRequest{
 			map['StartTime'] = JsonRpcUtils.dateFormat(startTime!);
 		if(endTime != null)
 			map['EndTime'] = JsonRpcUtils.dateFormat(endTime!);
+		if(patientCode != null)
+			map['PatientCode'] = patientCode;
 		return map;
 	}
 }

lib/services/remedical.m.dart

@@ -2597,6 +2597,7 @@ class ReportBaseDTO extends BaseDTO{
 	List<ReportPreviewDTO >? reportPreviewList;
 	String? referralRecordCode;
 	ReportTypeEnum reportType;
+	bool isReferral;
 
 	ReportBaseDTO({
 		this.reportCode,
@@ -2615,6 +2616,7 @@ class ReportBaseDTO extends BaseDTO{
 		this.reportPreviewList,
 		this.referralRecordCode,
 		this.reportType = ReportTypeEnum.RemoteDiagnosis,
+		this.isReferral = false,
 		DateTime? createTime,
 		DateTime? updateTime,
 	}) : super(
@@ -2640,6 +2642,7 @@ class ReportBaseDTO extends BaseDTO{
 			reportPreviewList: map['ReportPreviewList'] != null ? (map['ReportPreviewList'] as List).map((e)=>ReportPreviewDTO.fromJson(e as Map<String,dynamic>)).toList() : null,
 			referralRecordCode: map['ReferralRecordCode'],
 			reportType: ReportTypeEnum.values.firstWhere((e) => e.index == map['ReportType']),
+			isReferral: map['IsReferral'],
 			createTime: map['CreateTime'] != null ? DateTime.parse(map['CreateTime']) : null,
 			updateTime: map['UpdateTime'] != null ? DateTime.parse(map['UpdateTime']) : null,
 		);
@@ -2677,6 +2680,7 @@ class ReportBaseDTO extends BaseDTO{
 		if(referralRecordCode != null)
 			map['ReferralRecordCode'] = referralRecordCode;
 		map['ReportType'] = reportType.index;
+		map['IsReferral'] = isReferral;
 		return map;
 	}
 }
@@ -2714,6 +2718,7 @@ class ReportDTO extends ReportBaseDTO{
 		List<ReportPreviewDTO >? reportPreviewList,
 		String? referralRecordCode,
 		ReportTypeEnum reportType = ReportTypeEnum.RemoteDiagnosis,
+		bool isReferral = false,
 		DateTime? createTime,
 		DateTime? updateTime,
 	}) : super(
@@ -2733,6 +2738,7 @@ class ReportDTO extends ReportBaseDTO{
 			reportPreviewList: reportPreviewList,
 			referralRecordCode: referralRecordCode,
 			reportType: reportType,
+			isReferral: isReferral,
 			createTime: createTime,
 			updateTime: updateTime,
 		);
@@ -2762,6 +2768,7 @@ class ReportDTO extends ReportBaseDTO{
 			reportPreviewList: map['ReportPreviewList'] != null ? (map['ReportPreviewList'] as List).map((e)=>ReportPreviewDTO.fromJson(e as Map<String,dynamic>)).toList() : null,
 			referralRecordCode: map['ReferralRecordCode'],
 			reportType: ReportTypeEnum.values.firstWhere((e) => e.index == map['ReportType']),
+			isReferral: map['IsReferral'],
 			createTime: map['CreateTime'] != null ? DateTime.parse(map['CreateTime']) : null,
 			updateTime: map['UpdateTime'] != null ? DateTime.parse(map['UpdateTime']) : null,
 		);
@@ -3300,6 +3307,7 @@ class SyncUploadRemedicalDataRequest {
 	String? application;
 	RemedicalFileDataTypeEnum fileDataType;
 	ImageLocationDTO? imageLocation;
+	List<String >? organDiagnosisInfos;
 
 	SyncUploadRemedicalDataRequest({
 		this.code,
@@ -3316,6 +3324,7 @@ class SyncUploadRemedicalDataRequest {
 		this.application,
 		this.fileDataType = RemedicalFileDataTypeEnum.VinnoVidSingle,
 		this.imageLocation,
+		this.organDiagnosisInfos,
 	});
 
 	factory SyncUploadRemedicalDataRequest.fromJson(Map<String, dynamic> map) {
@@ -3334,6 +3343,7 @@ class SyncUploadRemedicalDataRequest {
 			application: map['Application'],
 			fileDataType: RemedicalFileDataTypeEnum.values.firstWhere((e) => e.index == map['FileDataType']),
 			imageLocation: map['ImageLocation'] != null ? ImageLocationDTO.fromJson(map['ImageLocation']) : null,
+			organDiagnosisInfos: map['OrganDiagnosisInfos'] != null ? map['OrganDiagnosisInfos'].cast<String>().toList() : null,
 		);
 	}
 
@@ -3365,6 +3375,8 @@ class SyncUploadRemedicalDataRequest {
 		map['FileDataType'] = fileDataType.index;
 		if(imageLocation != null)
 			map['ImageLocation'] = imageLocation;
+		if(organDiagnosisInfos != null)
+			map['OrganDiagnosisInfos'] = organDiagnosisInfos;
 		return map;
 	}
 }

lib/services/upgrade.dart

@@ -55,5 +55,10 @@ class UpgradeService extends JsonRpcClientBase {
 		return result;
 	}
 
+	Future<String> getFlyinsonoVersionAsync(GetFlyinsonoVersionRequest request) async {
+		var rpcRst = await call("GetFlyinsonoVersionAsync", request);
+		return rpcRst;
+	}
+
 }
 

lib/services/upgrade.m.dart

@@ -203,4 +203,32 @@ class GetUserListRequest extends TokenRequest{
 	}
 }
 
+enum CurrentClientSourceTypeEnum {
+	PC,
+	Web,
+	SONOPOST,
+	FISLib,
+	Android,
+}
+
+class GetFlyinsonoVersionRequest {
+	CurrentClientSourceTypeEnum currentClientType;
+
+	GetFlyinsonoVersionRequest({
+		this.currentClientType = CurrentClientSourceTypeEnum.PC,
+	});
+
+	factory GetFlyinsonoVersionRequest.fromJson(Map<String, dynamic> map) {
+		return GetFlyinsonoVersionRequest( 
+			currentClientType: CurrentClientSourceTypeEnum.values.firstWhere((e) => e.index == map['CurrentClientType']),
+		);
+	}
+
+	Map<String, dynamic> toJson() {
+		final map = Map<String, dynamic>();
+		map['CurrentClientType'] = currentClientType.index;
+		return map;
+	}
+}
+
 

lib/services/user.dart

@@ -169,11 +169,21 @@ class UserService extends JsonRpcClientBase {
 		return rpcRst;
 	}
 
+	Future<bool> batchUpdateUserOrganizationAsync(BatchInsertUserRequest request) async {
+		var rpcRst = await call("BatchUpdateUserOrganizationAsync", request);
+		return rpcRst;
+	}
+
 	Future<MigrateRecordDTO> queryMigrateTimeAsync(QueryMigrateTimeRequest request) async {
 		var rpcRst = await call("QueryMigrateTimeAsync", request);
 		var result = MigrateRecordDTO.fromJson(rpcRst as Map<String, dynamic>);
 		return result;
 	}
 
+	Future<bool> commonUserLogOffAsync(CommonLogOffRequest request) async {
+		var rpcRst = await call("CommonUserLogOffAsync", request);
+		return rpcRst;
+	}
+
 }
 

lib/services/user.m.dart

@@ -1315,4 +1315,39 @@ class QueryMigrateTimeRequest extends TokenRequest{
 	}
 }
 
+enum VerificationTypeEnum {
+	Password,
+	PhoneVerificationCode,
+	EmailVerificationCode,
+}
+
+class CommonLogOffRequest extends TokenRequest{
+	VerificationTypeEnum verificationType;
+	String? anyCode;
+
+	CommonLogOffRequest({
+		this.verificationType = VerificationTypeEnum.Password,
+		this.anyCode,
+		String? token,
+	}) : super(
+			token: token,
+		);
+
+	factory CommonLogOffRequest.fromJson(Map<String, dynamic> map) {
+		return CommonLogOffRequest( 
+			verificationType: VerificationTypeEnum.values.firstWhere((e) => e.index == map['VerificationType']),
+			anyCode: map['AnyCode'],
+			token: map['Token'],
+		);
+	}
+
+	Map<String, dynamic> toJson() {
+		final map = super.toJson();
+		map['VerificationType'] = verificationType.index;
+		if(anyCode != null)
+			map['AnyCode'] = anyCode;
+		return map;
+	}
+}
+