同步Server最新接口更改

lib/rpc.dart

@@ -56,6 +56,9 @@ class JsonRpcProxy {
 	AIDiagnosisService get aIDiagnosis =>
 	findService(() => new AIDiagnosisService(currentHostAddress));
 
+	ASRService get aSR =>
+	findService(() => new ASRService(currentHostAddress));
+
 	AuthenticationService get authentication =>
 	findService(() => new AuthenticationService(currentHostAddress));
 

lib/services/aSR.dart

@@ -0,0 +1,32 @@
+import 'dart:core';
+
+import 'package:fis_jsonrpc/client_base.dart';
+import 'package:fis_common/json_convert.dart';
+
+import 'aSR.m.dart';
+
+
+class ASRService extends JsonRpcClientBase {
+	ASRService(
+		String host, {
+		String serviceName = "IASRService",
+		Map<String, String>? headers,
+		int? timeout,
+	}) : super(
+						host,
+						serviceName,
+						headers: headers,
+						timeout: timeout,
+				) {
+		/// 注册响应实体反序列化处理器
+		FJsonConvert.setDecoder((map) => ASRResultDTO.fromJson(map));
+	}
+
+	Future<ASRResultDTO> commitASRInfoAsync(CommitASRInfoRequest request) async {
+		var rpcRst = await call("CommitASRInfoAsync", request);
+		var result = ASRResultDTO.fromJson(rpcRst as Map<String, dynamic>);
+		return result;
+	}
+
+}
+

lib/services/aSR.m.dart

@@ -0,0 +1,58 @@
+import 'aIDiagnosis.m.dart';
+
+class ASRResultDTO {
+	bool isComplete;
+	String? content;
+
+	ASRResultDTO({
+		this.isComplete = false,
+		this.content,
+	});
+
+	factory ASRResultDTO.fromJson(Map<String, dynamic> map) {
+		return ASRResultDTO( 
+			isComplete: map['IsComplete'],
+			content: map['Content'],
+		);
+	}
+
+	Map<String, dynamic> toJson() {
+		final map = Map<String, dynamic>();
+		map['IsComplete'] = isComplete;
+		if(content != null)
+			map['Content'] = content;
+		return map;
+	}
+}
+
+class CommitASRInfoRequest extends TokenRequest{
+	String? url;
+	String? fileType;
+
+	CommitASRInfoRequest({
+		this.url,
+		this.fileType,
+		String? token,
+	}) : super(
+			token: token,
+		);
+
+	factory CommitASRInfoRequest.fromJson(Map<String, dynamic> map) {
+		return CommitASRInfoRequest( 
+			url: map['Url'],
+			fileType: map['FileType'],
+			token: map['Token'],
+		);
+	}
+
+	Map<String, dynamic> toJson() {
+		final map = super.toJson();
+		if(url != null)
+			map['Url'] = url;
+		if(fileType != null)
+			map['FileType'] = fileType;
+		return map;
+	}
+}
+
+

lib/services/authentication.m.dart

@@ -6244,6 +6244,7 @@ enum CustomerRpcCode {
 	UserPasswordExpiredError,
 	UserPasswordRepeatError,
 	SignatureUrlNotValid,
+	ASRError,
 }
 
 class ValidateTokenResult {

lib/services/index.dart

@@ -1,4 +1,5 @@
 export 'aIDiagnosis.dart';
+export 'aSR.dart';
 export 'authentication.dart';
 export 'connect.dart';
 export 'dBLog.dart';
@@ -22,6 +23,7 @@ export 'storage.dart';
 export 'user.dart';
 export 'vinnoServer.dart';
 export 'aIDiagnosis.m.dart';
+export 'aSR.m.dart';
 export 'authentication.m.dart';
 export 'connect.m.dart';
 export 'dBLog.m.dart';

lib/services/liveConsultation.m.dart

@@ -385,16 +385,16 @@ class FindConsultationByPageRequest extends PageRequest{
 	String? expertUserName;
 	DateTime? startDate;
 	DateTime? endDate;
-	QueryConsultationStatusEnum? consultationStatus;
-	ConsultationQueryTypeEnum? consultationQueryType;
+	QueryConsultationStatusEnum consultationStatus;
+	ConsultationQueryTypeEnum consultationQueryType;
 
 	FindConsultationByPageRequest({
 		this.keyword,
 		this.expertUserName,
 		this.startDate,
 		this.endDate,
-		this.consultationStatus,
-		this.consultationQueryType,
+		this.consultationStatus = QueryConsultationStatusEnum.All,
+		this.consultationQueryType = ConsultationQueryTypeEnum.MyApply,
 		int pageIndex = 0,
 		int pageSize = 0,
 		String? token,
@@ -410,8 +410,8 @@ class FindConsultationByPageRequest extends PageRequest{
 			expertUserName: map['ExpertUserName'],
 			startDate: map['StartDate'] != null ? DateTime.parse(map['StartDate']) : null,
 			endDate: map['EndDate'] != null ? DateTime.parse(map['EndDate']) : null,
-			consultationStatus: map['ConsultationStatus'] != null ? QueryConsultationStatusEnum.values.firstWhere((e) => e.index == map['ConsultationStatus']) : null,
-			consultationQueryType: map['ConsultationQueryType'] != null ? ConsultationQueryTypeEnum.values.firstWhere((e) => e.index == map['ConsultationQueryType']) : null,
+			consultationStatus: QueryConsultationStatusEnum.values.firstWhere((e) => e.index == map['ConsultationStatus']),
+			consultationQueryType: ConsultationQueryTypeEnum.values.firstWhere((e) => e.index == map['ConsultationQueryType']),
 			pageIndex: map['PageIndex'],
 			pageSize: map['PageSize'],
 			token: map['Token'],
@@ -428,10 +428,8 @@ class FindConsultationByPageRequest extends PageRequest{
 			map['StartDate'] = JsonRpcUtils.dateFormat(startDate!);
 		if(endDate != null)
 			map['EndDate'] = JsonRpcUtils.dateFormat(endDate!);
-		if(consultationStatus != null)
-			map['ConsultationStatus'] = consultationStatus;
-		if(consultationQueryType != null)
-			map['ConsultationQueryType'] = consultationQueryType;
+		map['ConsultationStatus'] = consultationStatus.index;
+		map['ConsultationQueryType'] = consultationQueryType.index;
 		return map;
 	}
 }
@@ -603,6 +601,7 @@ class ConsultationDetailDTO {
 	ConsultationReportMode reportMode;
 	String? diseases;
 	String? primaryDiagnosis;
+	String? initiatorCode;
 
 	ConsultationDetailDTO({
 		this.consultationCode,
@@ -642,6 +641,7 @@ class ConsultationDetailDTO {
 		this.reportMode = ConsultationReportMode.ExpertReport,
 		this.diseases,
 		this.primaryDiagnosis,
+		this.initiatorCode,
 	});
 
 	factory ConsultationDetailDTO.fromJson(Map<String, dynamic> map) {
@@ -683,6 +683,7 @@ class ConsultationDetailDTO {
 			reportMode: ConsultationReportMode.values.firstWhere((e) => e.index == map['ReportMode']),
 			diseases: map['Diseases'],
 			primaryDiagnosis: map['PrimaryDiagnosis'],
+			initiatorCode: map['InitiatorCode'],
 		);
 	}
 
@@ -759,6 +760,8 @@ class ConsultationDetailDTO {
 			map['Diseases'] = diseases;
 		if(primaryDiagnosis != null)
 			map['PrimaryDiagnosis'] = primaryDiagnosis;
+		if(initiatorCode != null)
+			map['InitiatorCode'] = initiatorCode;
 		return map;
 	}
 }
@@ -1442,12 +1445,10 @@ class CancelInvitingInLiveConsultationResult {
 class CancelInvitingInLiveConsultationRequest extends TokenRequest{
 	String? consultationCode;
 	List<String >? inviteCodes;
-	int roomNo;
 
 	CancelInvitingInLiveConsultationRequest({
 		this.consultationCode,
 		this.inviteCodes,
-		this.roomNo = 0,
 		String? token,
 	}) : super(
 			token: token,
@@ -1457,7 +1458,6 @@ class CancelInvitingInLiveConsultationRequest extends TokenRequest{
 		return CancelInvitingInLiveConsultationRequest( 
 			consultationCode: map['ConsultationCode'],
 			inviteCodes: map['InviteCodes'] != null ? map['InviteCodes'].cast<String>().toList() : null,
-			roomNo: map['RoomNo'],
 			token: map['Token'],
 		);
 	}
@@ -1468,7 +1468,6 @@ class CancelInvitingInLiveConsultationRequest extends TokenRequest{
 			map['ConsultationCode'] = consultationCode;
 		if(inviteCodes != null)
 			map['InviteCodes'] = inviteCodes;
-		map['RoomNo'] = roomNo;
 		return map;
 	}
 }
@@ -1814,12 +1813,10 @@ class SwitchLiveConsultationVideoResult {
 
 class SwitchLiveConsultationVideoRequest extends TokenRequest{
 	String? consultationCode;
-	String? memberCode;
 	bool opened;
 
 	SwitchLiveConsultationVideoRequest({
 		this.consultationCode,
-		this.memberCode,
 		this.opened = false,
 		String? token,
 	}) : super(
@@ -1829,7 +1826,6 @@ class SwitchLiveConsultationVideoRequest extends TokenRequest{
 	factory SwitchLiveConsultationVideoRequest.fromJson(Map<String, dynamic> map) {
 		return SwitchLiveConsultationVideoRequest( 
 			consultationCode: map['ConsultationCode'],
-			memberCode: map['MemberCode'],
 			opened: map['Opened'],
 			token: map['Token'],
 		);
@@ -1839,8 +1835,6 @@ class SwitchLiveConsultationVideoRequest extends TokenRequest{
 		final map = super.toJson();
 		if(consultationCode != null)
 			map['ConsultationCode'] = consultationCode;
-		if(memberCode != null)
-			map['MemberCode'] = memberCode;
 		map['Opened'] = opened;
 		return map;
 	}
@@ -2430,6 +2424,8 @@ enum SyncTypeEnum {
 	SwitchLiveConsultationVideo,
 	JoinLiveConsultation,
 	NewworkErrLiveConsultation,
+	CancelInvitingInLiveConsultation,
+	InviteInLiveConsultation,
 }
 
 enum MongoDBActionTypeEnum {