同步Server最新接口

lib/rpc.dart

@@ -99,6 +99,9 @@ class JsonRpcProxy {
 	RemedicalService get remedical =>
 	findService(() => new RemedicalService(currentHostAddress));
 
+	ReportService get report =>
+	findService(() => new ReportService(currentHostAddress));
+
 	RoleService get role =>
 	findService(() => new RoleService(currentHostAddress));
 

lib/services/index.dart

@@ -14,6 +14,7 @@ export 'rank.dart';
 export 'recordInfo.dart';
 export 'region.dart';
 export 'remedical.dart';
+export 'report.dart';
 export 'role.dart';
 export 'sMS.dart';
 export 'storage.dart';

lib/services/remedical.dart

@@ -99,6 +99,11 @@ class RemedicalService extends JsonRpcClientBase {
 		return rpcRst;
 	}
 
+	Future<bool> addOrgThesaurusAsync(AddThesaurusRequest request) async {
+		var rpcRst = await call("AddOrgThesaurusAsync", request);
+		return rpcRst;
+	}
+
 	Future<bool> addThesaurusClassifyAsync(AddThesaurusClassifyRequest request) async {
 		var rpcRst = await call("AddThesaurusClassifyAsync", request);
 		return rpcRst;
@@ -124,6 +129,11 @@ class RemedicalService extends JsonRpcClientBase {
 		return rpcRst;
 	}
 
+	Future<bool> removeOrgThesaurusAsync(RemoveThesaurusRequest request) async {
+		var rpcRst = await call("RemoveOrgThesaurusAsync", request);
+		return rpcRst;
+	}
+
 	Future<bool> removeThesaurusItemAsync(RemoveThesaurusItemRequest request) async {
 		var rpcRst = await call("RemoveThesaurusItemAsync", request);
 		return rpcRst;
@@ -141,39 +151,55 @@ class RemedicalService extends JsonRpcClientBase {
 		return result;
 	}
 
-	Future<bool> updateThesaurusUserCode(UpdateThesaurusUserCodeRequest request) async {
-		var rpcRst = await call("UpdateThesaurusUserCode", request);
+	Future<bool> updateThesaurusUserCodeAsync(UpdateThesaurusUserCodeRequest request) async {
+		var rpcRst = await call("UpdateThesaurusUserCodeAsync", request);
 		return rpcRst;
 	}
 
-	Future<bool> deleteThesaurusUserCode(DeleteThesaurusUserCodeRequest request) async {
-		var rpcRst = await call("DeleteThesaurusUserCode", request);
+	Future<bool> deleteThesaurusUserCodeAsync(DeleteThesaurusUserCodeRequest request) async {
+		var rpcRst = await call("DeleteThesaurusUserCodeAsync", request);
 		return rpcRst;
 	}
 
-	Future<PageResult<ThesaurusDTO>> getThesaurusPage(GetThesaurusPageRequest request) async {
-		var rpcRst = await call("GetThesaurusPage", request);
+	Future<PageResult<ThesaurusDTO>> getThesaurusPageAsync(GetThesaurusPageRequest request) async {
+		var rpcRst = await call("GetThesaurusPageAsync", request);
+		var result = PageResult<ThesaurusDTO>.fromJson(rpcRst as Map<String, dynamic>);
+		return result;
+	}
+
+	Future<PageResult<ThesaurusDTO>> getOrgThesaurusPageAsync(GetThesaurusPageRequest request) async {
+		var rpcRst = await call("GetOrgThesaurusPageAsync", request);
 		var result = PageResult<ThesaurusDTO>.fromJson(rpcRst as Map<String, dynamic>);
 		return result;
 	}
 
-	Future<List<ThesaurusItemDTO>> getThesaurusItems(GetThesaurusItemsRequest request) async {
-		var rpcRst = await call("GetThesaurusItems", request);
+	Future<List<ThesaurusItemDTO>> getThesaurusItemsAsync(GetThesaurusItemsRequest request) async {
+		var rpcRst = await call("GetThesaurusItemsAsync", request);
 		var result = (rpcRst as List).map((e)=>ThesaurusItemDTO.fromJson(e as Map<String, dynamic>)).toList();
 		return result;
 	}
 
-	Future<List<ThesaurusItemDTO>> getThesaurusClassifyByParentCode(GetThesaurusClassifyByParentCodeRequest request) async {
-		var rpcRst = await call("GetThesaurusClassifyByParentCode", request);
+	Future<List<ThesaurusItemDTO>> getThesaurusClassifyByParentCodeAsync(GetThesaurusClassifyByParentCodeRequest request) async {
+		var rpcRst = await call("GetThesaurusClassifyByParentCodeAsync", request);
 		var result = (rpcRst as List).map((e)=>ThesaurusItemDTO.fromJson(e as Map<String, dynamic>)).toList();
 		return result;
 	}
 
-	Future<List<ThesaurusItemDTO>> getThesaurusContentByParentCode(GetThesaurusContentByParentCodeRequest request) async {
-		var rpcRst = await call("GetThesaurusContentByParentCode", request);
+	Future<List<ThesaurusItemDTO>> getThesaurusContentByParentCodeAsync(GetThesaurusContentByParentCodeRequest request) async {
+		var rpcRst = await call("GetThesaurusContentByParentCodeAsync", request);
 		var result = (rpcRst as List).map((e)=>ThesaurusItemDTO.fromJson(e as Map<String, dynamic>)).toList();
 		return result;
 	}
 
+	Future<bool> copyPersonalThesaurusAsync(CopyThesaurusRequest request) async {
+		var rpcRst = await call("CopyPersonalThesaurusAsync", request);
+		return rpcRst;
+	}
+
+	Future<bool> copyOrgThesaurusAsync(CopyOrgThesaurusRequest request) async {
+		var rpcRst = await call("CopyOrgThesaurusAsync", request);
+		return rpcRst;
+	}
+
 }
 

lib/services/remedical.m.dart

@@ -818,9 +818,11 @@ class RemoveThesaurusRequest extends TokenRequest{
 }
 
 class RemoveThesaurusItemRequest extends TokenRequest{
+	String? thesaurusCode;
 	String? thesaurusItemCode;
 
 	RemoveThesaurusItemRequest({
+		this.thesaurusCode,
 		this.thesaurusItemCode,
 		String? token,
 	}) : super(
@@ -829,6 +831,7 @@ class RemoveThesaurusItemRequest extends TokenRequest{
 
 	factory RemoveThesaurusItemRequest.fromJson(Map<String, dynamic> map) {
 		return RemoveThesaurusItemRequest( 
+			thesaurusCode: map['ThesaurusCode'],
 			thesaurusItemCode: map['ThesaurusItemCode'],
 			token: map['Token'],
 		);
@@ -836,6 +839,8 @@ class RemoveThesaurusItemRequest extends TokenRequest{
 
 	Map<String, dynamic> toJson() {
 		final map = super.toJson();
+		if(thesaurusCode != null)
+			map['ThesaurusCode'] = thesaurusCode;
 		if(thesaurusItemCode != null)
 			map['ThesaurusItemCode'] = thesaurusItemCode;
 		return map;
@@ -847,14 +852,14 @@ class QueryExamListItemResult {
 	String? patientName;
 	String? age;
 	String? sex;
-	String? associatedExamCode;
+	List<String>? associatedExamCodes;
 
 	QueryExamListItemResult({
 		this.examCode,
 		this.patientName,
 		this.age,
 		this.sex,
-		this.associatedExamCode,
+		this.associatedExamCodes,
 	});
 
 	factory QueryExamListItemResult.fromJson(Map<String, dynamic> map) {
@@ -863,7 +868,7 @@ class QueryExamListItemResult {
 			patientName: map['PatientName'],
 			age: map['Age'],
 			sex: map['Sex'],
-			associatedExamCode: map['AssociatedExamCode'],
+			associatedExamCodes: map['AssociatedExamCodes'] != null ? map['AssociatedExamCodes'].cast<String>().toList() : null,
 		);
 	}
 
@@ -877,8 +882,8 @@ class QueryExamListItemResult {
 			map['Age'] = age;
 		if(sex != null)
 			map['Sex'] = sex;
-		if(associatedExamCode != null)
-			map['AssociatedExamCode'] = associatedExamCode;
+		if(associatedExamCodes != null)
+			map['AssociatedExamCodes'] = associatedExamCodes;
 		return map;
 	}
 }
@@ -940,7 +945,7 @@ class QueryExamInfoResult {
 	String? patientAge;
 	String? patientSex;
 	List<PatientInfoExt>? patientInfoExtList;
-	String? associatedExamCode;
+	List<String>? associatedExamCodes;
 
 	QueryExamInfoResult({
 		this.createTime,
@@ -949,7 +954,7 @@ class QueryExamInfoResult {
 		this.patientAge,
 		this.patientSex,
 		this.patientInfoExtList,
-		this.associatedExamCode,
+		this.associatedExamCodes,
 	});
 
 	factory QueryExamInfoResult.fromJson(Map<String, dynamic> map) {
@@ -960,7 +965,7 @@ class QueryExamInfoResult {
 			patientAge: map['PatientAge'],
 			patientSex: map['PatientSex'],
 			patientInfoExtList: map['PatientInfoExtList'] != null ? (map['PatientInfoExtList'] as List).map((e)=>PatientInfoExt.fromJson(e as Map<String,dynamic>)).toList() : null,
-			associatedExamCode: map['AssociatedExamCode'],
+			associatedExamCodes: map['AssociatedExamCodes'] != null ? map['AssociatedExamCodes'].cast<String>().toList() : null,
 		);
 	}
 
@@ -978,8 +983,8 @@ class QueryExamInfoResult {
 			map['PatientSex'] = patientSex;
 		if(patientInfoExtList != null)
 			map['PatientInfoExtList'] = patientInfoExtList;
-		if(associatedExamCode != null)
-			map['AssociatedExamCode'] = associatedExamCode;
+		if(associatedExamCodes != null)
+			map['AssociatedExamCodes'] = associatedExamCodes;
 		return map;
 	}
 }
@@ -1264,4 +1269,54 @@ class GetThesaurusContentByParentCodeRequest extends TokenRequest{
 	}
 }
 
+class CopyThesaurusRequest extends TokenRequest{
+	String? thesaurusCode;
+
+	CopyThesaurusRequest({
+		this.thesaurusCode,
+		String? token,
+	}) : super(
+			token: token,
+		);
+
+	factory CopyThesaurusRequest.fromJson(Map<String, dynamic> map) {
+		return CopyThesaurusRequest( 
+			thesaurusCode: map['ThesaurusCode'],
+			token: map['Token'],
+		);
+	}
+
+	Map<String, dynamic> toJson() {
+		final map = super.toJson();
+		if(thesaurusCode != null)
+			map['ThesaurusCode'] = thesaurusCode;
+		return map;
+	}
+}
+
+class CopyOrgThesaurusRequest extends TokenRequest{
+	String? thesaurusCode;
+
+	CopyOrgThesaurusRequest({
+		this.thesaurusCode,
+		String? token,
+	}) : super(
+			token: token,
+		);
+
+	factory CopyOrgThesaurusRequest.fromJson(Map<String, dynamic> map) {
+		return CopyOrgThesaurusRequest( 
+			thesaurusCode: map['ThesaurusCode'],
+			token: map['Token'],
+		);
+	}
+
+	Map<String, dynamic> toJson() {
+		final map = super.toJson();
+		if(thesaurusCode != null)
+			map['ThesaurusCode'] = thesaurusCode;
+		return map;
+	}
+}
+
 

lib/services/report.dart

@@ -0,0 +1,21 @@
+import 'dart:core';
+
+import 'package:fis_jsonrpc/client_base.dart';
+
+
+
+class ReportService extends JsonRpcClientBase {
+	ReportService(
+		String host, {
+		String serviceName = "IReportService",
+		Map<String, String>? headers,
+		int? timeout,
+	}) : super(
+						host,
+						serviceName,
+						headers: headers,
+						timeout: timeout,
+				);
+
+}
+