同步Server最新更改

lib/services/authentication.m.dart

@@ -977,10 +977,10 @@ enum CustomerRpcCode {
 	placeHolder_797,
 	placeHolder_798,
 	placeHolder_799,
+	LiveConsultationNotFound,
+	LiveConsultationClosed,
 	ConsultationStatusError,
-	placeHolder_801,
-	placeHolder_802,
-	placeHolder_803,
+	ConsultationNorightError,
 	placeHolder_804,
 	placeHolder_805,
 	placeHolder_806,

lib/services/index.dart

@@ -30,7 +30,6 @@ export 'device.m.dart';
 export 'fileTransfer.m.dart';
 export 'identityApply.m.dart';
 export 'login.m.dart';
-export 'notification.m.dart';
 export 'organization.m.dart';
 export 'patient.m.dart';
 export 'platform.m.dart';

lib/services/notification.dart

@@ -2,7 +2,6 @@ import 'dart:core';
 
 import 'package:fis_jsonrpc/client_base.dart';
 
-import 'notification.m.dart';
 
 
 class NotificationService extends JsonRpcClientBase {
@@ -18,30 +17,5 @@ class NotificationService extends JsonRpcClientBase {
 						timeout: timeout,
 				);
 
-	Future<bool> sendMessageAsync(SendNotificationRequest request) async {
-		var rpcRst = await call("SendMessageAsync", request);
-		return rpcRst;
-	}
-
-	Future<bool> postMessageAsync(SendNotificationRequest request) async {
-		var rpcRst = await call("PostMessageAsync", request);
-		return rpcRst;
-	}
-
-	Future<bool> broadcastMessageAsync(BroadcastNotificationRequest request) async {
-		var rpcRst = await call("BroadcastMessageAsync", request);
-		return rpcRst;
-	}
-
-	Future<String> openNotifyQueueAsync(OpenNotifyQueueRequest request) async {
-		var rpcRst = await call("OpenNotifyQueueAsync", request);
-		return rpcRst;
-	}
-
-	Future<bool> closeNotifyQueueAsync(CloseNotifyQueueRequest request) async {
-		var rpcRst = await call("CloseNotifyQueueAsync", request);
-		return rpcRst;
-	}
-
 }
 

lib/services/report.dart

@@ -191,16 +191,6 @@ class ReportService extends JsonRpcClientBase {
 		return rpcRst;
 	}
 
-	Future<bool> updateThesaurusUserCodeAsync(UpdateThesaurusUserCodeRequest request) async {
-		var rpcRst = await call("UpdateThesaurusUserCodeAsync", request);
-		return rpcRst;
-	}
-
-	Future<bool> deleteThesaurusUserCodeAsync(DeleteThesaurusUserCodeRequest request) async {
-		var rpcRst = await call("DeleteThesaurusUserCodeAsync", request);
-		return rpcRst;
-	}
-
 	Future<PageResult<ThesaurusDTO>> getThesaurusPageAsync(GetThesaurusPageRequest request) async {
 		var rpcRst = await call("GetThesaurusPageAsync", request);
 		var result = PageResult<ThesaurusDTO>.fromJson(rpcRst as Map<String, dynamic>);

lib/services/report.m.dart

@@ -6,7 +6,6 @@ import 'authentication.m.dart';
 enum ReportTemplateStatusTypeEnum {
 	Unpublished,
 	Published,
-	Referenced,
 }
 
 enum ReportTemplateTypeEnum {
@@ -29,7 +28,7 @@ class ReportTemplateDTO {
 	String? organizationCode;
 	String? personalCode;
 	String? reportTemplateJson;
-	List<String >? reportTemplateUser;
+	String? referenceReportTemplateCode;
 	bool isDefault;
 	bool isUserDefault;
 	String? reportDatasJson;
@@ -45,7 +44,7 @@ class ReportTemplateDTO {
 		this.organizationCode,
 		this.personalCode,
 		this.reportTemplateJson,
-		this.reportTemplateUser,
+		this.referenceReportTemplateCode,
 		this.isDefault = false,
 		this.isUserDefault = false,
 		this.reportDatasJson,
@@ -63,7 +62,7 @@ class ReportTemplateDTO {
 			organizationCode: map['OrganizationCode'],
 			personalCode: map['PersonalCode'],
 			reportTemplateJson: map['ReportTemplateJson'],
-			reportTemplateUser: map['ReportTemplateUser'] != null ? map['ReportTemplateUser'].cast<String>().toList() : null,
+			referenceReportTemplateCode: map['ReferenceReportTemplateCode'],
 			isDefault: map['IsDefault'],
 			isUserDefault: map['IsUserDefault'],
 			reportDatasJson: map['ReportDatasJson'],
@@ -87,8 +86,8 @@ class ReportTemplateDTO {
 			map['PersonalCode'] = personalCode;
 		if(reportTemplateJson != null)
 			map['ReportTemplateJson'] = reportTemplateJson;
-		if(reportTemplateUser != null)
-			map['ReportTemplateUser'] = reportTemplateUser;
+		if(referenceReportTemplateCode != null)
+			map['ReferenceReportTemplateCode'] = referenceReportTemplateCode;
 		map['IsDefault'] = isDefault;
 		map['IsUserDefault'] = isUserDefault;
 		if(reportDatasJson != null)
@@ -103,9 +102,11 @@ class ReportTemplateDTO {
 
 class FindReportTemplateByCodeRequest extends TokenRequest{
 	String? reportTemplateCode;
+	String? languageCode;
 
 	FindReportTemplateByCodeRequest({
 		this.reportTemplateCode,
+		this.languageCode,
 		String? token,
 	}) : super(
 			token: token,
@@ -114,6 +115,7 @@ class FindReportTemplateByCodeRequest extends TokenRequest{
 	factory FindReportTemplateByCodeRequest.fromJson(Map<String, dynamic> map) {
 		return FindReportTemplateByCodeRequest( 
 			reportTemplateCode: map['ReportTemplateCode'],
+			languageCode: map['LanguageCode'],
 			token: map['Token'],
 		);
 	}
@@ -122,6 +124,8 @@ class FindReportTemplateByCodeRequest extends TokenRequest{
 		final map = super.toJson();
 		if(reportTemplateCode != null)
 			map['ReportTemplateCode'] = reportTemplateCode;
+		if(languageCode != null)
+			map['LanguageCode'] = languageCode;
 		return map;
 	}
 }
@@ -663,11 +667,13 @@ class UpdateReportTemplateRequest extends TokenRequest{
 	String? reportTemplateCode;
 	String? reportTemplateName;
 	String? reportTemplateJson;
+	String? reportDatasJson;
 
 	UpdateReportTemplateRequest({
 		this.reportTemplateCode,
 		this.reportTemplateName,
 		this.reportTemplateJson,
+		this.reportDatasJson,
 		String? token,
 	}) : super(
 			token: token,
@@ -678,6 +684,7 @@ class UpdateReportTemplateRequest extends TokenRequest{
 			reportTemplateCode: map['ReportTemplateCode'],
 			reportTemplateName: map['ReportTemplateName'],
 			reportTemplateJson: map['ReportTemplateJson'],
+			reportDatasJson: map['ReportDatasJson'],
 			token: map['Token'],
 		);
 	}
@@ -690,6 +697,8 @@ class UpdateReportTemplateRequest extends TokenRequest{
 			map['ReportTemplateName'] = reportTemplateName;
 		if(reportTemplateJson != null)
 			map['ReportTemplateJson'] = reportTemplateJson;
+		if(reportDatasJson != null)
+			map['ReportDatasJson'] = reportDatasJson;
 		return map;
 	}
 }
@@ -989,56 +998,6 @@ class RemoveThesaurusItemRequest extends TokenRequest{
 	}
 }
 
-class UpdateThesaurusUserCodeRequest extends TokenRequest{
-	String? thesaurusCode;
-
-	UpdateThesaurusUserCodeRequest({
-		this.thesaurusCode,
-		String? token,
-	}) : super(
-			token: token,
-		);
-
-	factory UpdateThesaurusUserCodeRequest.fromJson(Map<String, dynamic> map) {
-		return UpdateThesaurusUserCodeRequest( 
-			thesaurusCode: map['ThesaurusCode'],
-			token: map['Token'],
-		);
-	}
-
-	Map<String, dynamic> toJson() {
-		final map = super.toJson();
-		if(thesaurusCode != null)
-			map['ThesaurusCode'] = thesaurusCode;
-		return map;
-	}
-}
-
-class DeleteThesaurusUserCodeRequest extends TokenRequest{
-	String? thesaurusCode;
-
-	DeleteThesaurusUserCodeRequest({
-		this.thesaurusCode,
-		String? token,
-	}) : super(
-			token: token,
-		);
-
-	factory DeleteThesaurusUserCodeRequest.fromJson(Map<String, dynamic> map) {
-		return DeleteThesaurusUserCodeRequest( 
-			thesaurusCode: map['ThesaurusCode'],
-			token: map['Token'],
-		);
-	}
-
-	Map<String, dynamic> toJson() {
-		final map = super.toJson();
-		if(thesaurusCode != null)
-			map['ThesaurusCode'] = thesaurusCode;
-		return map;
-	}
-}
-
 enum ThesaurusStatusTypeEnum {
 	Unpublished,
 	Published,
@@ -1063,7 +1022,7 @@ class ThesaurusDTO {
 	ThesaurusUsageTypeEnum thesaurusUsageType;
 	String? organizationCode;
 	String? personalCode;
-	List<String >? thesaurusUser;
+	String? referenceThesaurusCode;
 	bool isDefault;
 	bool isUserDefault;
 
@@ -1075,7 +1034,7 @@ class ThesaurusDTO {
 		this.thesaurusUsageType = ThesaurusUsageTypeEnum.People,
 		this.organizationCode,
 		this.personalCode,
-		this.thesaurusUser,
+		this.referenceThesaurusCode,
 		this.isDefault = false,
 		this.isUserDefault = false,
 	});
@@ -1089,7 +1048,7 @@ class ThesaurusDTO {
 			thesaurusUsageType: ThesaurusUsageTypeEnum.values.firstWhere((e) => e.index == map['ThesaurusUsageType']),
 			organizationCode: map['OrganizationCode'],
 			personalCode: map['PersonalCode'],
-			thesaurusUser: map['ThesaurusUser'] != null ? map['ThesaurusUser'].cast<String>().toList() : null,
+			referenceThesaurusCode: map['ReferenceThesaurusCode'],
 			isDefault: map['IsDefault'],
 			isUserDefault: map['IsUserDefault'],
 		);
@@ -1108,8 +1067,8 @@ class ThesaurusDTO {
 			map['OrganizationCode'] = organizationCode;
 		if(personalCode != null)
 			map['PersonalCode'] = personalCode;
-		if(thesaurusUser != null)
-			map['ThesaurusUser'] = thesaurusUser;
+		if(referenceThesaurusCode != null)
+			map['ReferenceThesaurusCode'] = referenceThesaurusCode;
 		map['IsDefault'] = isDefault;
 		map['IsUserDefault'] = isUserDefault;
 		return map;

lib/services/user.m.dart

@@ -226,11 +226,6 @@ class AlterUserInfoRequest extends TokenRequest{
 	}
 }
 
-enum GetUserListTypeEnum {
-	FullName,
-	Phone,
-}
-
 enum OrganizationQueryTypeEnum {
 	Wait,
 	Single,
@@ -239,7 +234,6 @@ enum OrganizationQueryTypeEnum {
 }
 
 class GetUserListRequest extends TokenRequest{
-	GetUserListTypeEnum queryType;
 	String? keyword;
 	OrganizationQueryTypeEnum organizationQueryType;
 	String? organizationCode;
@@ -248,7 +242,6 @@ class GetUserListRequest extends TokenRequest{
 	bool exceptSelf;
 
 	GetUserListRequest({
-		this.queryType = GetUserListTypeEnum.FullName,
 		this.keyword,
 		this.organizationQueryType = OrganizationQueryTypeEnum.Wait,
 		this.organizationCode,
@@ -262,7 +255,6 @@ class GetUserListRequest extends TokenRequest{
 
 	factory GetUserListRequest.fromJson(Map<String, dynamic> map) {
 		return GetUserListRequest( 
-			queryType: GetUserListTypeEnum.values.firstWhere((e) => e.index == map['QueryType']),
 			keyword: map['Keyword'],
 			organizationQueryType: OrganizationQueryTypeEnum.values.firstWhere((e) => e.index == map['OrganizationQueryType']),
 			organizationCode: map['OrganizationCode'],
@@ -275,7 +267,6 @@ class GetUserListRequest extends TokenRequest{
 
 	Map<String, dynamic> toJson() {
 		final map = super.toJson();
-		map['QueryType'] = queryType.index;
 		if(keyword != null)
 			map['Keyword'] = keyword;
 		map['OrganizationQueryType'] = organizationQueryType.index;