更新接口

lib/services/device.dart

@@ -23,12 +23,13 @@ class DeviceService extends JsonRpcClientBase {
 				) {
 		/// 注册响应实体反序列化处理器
 		FJsonConvert.setDecoder((map) => DevicePrinterParameterDTO.fromJson(map));
-		FJsonConvert.setDecoder((map) => DeviceInfoDTO.fromJson(map));
+		FJsonConvert.setDecoder((map) => PageCollection<DeviceExtendInfoDTO>.fromJson(map));
 		FJsonConvert.setDecoder((map) => DeviceExtendInfoDTO.fromJson(map));
+		FJsonConvert.setDecoder((map) => PageCollection<SelectItemDTO>.fromJson(map));
+		FJsonConvert.setDecoder((map) => SelectItemDTO.fromJson(map));
+		FJsonConvert.setDecoder((map) => DeviceInfoDTO.fromJson(map));
 		FJsonConvert.setDecoder((map) => PageCollection<DeviceInfoDTO>.fromJson(map));
 		FJsonConvert.setDecoder((map) => DictionaryDTO.fromJson(map));
-		FJsonConvert.setDecoder((map) => PageCollection<DeviceExtendInfoDTO>.fromJson(map));
-		FJsonConvert.setDecoder((map) => SelectItemDTO.fromJson(map));
 		FJsonConvert.setDecoder((map) => DeviceServerSettingResult.fromJson(map));
 		FJsonConvert.setDecoder((map) => DiagnosisModuleDTO.fromJson(map));
 		FJsonConvert.setDecoder((map) => ReportVideoDeviceInfoResult.fromJson(map));
@@ -71,6 +72,18 @@ class DeviceService extends JsonRpcClientBase {
 		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>);
+		return result;
+	}
+
+	Future<PageCollection<SelectItemDTO>> getPersonDeviceDropdownPageAsync(GetPersonDeviceDropdownPageRequest request) async {
+		var rpcRst = await call("GetPersonDeviceDropdownPageAsync", request);
+		var result = PageCollection<SelectItemDTO>.fromJson(rpcRst as Map<String, dynamic>);
+		return result;
+	}
+
 	Future<bool> heartRateAsync(TokenRequest request) async {
 		var rpcRst = await call("HeartRateAsync", request);
 		return rpcRst;

lib/services/device.m.dart

@@ -135,92 +135,6 @@ class MigrateDevicePrinterRequest extends TokenRequest{
 	}
 }
 
