rpc更新

lib/rpc.dart

@@ -220,6 +220,9 @@ class JsonRpcProxy {
 	VitalExamService get vitalExam =>
 	findService(() => new VitalExamService(currentHostAddress));
 
+	VitalFacturyPostHistoryService get vitalFacturyPostHistory =>
+	findService(() => new VitalFacturyPostHistoryService(currentHostAddress));
+
 	VitalFacturyUserService get vitalFacturyUser =>
 	findService(() => new VitalFacturyUserService(currentHostAddress));
 

lib/services/authentication.m.dart

@@ -8226,11 +8226,11 @@ enum CustomerRpcCode {
 	placeHolder_7999,
 	placeHolder_8000,
 	RegisteredSameDay,
-	placeHolder_8002,
-	placeHolder_8003,
-	placeHolder_8004,
-	placeHolder_8005,
-	placeHolder_8006,
+	JingQiNotRequired,
+	JingQiApiFailed,
+	JingQiNonArea,
+	JingQiExamedInYear,
+	JingQiException,
 	placeHolder_8007,
 	placeHolder_8008,
 	placeHolder_8009,

lib/services/index.dart

@@ -48,6 +48,7 @@ export 'vitalDictionary.dart';
 export 'vitalDynamicType.dart';
 export 'vitalElectrocardiogram.dart';
 export 'vitalExam.dart';
+export 'vitalFacturyPostHistory.dart';
 export 'vitalFacturyUser.dart';
 export 'vitalFollowUp.dart';
 export 'vitalHealthExamBooking.dart';
@@ -123,6 +124,7 @@ export 'vitalDictionary.m.dart';
 export 'vitalDynamicType.m.dart';
 export 'vitalElectrocardiogram.m.dart';
 export 'vitalExam.m.dart';
+export 'vitalFacturyPostHistory.m.dart';
 export 'vitalFacturyUser.m.dart';
 export 'vitalFollowUp.m.dart';
 export 'vitalHealthExamBooking.m.dart';

lib/services/other.m.dart

@@ -29,6 +29,7 @@ import 'vitalDynamicType.m.dart';
 import 'vitalExam.m.dart';
 import 'vitalElectrocardiogram.m.dart';
 import 'vitalHealthExamBooking.m.dart';
+import 'vitalFacturyPostHistory.m.dart';
 import 'vitalFacturyUser.m.dart';
 import 'vitalSchedule.m.dart';
 import 'vitalFollowUp.m.dart';
@@ -19685,28 +19686,96 @@ class MeasureResultExcelDTO {
 	}
 }
 
+class SortMultiMethodItemsOutputsDTO {
+	List<String>? measureTypeNames;
+	List<String>? baseTypeNames;
+
+	SortMultiMethodItemsOutputsDTO({
+		this.measureTypeNames,
+		this.baseTypeNames,
+	});
+
+	factory SortMultiMethodItemsOutputsDTO.fromJson(Map<String, dynamic> map) {
+		return SortMultiMethodItemsOutputsDTO( 
+			measureTypeNames: map['MeasureTypeNames']?.cast<String>().toList(),
+			baseTypeNames: map['BaseTypeNames']?.cast<String>().toList(),
+		);
+	}
+
+	Map<String, dynamic> toJson() {
+		final map = Map<String, dynamic>();
+		if (measureTypeNames != null)
+			map['MeasureTypeNames'] = measureTypeNames;
+		if (baseTypeNames != null)
+			map['BaseTypeNames'] = baseTypeNames;
+		return map;
+	}
+}
+
+class AvailableOutputsRemoveDTO {
+	String? baseTypeName;
+	String? baseMeasureTypeName;
+	String? name;
+	List<String>? removeAvailableOutputs;
+
+	AvailableOutputsRemoveDTO({
+		this.baseTypeName,
+		this.baseMeasureTypeName,
+		this.name,
+		this.removeAvailableOutputs,
+	});
+
+	factory AvailableOutputsRemoveDTO.fromJson(Map<String, dynamic> map) {
+		return AvailableOutputsRemoveDTO( 
+			baseTypeName: map['BaseTypeName'],
+			baseMeasureTypeName: map['BaseMeasureTypeName'],
+			name: map['Name'],
+			removeAvailableOutputs: map['RemoveAvailableOutputs']?.cast<String>().toList(),
+		);
+	}
+
+	Map<String, dynamic> toJson() {
+		final map = Map<String, dynamic>();
+		if (baseTypeName != null)
+			map['BaseTypeName'] = baseTypeName;
+		if (baseMeasureTypeName != null)
+			map['BaseMeasureTypeName'] = baseMeasureTypeName;
+		if (name != null)
+			map['Name'] = name;
+		if (removeAvailableOutputs != null)
+			map['RemoveAvailableOutputs'] = removeAvailableOutputs;
+		return map;
+	}
+}
+
 class MeasureImplBasicDTO {
 	List<String>? uRMBaseTypeList;
 	List<String>? generalBaseTypeList;
+	List<String>? generalMeasureTypeNameList;
 	List<String>? childItemList;
 	List<String>? excludeItemList;
-	List<String>? perimeterMultiMethodItemsOutputs;
+	SortMultiMethodItemsOutputsDTO? sortMultiMethodItemsOutputs;
+	List<AvailableOutputsRemoveDTO>? availableOutputsRemoveList;
 
 	MeasureImplBasicDTO({
 		this.uRMBaseTypeList,
 		this.generalBaseTypeList,
+		this.generalMeasureTypeNameList,
 		this.childItemList,
 		this.excludeItemList,
-		this.perimeterMultiMethodItemsOutputs,
+		this.sortMultiMethodItemsOutputs,
+		this.availableOutputsRemoveList,
 	});
 
 	factory MeasureImplBasicDTO.fromJson(Map<String, dynamic> map) {
 		return MeasureImplBasicDTO( 
 			uRMBaseTypeList: map['URMBaseTypeList']?.cast<String>().toList(),
 			generalBaseTypeList: map['GeneralBaseTypeList']?.cast<String>().toList(),
+			generalMeasureTypeNameList: map['GeneralMeasureTypeNameList']?.cast<String>().toList(),
 			childItemList: map['ChildItemList']?.cast<String>().toList(),
 			excludeItemList: map['ExcludeItemList']?.cast<String>().toList(),
-			perimeterMultiMethodItemsOutputs: map['PerimeterMultiMethodItemsOutputs']?.cast<String>().toList(),
+			sortMultiMethodItemsOutputs: map['SortMultiMethodItemsOutputs'] != null ? SortMultiMethodItemsOutputsDTO.fromJson(map['SortMultiMethodItemsOutputs']) : null,
+			availableOutputsRemoveList: map['AvailableOutputsRemoveList'] != null ? (map['AvailableOutputsRemoveList'] as List).map((e)=>AvailableOutputsRemoveDTO.fromJson(e as Map<String,dynamic>)).toList() : null,
 		);
 	}
 
@@ -19716,12 +19785,16 @@ class MeasureImplBasicDTO {
 			map['URMBaseTypeList'] = uRMBaseTypeList;
 		if (generalBaseTypeList != null)
 			map['GeneralBaseTypeList'] = generalBaseTypeList;
+		if (generalMeasureTypeNameList != null)
+			map['GeneralMeasureTypeNameList'] = generalMeasureTypeNameList;
 		if (childItemList != null)
 			map['ChildItemList'] = childItemList;
 		if (excludeItemList != null)
 			map['ExcludeItemList'] = excludeItemList;
-		if (perimeterMultiMethodItemsOutputs != null)
-			map['PerimeterMultiMethodItemsOutputs'] = perimeterMultiMethodItemsOutputs;
+		if (sortMultiMethodItemsOutputs != null)
+			map['SortMultiMethodItemsOutputs'] = sortMultiMethodItemsOutputs;
+		if (availableOutputsRemoveList != null)
+			map['AvailableOutputsRemoveList'] = availableOutputsRemoveList;
 		return map;
 	}
 }

lib/services/remedical.m.dart

@@ -838,6 +838,7 @@ class ChildItemMetaDTO {
 	bool isWorking;
 	List<ChildItemMetaDTO>? childItems;
 	CalculatorMetaDTO? calculator;
+	List<String>? avaiableFormulars;
 	String? measureTypeName;
 	int? rimWidth;
 
@@ -847,6 +848,7 @@ class ChildItemMetaDTO {
 		this.isWorking = false,
 		this.childItems,
 		this.calculator,
+		this.avaiableFormulars,
 		this.measureTypeName,
 		this.rimWidth,
 	});
@@ -858,6 +860,7 @@ class ChildItemMetaDTO {
 			isWorking: map['IsWorking'],
 			childItems: map['ChildItems'] != null ? (map['ChildItems'] as List).map((e)=>ChildItemMetaDTO.fromJson(e as Map<String,dynamic>)).toList() : null,
 			calculator: map['Calculator'] != null ? CalculatorMetaDTO.fromJson(map['Calculator']) : null,
+			avaiableFormulars: map['AvaiableFormulars']?.cast<String>().toList(),
 			measureTypeName: map['MeasureTypeName'],
 			rimWidth: map['RimWidth'],
 		);
@@ -874,6 +877,8 @@ class ChildItemMetaDTO {
 			map['ChildItems'] = childItems;
 		if (calculator != null)
 			map['Calculator'] = calculator;
+		if (avaiableFormulars != null)
+			map['AvaiableFormulars'] = avaiableFormulars;
 		if (measureTypeName != null)
 			map['MeasureTypeName'] = measureTypeName;
 		if (rimWidth != null)
@@ -891,6 +896,7 @@ class ItemMetaDTO {
 	CalculatorMetaDTO? calculator;
 	List<ChildItemMetaDTO>? multiMethodItems;
 	List<ChildItemMetaDTO>? methodChildItems;
+	List<String>? avaiableFormulars;
 	WorkingItemStatusEnum? status;
 
 	ItemMetaDTO({
@@ -902,6 +908,7 @@ class ItemMetaDTO {
 		this.calculator,
 		this.multiMethodItems,
 		this.methodChildItems,
+		this.avaiableFormulars,
 		this.status,
 	});
 
@@ -915,6 +922,7 @@ class ItemMetaDTO {
 			calculator: map['Calculator'] != null ? CalculatorMetaDTO.fromJson(map['Calculator']) : null,
 			multiMethodItems: map['MultiMethodItems'] != null ? (map['MultiMethodItems'] as List).map((e)=>ChildItemMetaDTO.fromJson(e as Map<String,dynamic>)).toList() : null,
 			methodChildItems: map['MethodChildItems'] != null ? (map['MethodChildItems'] as List).map((e)=>ChildItemMetaDTO.fromJson(e as Map<String,dynamic>)).toList() : null,
+			avaiableFormulars: map['AvaiableFormulars']?.cast<String>().toList(),
 			status: map['Status'] != null ? WorkingItemStatusEnum.values.firstWhere((e) => e.index == map['Status']) : null,
 		);
 	}
@@ -937,6 +945,8 @@ class ItemMetaDTO {
 			map['MultiMethodItems'] = multiMethodItems;
 		if (methodChildItems != null)
 			map['MethodChildItems'] = methodChildItems;
+		if (avaiableFormulars != null)
+			map['AvaiableFormulars'] = avaiableFormulars;
 		if (status != null)
 		map['Status'] = status?.index;
 		return map;
@@ -3408,6 +3418,7 @@ class ReportDTO extends ReportBaseDTO{
 	String? reportTemplateCode;
 	DateTime? examDate;
 	String? reportExamDataJson;
+	int healthDiagnosis;
 
 	ReportDTO({
 		this.reportTemplateJson,
@@ -3420,6 +3431,7 @@ class ReportDTO extends ReportBaseDTO{
 		this.reportTemplateCode,
 		this.examDate,
 		this.reportExamDataJson,
+		this.healthDiagnosis = 0,
 		String? reportCode,
 		String? recordCode,
 		String? reportUserCode,
@@ -3485,6 +3497,7 @@ class ReportDTO extends ReportBaseDTO{
 			reportTemplateCode: map['ReportTemplateCode'],
 			examDate: map['ExamDate'] != null ? DateTime.parse(map['ExamDate']) : null,
 			reportExamDataJson: map['ReportExamDataJson'],
+			healthDiagnosis: map['HealthDiagnosis'],
 			reportCode: map['ReportCode'],
 			recordCode: map['RecordCode'],
 			reportUserCode: map['ReportUserCode'],
@@ -3534,6 +3547,7 @@ class ReportDTO extends ReportBaseDTO{
 			map['ExamDate'] = JsonRpcUtils.dateFormat(examDate!);
 		if (reportExamDataJson != null)
 			map['ReportExamDataJson'] = reportExamDataJson;
+		map['HealthDiagnosis'] = healthDiagnosis;
 		return map;
 	}
 }

lib/services/report.m.dart

@@ -2171,6 +2171,7 @@ class DeviceExamReportDTO extends ReportDTO{
 		String? reportTemplateCode,
 		DateTime? examDate,
 		String? reportExamDataJson,
+		int healthDiagnosis = 0,
 		String? reportCode,
 		String? recordCode,
 		String? reportUserCode,
@@ -2207,6 +2208,7 @@ class DeviceExamReportDTO extends ReportDTO{
 			reportTemplateCode: reportTemplateCode,
 			examDate: examDate,
 			reportExamDataJson: reportExamDataJson,
+			healthDiagnosis: healthDiagnosis,
 			reportCode: reportCode,
 			recordCode: recordCode,
 			reportUserCode: reportUserCode,
@@ -2249,6 +2251,7 @@ class DeviceExamReportDTO extends ReportDTO{
 			reportTemplateCode: map['ReportTemplateCode'],
 			examDate: map['ExamDate'] != null ? DateTime.parse(map['ExamDate']) : null,
 			reportExamDataJson: map['ReportExamDataJson'],
+			healthDiagnosis: map['HealthDiagnosis'],
 			reportCode: map['ReportCode'],
 			recordCode: map['RecordCode'],
 			reportUserCode: map['ReportUserCode'],

lib/services/ultrasoundReport.m.dart

@@ -10,12 +10,14 @@ class AddEcgReportRequest extends TokenRequest{
 	String? reportDatasJson;
 	String? patientName;
 	String? reportTemplateCode;
+	int healthDiagnosis;
 
 	AddEcgReportRequest({
 		this.recordCode,
 		this.reportDatasJson,
 		this.patientName,
 		this.reportTemplateCode,
+		this.healthDiagnosis = 0,
 		String? token,
 	}) : super(
 			token: token,
@@ -27,6 +29,7 @@ class AddEcgReportRequest extends TokenRequest{
 			reportDatasJson: map['ReportDatasJson'],
 			patientName: map['PatientName'],
 			reportTemplateCode: map['ReportTemplateCode'],
+			healthDiagnosis: map['HealthDiagnosis'],
 			token: map['Token'],
 		);
 	}
@@ -41,6 +44,7 @@ class AddEcgReportRequest extends TokenRequest{
 			map['PatientName'] = patientName;
 		if (reportTemplateCode != null)
 			map['ReportTemplateCode'] = reportTemplateCode;
+		map['HealthDiagnosis'] = healthDiagnosis;
 		return map;
 	}
 }
@@ -54,12 +58,14 @@ class ModifyEcgReportRequest extends AddEcgReportRequest{
 		String? reportDatasJson,
 		String? patientName,
 		String? reportTemplateCode,
+		int healthDiagnosis = 0,
 		String? token,
 	}) : super(
 			recordCode: recordCode,
 			reportDatasJson: reportDatasJson,
 			patientName: patientName,
 			reportTemplateCode: reportTemplateCode,
+			healthDiagnosis: healthDiagnosis,
 			token: token,
 		);
 
@@ -70,6 +76,7 @@ class ModifyEcgReportRequest extends AddEcgReportRequest{
 			reportDatasJson: map['ReportDatasJson'],
 			patientName: map['PatientName'],
 			reportTemplateCode: map['ReportTemplateCode'],
+			healthDiagnosis: map['HealthDiagnosis'],
 			token: map['Token'],
 		);
 	}

lib/services/vitalFacturyPostHistory.dart

@@ -0,0 +1,61 @@
+import 'dart:core';
+
+import 'package:fis_jsonrpc/client_base.dart';
+import 'package:fis_common/json_convert.dart';
+
+import 'vitalFacturyPostHistory.m.dart';
+
+import 'researchEdition.m.dart';
+
+
+class VitalFacturyPostHistoryService extends JsonRpcClientBase {
+	VitalFacturyPostHistoryService(
+		String host, {
+		String serviceName = "IVitalFacturyPostHistoryService",
+		Map<String, String>? headers,
+		int? timeout,
+	}) : super(
+						host,
+						serviceName,
+						headers: headers,
+						timeout: timeout,
+				) {
+		/// 注册响应实体反序列化处理器
+		FJsonConvert.setDecoder((map) => FacturyPostHistoryDTO.fromJson(map));
+		FJsonConvert.setDecoder((map) => PageCollection<FacturyPostHistoryDTO>.fromJson(map));
+	}
+
+	Future<String> createFacturyPostHistoryAsync(CreateFacturyPostHistoryRequest request) async {
+		var rpcRst = await call("CreateFacturyPostHistoryAsync", request);
+		return rpcRst;
+	}
+
+	Future<FacturyPostHistoryDTO> getFacturyPostHistoryAsync(GetFacturyPostHistoryRequest request) async {
+		var rpcRst = await call("GetFacturyPostHistoryAsync", request);
+		var result = FacturyPostHistoryDTO.fromJson(rpcRst as Map<String, dynamic>);
+		return result;
+	}
+
+	Future<PageCollection<FacturyPostHistoryDTO>> getFacturyPostHistoryByPageAsync(GetFacturyPostHistoryByPageRequest request) async {
+		var rpcRst = await call("GetFacturyPostHistoryByPageAsync", request);
+		var result = PageCollection<FacturyPostHistoryDTO>.fromJson(rpcRst as Map<String, dynamic>);
+		return result;
+	}
+
+	Future<bool> removeFacturyPostHistoryAsync(RemoveFacturyPostHistoryRequest request) async {
+		var rpcRst = await call("RemoveFacturyPostHistoryAsync", request);
+		return rpcRst;
+	}
+
+	Future<bool> resendFacturyPostHistoryAsync(ResendFacturyPostHistoryRequest request) async {
+		var rpcRst = await call("ResendFacturyPostHistoryAsync", request);
+		return rpcRst;
+	}
+
+	Future<bool> createJingQiExamPostHistoryAsync(CreateJingQiExamPostHistoryRequest request) async {
+		var rpcRst = await call("CreateJingQiExamPostHistoryAsync", request);
+		return rpcRst;
+	}
+
+}
+

lib/services/vitalFacturyPostHistory.m.dart

@@ -0,0 +1,315 @@
+import 'researchEdition.m.dart';
+import 'notification.m.dart';
+
+import 'package:fis_jsonrpc/utils.dart';
+
+class CreateFacturyPostHistoryRequest extends TokenRequest{
+	String? facturyUniqueCode;
+	String? facturyUrl;
+	String? iDCardNo;
+	String? patientName;
+	String? apiType;
+	int status;
+	DateTime? postTime;
+	Map<String,String>? headers;
+	String? content;
+	String? result;
+
+	CreateFacturyPostHistoryRequest({
+		this.facturyUniqueCode,
+		this.facturyUrl,
+		this.iDCardNo,
+		this.patientName,
+		this.apiType,
+		this.status = 0,
+		this.postTime,
+		this.headers,
+		this.content,
+		this.result,
+		String? token,
+	}) : super(
+			token: token,
+		);
+
+	factory CreateFacturyPostHistoryRequest.fromJson(Map<String, dynamic> map) {
+		return CreateFacturyPostHistoryRequest( 
+			facturyUniqueCode: map['FacturyUniqueCode'],
+			facturyUrl: map['FacturyUrl'],
+			iDCardNo: map['IDCardNo'],
+			patientName: map['PatientName'],
+			apiType: map['ApiType'],
+			status: map['Status'],
+			postTime: map['PostTime'] != null ? DateTime.parse(map['PostTime']) : null,
+			headers: map['Headers']?.cast<String,String>(),
+			content: map['Content'],
+			result: map['Result'],
+			token: map['Token'],
+		);
+	}
+
+	Map<String, dynamic> toJson() {
+		final map = super.toJson();
+		if (facturyUniqueCode != null)
+			map['FacturyUniqueCode'] = facturyUniqueCode;
+		if (facturyUrl != null)
+			map['FacturyUrl'] = facturyUrl;
+		if (iDCardNo != null)
+			map['IDCardNo'] = iDCardNo;
+		if (patientName != null)
+			map['PatientName'] = patientName;
+		if (apiType != null)
+			map['ApiType'] = apiType;
+		map['Status'] = status;
+		if (postTime != null)
+			map['PostTime'] = JsonRpcUtils.dateFormat(postTime!);
+		if (headers != null)
+			map['Headers'] = headers;
+		if (content != null)
+			map['Content'] = content;
+		if (result != null)
+			map['Result'] = result;
+		return map;
+	}
+}
+
+class FacturyPostHistoryDTO extends BaseDTO{
+	String? code;
+	String? facturyUniqueCode;
+	String? facturyUrl;
+	String? iDCardNo;
+	String? patientName;
+	String? apiType;
+	int status;
+	DateTime? postTime;
+	Map<String,String>? headers;
+	String? content;
+	String? result;
+
+	FacturyPostHistoryDTO({
+		this.code,
+		this.facturyUniqueCode,
+		this.facturyUrl,
+		this.iDCardNo,
+		this.patientName,
+		this.apiType,
+		this.status = 0,
+		this.postTime,
+		this.headers,
+		this.content,
+		this.result,
+		bool isDelete = false,
+		DateTime? createTime,
+		DateTime? updateTime,
+	}) : super(
+			isDelete: isDelete,
+			createTime: createTime,
+			updateTime: updateTime,
+		);
+
+	factory FacturyPostHistoryDTO.fromJson(Map<String, dynamic> map) {
+		return FacturyPostHistoryDTO( 
+			code: map['Code'],
+			facturyUniqueCode: map['FacturyUniqueCode'],
+			facturyUrl: map['FacturyUrl'],
+			iDCardNo: map['IDCardNo'],
+			patientName: map['PatientName'],
+			apiType: map['ApiType'],
+			status: map['Status'],
+			postTime: map['PostTime'] != null ? DateTime.parse(map['PostTime']) : null,
+			headers: map['Headers']?.cast<String,String>(),
+			content: map['Content'],
+			result: map['Result'],
+			isDelete: map['IsDelete'],
+			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 (facturyUniqueCode != null)
+			map['FacturyUniqueCode'] = facturyUniqueCode;
+		if (facturyUrl != null)
+			map['FacturyUrl'] = facturyUrl;
+		if (iDCardNo != null)
+			map['IDCardNo'] = iDCardNo;
+		if (patientName != null)
+			map['PatientName'] = patientName;
+		if (apiType != null)
+			map['ApiType'] = apiType;
+		map['Status'] = status;
+		if (postTime != null)
+			map['PostTime'] = JsonRpcUtils.dateFormat(postTime!);
+		if (headers != null)
+			map['Headers'] = headers;
+		if (content != null)
+			map['Content'] = content;
+		if (result != null)
+			map['Result'] = result;
+		return map;
+	}
+}
+
+class GetFacturyPostHistoryRequest extends TokenRequest{
+	String? code;
+
+	GetFacturyPostHistoryRequest({
+		this.code,
+		String? token,
+	}) : super(
+			token: token,
+		);
+
+	factory GetFacturyPostHistoryRequest.fromJson(Map<String, dynamic> map) {
+		return GetFacturyPostHistoryRequest( 
+			code: map['Code'],
+			token: map['Token'],
+		);
+	}
+
+	Map<String, dynamic> toJson() {
+		final map = super.toJson();
+		if (code != null)
+			map['Code'] = code;
+		return map;
+	}
+}
+
+class GetFacturyPostHistoryByPageRequest extends PageRequest{
+	String? keyword;
+	int status;
+	DateTime? startTime;
+	DateTime? endTime;
+
+	GetFacturyPostHistoryByPageRequest({
+		this.keyword,
+		this.status = 0,
+		this.startTime,
+		this.endTime,
+		int pageIndex = 0,
+		int pageSize = 0,
+		String? token,
+	}) : super(
+			pageIndex: pageIndex,
+			pageSize: pageSize,
+			token: token,
+		);
+
+	factory GetFacturyPostHistoryByPageRequest.fromJson(Map<String, dynamic> map) {
+		return GetFacturyPostHistoryByPageRequest( 
+			keyword: map['Keyword'],
+			status: map['Status'],
+			startTime: map['StartTime'] != null ? DateTime.parse(map['StartTime']) : null,
+			endTime: map['EndTime'] != null ? DateTime.parse(map['EndTime']) : null,
+			pageIndex: map['PageIndex'],
+			pageSize: map['PageSize'],
+			token: map['Token'],
+		);
+	}
+
+	Map<String, dynamic> toJson() {
+		final map = super.toJson();
+		if (keyword != null)
+			map['Keyword'] = keyword;
+		map['Status'] = status;
+		if (startTime != null)
+			map['StartTime'] = JsonRpcUtils.dateFormat(startTime!);
+		if (endTime != null)
+			map['EndTime'] = JsonRpcUtils.dateFormat(endTime!);
+		return map;
+	}
+}
+
+class RemoveFacturyPostHistoryRequest extends TokenRequest{
+	String? code;
+
+	RemoveFacturyPostHistoryRequest({
+		this.code,
+		String? token,
+	}) : super(
+			token: token,
+		);
+
+	factory RemoveFacturyPostHistoryRequest.fromJson(Map<String, dynamic> map) {
+		return RemoveFacturyPostHistoryRequest( 
+			code: map['Code'],
+			token: map['Token'],
+		);
+	}
+
+	Map<String, dynamic> toJson() {
+		final map = super.toJson();
+		if (code != null)
+			map['Code'] = code;
+		return map;
+	}
+}
+
+class ResendFacturyPostHistoryRequest extends TokenRequest{
+	String? code;
+
+	ResendFacturyPostHistoryRequest({
+		this.code,
+		String? token,
+	}) : super(
+			token: token,
+		);
+
+	factory ResendFacturyPostHistoryRequest.fromJson(Map<String, dynamic> map) {
+		return ResendFacturyPostHistoryRequest( 
+			code: map['Code'],
+			token: map['Token'],
+		);
+	}
+
+	Map<String, dynamic> toJson() {
+		final map = super.toJson();
+		if (code != null)
+			map['Code'] = code;
+		return map;
+	}
+}
+
+class CreateJingQiExamPostHistoryRequest extends TokenRequest{
+	String? physicalExamNumber;
+	String? examKey;
+	Map<String,String>? examData;
+	DateTime? examTime;
+
+	CreateJingQiExamPostHistoryRequest({
+		this.physicalExamNumber,
+		this.examKey,
+		this.examData,
+		this.examTime,
+		String? token,
+	}) : super(
+			token: token,
+		);
+
+	factory CreateJingQiExamPostHistoryRequest.fromJson(Map<String, dynamic> map) {
+		return CreateJingQiExamPostHistoryRequest( 
+			physicalExamNumber: map['PhysicalExamNumber'],
+			examKey: map['ExamKey'],
+			examData: map['ExamData']?.cast<String,String>(),
+			examTime: map['ExamTime'] != null ? DateTime.parse(map['ExamTime']) : null,
+			token: map['Token'],
+		);
+	}
+
+	Map<String, dynamic> toJson() {
+		final map = super.toJson();
+		if (physicalExamNumber != null)
+			map['PhysicalExamNumber'] = physicalExamNumber;
+		if (examKey != null)
+			map['ExamKey'] = examKey;
+		if (examData != null)
+			map['ExamData'] = examData;
+		if (examTime != null)
+			map['ExamTime'] = JsonRpcUtils.dateFormat(examTime!);
+		return map;
+	}
+}
+
+

lib/services/vitalFacturyUser.dart

@@ -23,6 +23,8 @@ class VitalFacturyUserService extends JsonRpcClientBase {
 		/// 注册响应实体反序列化处理器
 		FJsonConvert.setDecoder((map) => FacturyUserDTO.fromJson(map));
 		FJsonConvert.setDecoder((map) => PageCollection<FacturyUserDTO>.fromJson(map));
+		FJsonConvert.setDecoder((map) => FacturyExamRegisterResult.fromJson(map));
+		FJsonConvert.setDecoder((map) => FacturyExamDeleteResult.fromJson(map));
 	}
 
 	Future<String> createFacturyUserAsync(CreateFacturyUserRequest request) async {
@@ -64,5 +66,17 @@ class VitalFacturyUserService extends JsonRpcClientBase {
 		return rpcRst;
 	}
 
+	Future<FacturyExamRegisterResult> facturyExamRegisterAsync(FacturyExamRegisterRequest request) async {
+		var rpcRst = await call("FacturyExamRegisterAsync", request);
+		var result = FacturyExamRegisterResult.fromJson(rpcRst as Map<String, dynamic>);
+		return result;
+	}
+
+	Future<FacturyExamDeleteResult> facturyExamDeleteAsync(FacturyExamDeleteRequest request) async {
+		var rpcRst = await call("FacturyExamDeleteAsync", request);
+		var result = FacturyExamDeleteResult.fromJson(rpcRst as Map<String, dynamic>);
+		return result;
+	}
+
 }
 

lib/services/vitalFacturyUser.m.dart

@@ -328,4 +328,176 @@ class RemoveFacturyUserRequest extends TokenRequest{
 	}
 }
 
+class FacturyExamRegisterResult {
+	String? status;
+	String? erroMsg;
+	String? phyId;
+	String? patName;
+	String? gender;
+	String? patAge;
+	String? phone;
+	String? orgName;
+	String? address;
+	String? lisClu;
+	String? phyDate;
+	String? patientID;
+	String? no;
+
+	FacturyExamRegisterResult({
+		this.status,
+		this.erroMsg,
+		this.phyId,
+		this.patName,
+		this.gender,
+		this.patAge,
+		this.phone,
+		this.orgName,
+		this.address,
+		this.lisClu,
+		this.phyDate,
+		this.patientID,
+		this.no,
+	});
+
+	factory FacturyExamRegisterResult.fromJson(Map<String, dynamic> map) {
+		return FacturyExamRegisterResult( 
+			status: map['Status'],
+			erroMsg: map['ErroMsg'],
+			phyId: map['PhyId'],
+			patName: map['PatName'],
+			gender: map['Gender'],
+			patAge: map['PatAge'],
+			phone: map['Phone'],
+			orgName: map['OrgName'],
+			address: map['Address'],
+			lisClu: map['LisClu'],
+			phyDate: map['PhyDate'],
+			patientID: map['PatientID'],
+			no: map['No'],
+		);
+	}
+
+	Map<String, dynamic> toJson() {
+		final map = Map<String, dynamic>();
+		if (status != null)
+			map['Status'] = status;
+		if (erroMsg != null)
+			map['ErroMsg'] = erroMsg;
+		if (phyId != null)
+			map['PhyId'] = phyId;
+		if (patName != null)
+			map['PatName'] = patName;
+		if (gender != null)
+			map['Gender'] = gender;
+		if (patAge != null)
+			map['PatAge'] = patAge;
+		if (phone != null)
+			map['Phone'] = phone;
+		if (orgName != null)
+			map['OrgName'] = orgName;
+		if (address != null)
+			map['Address'] = address;
+		if (lisClu != null)
+			map['LisClu'] = lisClu;
+		if (phyDate != null)
+			map['PhyDate'] = phyDate;
+		if (patientID != null)
+			map['PatientID'] = patientID;
+		if (no != null)
+			map['No'] = no;
+		return map;
+	}
+}
+
+class FacturyExamRegisterRequest extends TokenRequest{
+	String? identity;
+	String? patientName;
+
+	FacturyExamRegisterRequest({
+		this.identity,
+		this.patientName,
+		String? token,
+	}) : super(
+			token: token,
+		);
+
+	factory FacturyExamRegisterRequest.fromJson(Map<String, dynamic> map) {
+		return FacturyExamRegisterRequest( 
+			identity: map['Identity'],
+			patientName: map['PatientName'],
+			token: map['Token'],
+		);
+	}
+
+	Map<String, dynamic> toJson() {
+		final map = super.toJson();
+		if (identity != null)
+			map['Identity'] = identity;
+		if (patientName != null)
+			map['PatientName'] = patientName;
+		return map;
+	}
+}
+
+class FacturyExamDeleteResult {
+	String? status;
+	String? erroMsg;
+
+	FacturyExamDeleteResult({
+		this.status,
+		this.erroMsg,
+	});
+
+	factory FacturyExamDeleteResult.fromJson(Map<String, dynamic> map) {
+		return FacturyExamDeleteResult( 
+			status: map['Status'],
+			erroMsg: map['ErroMsg'],
+		);
+	}
+
+	Map<String, dynamic> toJson() {
+		final map = Map<String, dynamic>();
+		if (status != null)
+			map['Status'] = status;
+		if (erroMsg != null)
+			map['ErroMsg'] = erroMsg;
+		return map;
+	}
+}
+
+class FacturyExamDeleteRequest extends TokenRequest{
+	String? phyId;
+	String? identity;
+	String? patientName;
+
+	FacturyExamDeleteRequest({
+		this.phyId,
+		this.identity,
+		this.patientName,
+		String? token,
+	}) : super(
+			token: token,
+		);
+
+	factory FacturyExamDeleteRequest.fromJson(Map<String, dynamic> map) {
+		return FacturyExamDeleteRequest( 
+			phyId: map['PhyId'],
+			identity: map['Identity'],
+			patientName: map['PatientName'],
+			token: map['Token'],
+		);
+	}
+
+	Map<String, dynamic> toJson() {
+		final map = super.toJson();
+		if (phyId != null)
+			map['PhyId'] = phyId;
+		if (identity != null)
+			map['Identity'] = identity;
+		if (patientName != null)
+			map['PatientName'] = patientName;
+		return map;
+	}
+}
+
 

lib/services/vitalHealthExamBooking.dart

@@ -85,6 +85,11 @@ class VitalHealthExamBookingService extends JsonRpcClientBase {
 		return result;
 	}
 
+	Future<bool> deleteRegiterInfoAsync(DeleteRegiterInfoRequest request) async {
+		var rpcRst = await call("DeleteRegiterInfoAsync", request);
+		return rpcRst;
+	}
+
 	Future<bool> updateRegiterInfoAsync(UpdateRegiterInfoRequest request) async {
 		var rpcRst = await call("UpdateRegiterInfoAsync", request);
 		return rpcRst;

lib/services/vitalHealthExamBooking.m.dart

@@ -671,6 +671,31 @@ class AddRegiterInfoRequest extends TokenRequest{
 	}
 }
 
+class DeleteRegiterInfoRequest extends TokenRequest{
+	String? registerCode;
+
+	DeleteRegiterInfoRequest({
+		this.registerCode,
+		String? token,
+	}) : super(
+			token: token,
+		);
+
+	factory DeleteRegiterInfoRequest.fromJson(Map<String, dynamic> map) {
+		return DeleteRegiterInfoRequest( 
+			registerCode: map['RegisterCode'],
+			token: map['Token'],
+		);
+	}
+
+	Map<String, dynamic> toJson() {
+		final map = super.toJson();
+		if (registerCode != null)
+			map['RegisterCode'] = registerCode;
+		return map;
+	}
+}
+
 class UpdateRegiterInfoRequest extends AddRegiterInfoRequest{
 
 	UpdateRegiterInfoRequest({

lib/services/vitalUser.m.dart

@@ -120,6 +120,7 @@ class UserDTO2 extends BaseDTO{
 	String? signature;
 	String? ultrasoundCode;
 	String? ecgCode;
+	String? facturyUserCode;
 	bool isExistSubordinate;
 	String? fatherOrgCode;
 	String? fatherOrgName;
@@ -149,6 +150,7 @@ class UserDTO2 extends BaseDTO{
 		this.signature,
 		this.ultrasoundCode,
 		this.ecgCode,
+		this.facturyUserCode,
 		this.isExistSubordinate = false,
 		this.fatherOrgCode,
 		this.fatherOrgName,
@@ -187,6 +189,7 @@ class UserDTO2 extends BaseDTO{
 			signature: map['Signature'],
 			ultrasoundCode: map['UltrasoundCode'],
 			ecgCode: map['EcgCode'],
+			facturyUserCode: map['FacturyUserCode'],
 			isExistSubordinate: map['IsExistSubordinate'],
 			fatherOrgCode: map['FatherOrgCode'],
 			fatherOrgName: map['FatherOrgName'],
@@ -246,6 +249,8 @@ class UserDTO2 extends BaseDTO{
 			map['UltrasoundCode'] = ultrasoundCode;
 		if (ecgCode != null)
 			map['EcgCode'] = ecgCode;
+		if (facturyUserCode != null)
+			map['FacturyUserCode'] = facturyUserCode;
 		map['IsExistSubordinate'] = isExistSubordinate;
 		if (fatherOrgCode != null)
 			map['FatherOrgCode'] = fatherOrgCode;