-class UploadDeviceDTO extends BaseDTO{
-	String? serialNumber;
-	String? deviceModel;
-	String? deviceType;
-	String? deviceSoftwareVersion;
-	String? sDKSoftwareVersion;
-
-	UploadDeviceDTO({
-		this.serialNumber,
-		this.deviceModel,
-		this.deviceType,
-		this.deviceSoftwareVersion,
-		this.sDKSoftwareVersion,
-		DateTime? createTime,
-		DateTime? updateTime,
-	}) : super(
-			createTime: createTime,
-			updateTime: updateTime,
-		);
-
-	factory UploadDeviceDTO.fromJson(Map<String, dynamic> map) {
-		return UploadDeviceDTO( 
-			serialNumber: map['SerialNumber'],
-			deviceModel: map['DeviceModel'],
-			deviceType: map['DeviceType'],
-			deviceSoftwareVersion: map['DeviceSoftwareVersion'],
-			sDKSoftwareVersion: map['SDKSoftwareVersion'],
-			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(serialNumber != null)
-			map['SerialNumber'] = serialNumber;
-		if(deviceModel != null)
-			map['DeviceModel'] = deviceModel;
-		if(deviceType != null)
-			map['DeviceType'] = deviceType;
-		if(deviceSoftwareVersion != null)
-			map['DeviceSoftwareVersion'] = deviceSoftwareVersion;
-		if(sDKSoftwareVersion != null)
-			map['SDKSoftwareVersion'] = sDKSoftwareVersion;
-		return map;
-	}
-}
-
-class CreateDeviceRequest extends UploadDeviceDTO{
-
-	CreateDeviceRequest({
-		String? serialNumber,
-		String? deviceModel,
-		String? deviceType,
-		String? deviceSoftwareVersion,
-		String? sDKSoftwareVersion,
-		DateTime? createTime,
-		DateTime? updateTime,
-	}) : super(
-			serialNumber: serialNumber,
-			deviceModel: deviceModel,
-			deviceType: deviceType,
-			deviceSoftwareVersion: deviceSoftwareVersion,
-			sDKSoftwareVersion: sDKSoftwareVersion,
-			createTime: createTime,
-			updateTime: updateTime,
-		);
-
-	factory CreateDeviceRequest.fromJson(Map<String, dynamic> map) {
-		return CreateDeviceRequest( 
-			serialNumber: map['SerialNumber'],
-			deviceModel: map['DeviceModel'],
-			deviceType: map['DeviceType'],
-			deviceSoftwareVersion: map['DeviceSoftwareVersion'],
-			sDKSoftwareVersion: map['SDKSoftwareVersion'],
-			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();
-		return map;
-	}
-}
-
 class DictionaryLanguageConfigDTO {
 	String? language;
 	String? value;
@@ -396,6 +310,243 @@ class DeviceExtendInfoDTO extends DeviceInfoDTO{
 	}
 }
 
+class PageCollection<T> {
+	int currentPage;
+	int pageSize;
+	int dataCount;
+	List<T>? pageData;
+
+	PageCollection({
+		this.currentPage = 0,
+		this.pageSize = 0,
+		this.dataCount = 0,
+		this.pageData,
+	});
+
+	factory PageCollection.fromJson(Map<String, dynamic> map) {
+		List<T> pageDataList = [];
+		if (map['PageData'] != null) {
+			pageDataList.addAll(
+					(map['PageData'] as List).map((e) => FJsonConvert.fromJson<T>(e)!));
+		}
+		return PageCollection( 
+			currentPage: map['CurrentPage'],
+			pageSize: map['PageSize'],
+			dataCount: map['DataCount'],
+			pageData: pageDataList,
+		);
+	}
+
+	Map<String, dynamic> toJson() {
+		final map = Map<String, dynamic>();
+		map['CurrentPage'] = currentPage;
+		map['PageSize'] = pageSize;
+		map['DataCount'] = dataCount;
+		if(pageData != null)
+			map['PageData'] = pageData;
+		return map;
+	}
+}
+
+class GetPersonDeviceRequest extends PageRequest{
+	String? keyWord;
+	String? deviceType;
+	String? deviceModel;
+	String? organizationCode;
+	bool? isOnline;
+
+	GetPersonDeviceRequest({
+		this.keyWord,
+		this.deviceType,
+		this.deviceModel,
+		this.organizationCode,
+		this.isOnline,
+		int pageIndex = 0,
+		int pageSize = 0,
+		String? token,
+	}) : super(
+			pageIndex: pageIndex,
+			pageSize: pageSize,
+			token: token,
+		);
+
+	factory GetPersonDeviceRequest.fromJson(Map<String, dynamic> map) {
+		return GetPersonDeviceRequest( 
+			keyWord: map['KeyWord'],
+			deviceType: map['DeviceType'],
+			deviceModel: map['DeviceModel'],
+			organizationCode: map['OrganizationCode'],
+			isOnline: map['IsOnline'],
+			pageIndex: map['PageIndex'],
+			pageSize: map['PageSize'],
+			token: map['Token'],
+		);
+	}
+
+	Map<String, dynamic> toJson() {
+		final map = super.toJson();
+		if(keyWord != null)
+			map['KeyWord'] = keyWord;
+		if(deviceType != null)
+			map['DeviceType'] = deviceType;
+		if(deviceModel != null)
+			map['DeviceModel'] = deviceModel;
+		if(organizationCode != null)
+			map['OrganizationCode'] = organizationCode;
+		if(isOnline != null)
+			map['IsOnline'] = isOnline;
+		return map;
+	}
+}
+
+class SelectItemDTO {
+	String? key;
+	String? value;
+
+	SelectItemDTO({
+		this.key,
+		this.value,
+	});
+
+	factory SelectItemDTO.fromJson(Map<String, dynamic> map) {
+		return SelectItemDTO( 
+			key: map['Key'],
+			value: map['Value'],
+		);
+	}
+
+	Map<String, dynamic> toJson() {
+		final map = Map<String, dynamic>();
+		if(key != null)
+			map['Key'] = key;
+		if(value != null)
+			map['Value'] = value;
+		return map;
+	}
+}
+
+class GetPersonDeviceDropdownPageRequest extends PageRequest{
+	String? keyWord;
+	List<String >? restrictOrgCodes;
+
+	GetPersonDeviceDropdownPageRequest({
+		this.keyWord,
+		this.restrictOrgCodes,
+		int pageIndex = 0,
+		int pageSize = 0,
+		String? token,
+	}) : super(
+			pageIndex: pageIndex,
+			pageSize: pageSize,
+			token: token,
+		);
+
+	factory GetPersonDeviceDropdownPageRequest.fromJson(Map<String, dynamic> map) {
+		return GetPersonDeviceDropdownPageRequest( 
+			keyWord: map['KeyWord'],
+			restrictOrgCodes: map['RestrictOrgCodes'] != null ? map['RestrictOrgCodes'].cast<String>().toList() : null,
+			pageIndex: map['PageIndex'],
+			pageSize: map['PageSize'],
+			token: map['Token'],
+		);
+	}
+
+	Map<String, dynamic> toJson() {
+		final map = super.toJson();
+		if(keyWord != null)
+			map['KeyWord'] = keyWord;
+		if(restrictOrgCodes != null)
+			map['RestrictOrgCodes'] = restrictOrgCodes;
+		return map;
+	}
+}
+
+class UploadDeviceDTO extends BaseDTO{
+	String? serialNumber;
+	String? deviceModel;
+	String? deviceType;
+	String? deviceSoftwareVersion;
+	String? sDKSoftwareVersion;
+
+	UploadDeviceDTO({
+		this.serialNumber,
+		this.deviceModel,
+		this.deviceType,
+		this.deviceSoftwareVersion,
+		this.sDKSoftwareVersion,
+		DateTime? createTime,
+		DateTime? updateTime,
+	}) : super(
+			createTime: createTime,
+			updateTime: updateTime,
+		);
+
+	factory UploadDeviceDTO.fromJson(Map<String, dynamic> map) {
+		return UploadDeviceDTO( 
+			serialNumber: map['SerialNumber'],
+			deviceModel: map['DeviceModel'],
+			deviceType: map['DeviceType'],
+			deviceSoftwareVersion: map['DeviceSoftwareVersion'],
+			sDKSoftwareVersion: map['SDKSoftwareVersion'],
+			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(serialNumber != null)
+			map['SerialNumber'] = serialNumber;
+		if(deviceModel != null)
+			map['DeviceModel'] = deviceModel;
+		if(deviceType != null)
+			map['DeviceType'] = deviceType;
+		if(deviceSoftwareVersion != null)
+			map['DeviceSoftwareVersion'] = deviceSoftwareVersion;
+		if(sDKSoftwareVersion != null)
+			map['SDKSoftwareVersion'] = sDKSoftwareVersion;
+		return map;
+	}
+}
+
+class CreateDeviceRequest extends UploadDeviceDTO{
+
+	CreateDeviceRequest({
+		String? serialNumber,
+		String? deviceModel,
+		String? deviceType,
+		String? deviceSoftwareVersion,
+		String? sDKSoftwareVersion,
+		DateTime? createTime,
+		DateTime? updateTime,
+	}) : super(
+			serialNumber: serialNumber,
+			deviceModel: deviceModel,
+			deviceType: deviceType,
+			deviceSoftwareVersion: deviceSoftwareVersion,
+			sDKSoftwareVersion: sDKSoftwareVersion,
+			createTime: createTime,
+			updateTime: updateTime,
+		);
+
+	factory CreateDeviceRequest.fromJson(Map<String, dynamic> map) {
+		return CreateDeviceRequest( 
+			serialNumber: map['SerialNumber'],
+			deviceModel: map['DeviceModel'],
+			deviceType: map['DeviceType'],
+			deviceSoftwareVersion: map['DeviceSoftwareVersion'],
+			sDKSoftwareVersion: map['SDKSoftwareVersion'],
+			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();
+		return map;
+	}
+}
+
 class GetDeviceRequest extends TokenRequest{
 	String? deviceCode;
 	bool isNeedSyn;
@@ -450,44 +601,6 @@ class GetDeviceByShortCodeRequest extends TokenRequest{
 	}
 }
 
-class PageCollection<T> {
-	int currentPage;
-	int pageSize;
-	int dataCount;
-	List<T>? pageData;
-
-	PageCollection({
-		this.currentPage = 0,
-		this.pageSize = 0,
-		this.dataCount = 0,
-		this.pageData,
-	});
-
-	factory PageCollection.fromJson(Map<String, dynamic> map) {
-		List<T> pageDataList = [];
-		if (map['PageData'] != null) {
-			pageDataList.addAll(
-					(map['PageData'] as List).map((e) => FJsonConvert.fromJson<T>(e)!));
-		}
-		return PageCollection( 
-			currentPage: map['CurrentPage'],
-			pageSize: map['PageSize'],
-			dataCount: map['DataCount'],
-			pageData: pageDataList,
-		);
-	}
-
-	Map<String, dynamic> toJson() {
-		final map = Map<String, dynamic>();
-		map['CurrentPage'] = currentPage;
-		map['PageSize'] = pageSize;
-		map['DataCount'] = dataCount;
-		if(pageData != null)
-			map['PageData'] = pageData;
-		return map;
-	}
-}
-
 class PageFilterRequest extends BaseRequest{
 	int currentPage;
 	int pageSize;
@@ -864,52 +977,6 @@ class RemoveDeviceRelevancyRequest extends TokenRequest{
 	}
 }
 
-class GetPersonDeviceRequest extends PageRequest{
-	String? keyWord;
-	String? deviceType;
-	String? deviceModel;
-	bool? isOnline;
-
-	GetPersonDeviceRequest({
-		this.keyWord,
-		this.deviceType,
-		this.deviceModel,
-		this.isOnline,
-		int pageIndex = 0,
-		int pageSize = 0,
-		String? token,
-	}) : super(
-			pageIndex: pageIndex,
-			pageSize: pageSize,
-			token: token,
-		);
-
-	factory GetPersonDeviceRequest.fromJson(Map<String, dynamic> map) {
-		return GetPersonDeviceRequest( 
-			keyWord: map['KeyWord'],
-			deviceType: map['DeviceType'],
-			deviceModel: map['DeviceModel'],
-			isOnline: map['IsOnline'],
-			pageIndex: map['PageIndex'],
-			pageSize: map['PageSize'],
-			token: map['Token'],
-		);
-	}
-
-	Map<String, dynamic> toJson() {
-		final map = super.toJson();
-		if(keyWord != null)
-			map['KeyWord'] = keyWord;
-		if(deviceType != null)
-			map['DeviceType'] = deviceType;
-		if(deviceModel != null)
-			map['DeviceModel'] = deviceModel;
-		if(isOnline != null)
-			map['IsOnline'] = isOnline;
-		return map;
-	}
-}
-
 class GetPersonRoleDeviceRequest extends PageRequest{
 	String? keyWord;
 	String? deviceType;
@@ -976,32 +1043,6 @@ class FindDevicesByOrganizationCodeRequest extends TokenRequest{
 	}
 }
 
-class SelectItemDTO {
-	String? key;
-	String? value;
-
-	SelectItemDTO({
-		this.key,
-		this.value,
-	});
-
-	factory SelectItemDTO.fromJson(Map<String, dynamic> map) {
-		return SelectItemDTO( 
-			key: map['Key'],
-			value: map['Value'],
-		);
-	}
-
-	Map<String, dynamic> toJson() {
-		final map = Map<String, dynamic>();
-		if(key != null)
-			map['Key'] = key;
-		if(value != null)
-			map['Value'] = value;
-		return map;
-	}
-}
-
 class DeviceServerSettingResult {
 	Map<String,String>? serverConfigList;
 	bool isUploadThumbnail;

lib/services/liveConsultation.m.dart

@@ -2092,6 +2092,8 @@ class ClientPatientInfoBaseDTO extends BaseDTO{
 	int unReadRecordCount;
 	bool isReferral;
 	List<String >? devicePatientIDs;
+	String? organizationCode;
+	String? organizationName;
 
 	ClientPatientInfoBaseDTO({
 		this.patientCode,
@@ -2100,6 +2102,8 @@ class ClientPatientInfoBaseDTO extends BaseDTO{
 		this.unReadRecordCount = 0,
 		this.isReferral = false,
 		this.devicePatientIDs,
+		this.organizationCode,
+		this.organizationName,
 		DateTime? createTime,
 		DateTime? updateTime,
 	}) : super(
@@ -2115,6 +2119,8 @@ class ClientPatientInfoBaseDTO extends BaseDTO{
 			unReadRecordCount: map['UnReadRecordCount'],
 			isReferral: map['IsReferral'],
 			devicePatientIDs: map['DevicePatientIDs'] != null ? map['DevicePatientIDs'].cast<String>().toList() : null,
+			organizationCode: map['OrganizationCode'],
+			organizationName: map['OrganizationName'],
 			createTime: map['CreateTime'] != null ? DateTime.parse(map['CreateTime']) : null,
 			updateTime: map['UpdateTime'] != null ? DateTime.parse(map['UpdateTime']) : null,
 		);
@@ -2131,6 +2137,10 @@ class ClientPatientInfoBaseDTO extends BaseDTO{
 		map['IsReferral'] = isReferral;
 		if(devicePatientIDs != null)
 			map['DevicePatientIDs'] = devicePatientIDs;
+		if(organizationCode != null)
+			map['OrganizationCode'] = organizationCode;
+		if(organizationName != null)
+			map['OrganizationName'] = organizationName;
 		return map;
 	}
 }

lib/services/organization.dart

@@ -6,6 +6,7 @@ import 'package:fis_common/json_convert.dart';
 import 'organization.m.dart';
 
 import 'liveConsultation.m.dart';
+import 'device.m.dart';
 
 
 class OrganizationService extends JsonRpcClientBase {
@@ -28,6 +29,8 @@ class OrganizationService extends JsonRpcClientBase {
 		FJsonConvert.setDecoder((map) => OrganizationSettingResult.fromJson(map));
 		FJsonConvert.setDecoder((map) => ServerSettingResult.fromJson(map));
 		FJsonConvert.setDecoder((map) => LangugeDataResult.fromJson(map));
+		FJsonConvert.setDecoder((map) => PageCollection<OrganizationSimplifyDTO>.fromJson(map));
+		FJsonConvert.setDecoder((map) => OrganizationSimplifyDTO.fromJson(map));
 	}
 
 	Future<List<OrganizationDTO>> searchOrganizationsAsync(SearchOrganizationsRequest request) async {
@@ -104,5 +107,11 @@ class OrganizationService extends JsonRpcClientBase {
 		return result;
 	}
 
+	Future<PageCollection<OrganizationSimplifyDTO>> getOrganizationByUserAndDevicesAsync(GetOrganizationByUserAndDevicesRequest request) async {
+		var rpcRst = await call("GetOrganizationByUserAndDevicesAsync", request);
+		var result = PageCollection<OrganizationSimplifyDTO>.fromJson(rpcRst as Map<String, dynamic>);
+		return result;
+	}
+
 }
 

lib/services/organization.m.dart

@@ -1,5 +1,6 @@
 import 'notification.m.dart';
 import 'liveConsultation.m.dart';
+import 'device.m.dart';
 
 class SettingDTOClass {
 	String? langugeKey;
@@ -909,4 +910,65 @@ class LangugeDataRequest extends TokenRequest{
 	}
 }
 
+class OrganizationSimplifyDTO {
+	String? organizationCode;
+	String? organizationName;
+
+	OrganizationSimplifyDTO({
+		this.organizationCode,
+		this.organizationName,
+	});
+
+	factory OrganizationSimplifyDTO.fromJson(Map<String, dynamic> map) {
+		return OrganizationSimplifyDTO( 
+			organizationCode: map['OrganizationCode'],
+			organizationName: map['OrganizationName'],
+		);
+	}
+
+	Map<String, dynamic> toJson() {
+		final map = Map<String, dynamic>();
+		if(organizationCode != null)
+			map['OrganizationCode'] = organizationCode;
+		if(organizationName != null)
+			map['OrganizationName'] = organizationName;
+		return map;
+	}
+}
+
+class GetOrganizationByUserAndDevicesRequest extends PageRequest{
+	String? keyword;
+	bool onlyOrganization;
+
+	GetOrganizationByUserAndDevicesRequest({
+		this.keyword,
+		this.onlyOrganization = false,
+		int pageIndex = 0,
+		int pageSize = 0,
+		String? token,
+	}) : super(
+			pageIndex: pageIndex,
+			pageSize: pageSize,
+			token: token,
+		);
+
+	factory GetOrganizationByUserAndDevicesRequest.fromJson(Map<String, dynamic> map) {
+		return GetOrganizationByUserAndDevicesRequest( 
+			keyword: map['Keyword'],
+			onlyOrganization: map['OnlyOrganization'],
+			pageIndex: map['PageIndex'],
+			pageSize: map['PageSize'],
+			token: map['Token'],
+		);
+	}
+
+	Map<String, dynamic> toJson() {
+		final map = super.toJson();
+		if(keyword != null)
+			map['Keyword'] = keyword;
+		map['OnlyOrganization'] = onlyOrganization;
+		return map;
+	}
+}
+
 

lib/services/patient.m.dart

@@ -327,12 +327,16 @@ class FindPatientsPageRequest extends PageRequest{
 	DateTime? startTime;
 	DateTime? endTime;
 	PatientValidStatusEnum isValid;
+	List<String >? organizationCodes;
+	List<String >? deviceCodes;
 
 	FindPatientsPageRequest({
 		this.keyWord,
 		this.startTime,
 		this.endTime,
 		this.isValid = PatientValidStatusEnum.All,
+		this.organizationCodes,
+		this.deviceCodes,
 		int pageIndex = 0,
 		int pageSize = 0,
 		String? token,
@@ -348,6 +352,8 @@ class FindPatientsPageRequest extends PageRequest{
 			startTime: map['StartTime'] != null ? DateTime.parse(map['StartTime']) : null,
 			endTime: map['EndTime'] != null ? DateTime.parse(map['EndTime']) : null,
 			isValid: PatientValidStatusEnum.values.firstWhere((e) => e.index == map['IsValid']),
+			organizationCodes: map['OrganizationCodes'] != null ? map['OrganizationCodes'].cast<String>().toList() : null,
+			deviceCodes: map['DeviceCodes'] != null ? map['DeviceCodes'].cast<String>().toList() : null,
 			pageIndex: map['PageIndex'],
 			pageSize: map['PageSize'],
 			token: map['Token'],
@@ -363,6 +369,10 @@ class FindPatientsPageRequest extends PageRequest{
 		if(endTime != null)
 			map['EndTime'] = JsonRpcUtils.dateFormat(endTime!);
 		map['IsValid'] = isValid.index;
+		if(organizationCodes != null)
+			map['OrganizationCodes'] = organizationCodes;
+		if(deviceCodes != null)
+			map['DeviceCodes'] = deviceCodes;
 		return map;
 	}
 }
@@ -541,6 +551,8 @@ class ClientPatientInfoDTO extends ClientPatientInfoBaseDTO{
 		int unReadRecordCount = 0,
 		bool isReferral = false,
 		List<String >? devicePatientIDs,
+		String? organizationCode,
+		String? organizationName,
 		DateTime? createTime,
 		DateTime? updateTime,
 	}) : super(
@@ -550,6 +562,8 @@ class ClientPatientInfoDTO extends ClientPatientInfoBaseDTO{
 			unReadRecordCount: unReadRecordCount,
 			isReferral: isReferral,
 			devicePatientIDs: devicePatientIDs,
+			organizationCode: organizationCode,
+			organizationName: organizationName,
 			createTime: createTime,
 			updateTime: updateTime,
 		);
@@ -568,6 +582,8 @@ class ClientPatientInfoDTO extends ClientPatientInfoBaseDTO{
 			unReadRecordCount: map['UnReadRecordCount'],
 			isReferral: map['IsReferral'],
 			devicePatientIDs: map['DevicePatientIDs'] != null ? map['DevicePatientIDs'].cast<String>().toList() : null,
+			organizationCode: map['OrganizationCode'],
+			organizationName: map['OrganizationName'],
 			createTime: map['CreateTime'] != null ? DateTime.parse(map['CreateTime']) : null,
 			updateTime: map['UpdateTime'] != null ? DateTime.parse(map['UpdateTime']) : null,
 		);

lib/services/remedical.m.dart

@@ -2051,6 +2051,8 @@ class QueryReferralRecordPageDTO extends ClientPatientInfoBaseDTO{
 		int unReadRecordCount = 0,
 		bool isReferral = false,
 		List<String >? devicePatientIDs,
+		String? organizationCode,
+		String? organizationName,
 		DateTime? createTime,
 		DateTime? updateTime,
 	}) : super(
@@ -2060,6 +2062,8 @@ class QueryReferralRecordPageDTO extends ClientPatientInfoBaseDTO{
 			unReadRecordCount: unReadRecordCount,
 			isReferral: isReferral,
 			devicePatientIDs: devicePatientIDs,
+			organizationCode: organizationCode,
+			organizationName: organizationName,
 			createTime: createTime,
 			updateTime: updateTime,
 		);
@@ -2075,6 +2079,8 @@ class QueryReferralRecordPageDTO extends ClientPatientInfoBaseDTO{
 			unReadRecordCount: map['UnReadRecordCount'],
 			isReferral: map['IsReferral'],
 			devicePatientIDs: map['DevicePatientIDs'] != null ? map['DevicePatientIDs'].cast<String>().toList() : null,
+			organizationCode: map['OrganizationCode'],
+			organizationName: map['OrganizationName'],
 			createTime: map['CreateTime'] != null ? DateTime.parse(map['CreateTime']) : null,
 			updateTime: map['UpdateTime'] != null ? DateTime.parse(map['UpdateTime']) : null,
 		);

lib/services/report.m.dart

@@ -661,12 +661,14 @@ class AddReportTemplateRequest extends TokenRequest{
 	String? reportTemplateJson;
 	String? reportDatasJson;
 	ReportTemplateTypeEnum reportTemplateType;
+	String? languageCode;
 
 	AddReportTemplateRequest({
 		this.reportTemplateName,
 		this.reportTemplateJson,
 		this.reportDatasJson,
 		this.reportTemplateType = ReportTemplateTypeEnum.Default,
+		this.languageCode,
 		String? token,
 	}) : super(
 			token: token,
@@ -678,6 +680,7 @@ class AddReportTemplateRequest extends TokenRequest{
 			reportTemplateJson: map['ReportTemplateJson'],
 			reportDatasJson: map['ReportDatasJson'],
 			reportTemplateType: ReportTemplateTypeEnum.values.firstWhere((e) => e.index == map['ReportTemplateType']),
+			languageCode: map['LanguageCode'],
 			token: map['Token'],
 		);
 	}
@@ -691,6 +694,8 @@ class AddReportTemplateRequest extends TokenRequest{
 		if(reportDatasJson != null)
 			map['ReportDatasJson'] = reportDatasJson;
 		map['ReportTemplateType'] = reportTemplateType.index;
+		if(languageCode != null)
+			map['LanguageCode'] = languageCode;
 		return map;
 	}
 }

lib/services/storage.dart

@@ -44,5 +44,11 @@ class StorageService extends JsonRpcClientBase {
 		return rpcRst;
 	}
 
+	Future<List<String>> copyToOtherNodeAysnc(CopyToOtherNodeRequest request) async {
+		var rpcRst = await call("CopyToOtherNodeAysnc", request);
+		var result = (rpcRst as List).cast<String>().toList();
+		return result;
+	}
+
 }
 

lib/services/storage.m.dart

@@ -160,4 +160,34 @@ class CheckFileIsExistRequest {
 	}
 }
 
+class CopyToOtherNodeRequest extends TokenRequest{
+	String? fileName;
+	String? fileUrl;
+
+	CopyToOtherNodeRequest({
+		this.fileName,
+		this.fileUrl,
+		String? token,
+	}) : super(
+			token: token,
+		);
+
+	factory CopyToOtherNodeRequest.fromJson(Map<String, dynamic> map) {
+		return CopyToOtherNodeRequest( 
+			fileName: map['FileName'],
+			fileUrl: map['FileUrl'],
+			token: map['Token'],
+		);
+	}
+
+	Map<String, dynamic> toJson() {
+		final map = super.toJson();
+		if(fileName != null)
+			map['FileName'] = fileName;
+		if(fileUrl != null)
+			map['FileUrl'] = fileUrl;
+		return map;
+	}
+}
+