1、rpc更新

lib/services/device.dart

@@ -5,9 +5,9 @@ import 'package:fis_common/json_convert.dart';
 
 import 'device.m.dart';
 
-import 'notification.m.dart';
 import 'researchEdition.m.dart';
 import 'liveConsultation.m.dart';
+import 'notification.m.dart';
 
 
 class DeviceService extends JsonRpcClientBase {
@@ -23,17 +23,12 @@ class DeviceService extends JsonRpcClientBase {
 						timeout: timeout,
 				) {
 		/// 注册响应实体反序列化处理器
-		FJsonConvert.setDecoder((map) => ProbeApplicationSettingInfoDTO.fromJson(map));
-		FJsonConvert.setDecoder((map) => RemoteConnectsRequest.fromJson(map));
-		FJsonConvert.setDecoder((map) => DevicePrinterParameterDTO.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) => LicenseInfoBasicDTO.fromJson(map));
 		FJsonConvert.setDecoder((map) => DeviceInfoDTO.fromJson(map));
+		FJsonConvert.setDecoder((map) => DeviceExtendInfoDTO.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));
@@ -50,83 +45,11 @@ class DeviceService extends JsonRpcClientBase {
 		FJsonConvert.setDecoder((map) => PageResult<DevicePrinterDTO>.fromJson(map));
 		FJsonConvert.setDecoder((map) => DevicePrinterDTO.fromJson(map));
 		FJsonConvert.setDecoder((map) => DeviceConnectStateResult.fromJson(map));
-	}
-
-	Future<ProbeApplicationSettingInfoDTO> getProbeApplicationSettingAsync(GetControlParametersRequest request) async {
-		var rpcRst = await call("GetProbeApplicationSettingAsync", request);
-		var result = ProbeApplicationSettingInfoDTO.fromJson(rpcRst as Map<String, dynamic>);
-		return result;
-	}
-
-	Future<RemoteConnectsRequest> findConnectingDeviceListAsync(GetDeviceRequest request) async {
-		var rpcRst = await call("FindConnectingDeviceListAsync", request);
-		var result = RemoteConnectsRequest.fromJson(rpcRst as Map<String, dynamic>);
-		return result;
-	}
-
-	Future<bool> closeConnectingDeviceListAsync(GetDeviceRequest request) async {
-		var rpcRst = await call("CloseConnectingDeviceListAsync", request);
-		return rpcRst;
-	}
-
-	Future<List<DevicePrinterParameterDTO>> getDevicePrintersForUploadAsync(GetDevicePrintersForUploadRequest request) async {
-		var rpcRst = await call("GetDevicePrintersForUploadAsync", request);
-		var result = (rpcRst as List).map((e)=>DevicePrinterParameterDTO.fromJson(e as Map<String, dynamic>)).toList();
-		return result;
-	}
-
-	Future<List<String>> getDevicePatchTypeListAsync(TokenRequest request) async {
-		var rpcRst = await call("GetDevicePatchTypeListAsync", request);
-		var result = (rpcRst as List).cast<String>().toList();
-		return result;
-	}
-
-	Future<bool> existsDevicePrinterAsync(ExistsDevicePrinterRequest request) async {
-		var rpcRst = await call("ExistsDevicePrinterAsync", request);
-		return rpcRst;
-	}
-
-	Future<bool> batchInsertDevicePrintersDataAsync(MigrateDevicePrinterRequest request) async {
-		var rpcRst = await call("BatchInsertDevicePrintersDataAsync", request);
-		return rpcRst;
-	}
-
-	Future<bool> batchInsertDevicePatchsDataAsync(MigrateDevicePatchRequest request) async {
-		var rpcRst = await call("BatchInsertDevicePatchsDataAsync", request);
-		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> existConnectingDeviceInfoAsync(GetDeviceRequest request) async {
-		var rpcRst = await call("ExistConnectingDeviceInfoAsync", request);
-		return rpcRst;
-	}
-
-	Future<List<LicenseInfoBasicDTO>> getLicenseInfoListAsync(TokenRequest request) async {
-		var rpcRst = await call("GetLicenseInfoListAsync", request);
-		var result = (rpcRst as List).map((e)=>LicenseInfoBasicDTO.fromJson(e as Map<String, dynamic>)).toList();
-		return result;
-	}
-
-	Future<bool> saveLicenseInfoListAsync(SaveLicenseInfoRequest request) async {
-		var rpcRst = await call("SaveLicenseInfoListAsync", request);
-		return rpcRst;
-	}
-
-	Future<bool> saveDongleInfoListAsync(SaveDongleInfoRequest request) async {
-		var rpcRst = await call("SaveDongleInfoListAsync", request);
-		return rpcRst;
+		FJsonConvert.setDecoder((map) => ProbeApplicationSettingInfoDTO.fromJson(map));
+		FJsonConvert.setDecoder((map) => RemoteConnectsRequest.fromJson(map));
+		FJsonConvert.setDecoder((map) => DevicePrinterParameterDTO.fromJson(map));
+		FJsonConvert.setDecoder((map) => PageCollection<SelectItemDTO>.fromJson(map));
+		FJsonConvert.setDecoder((map) => LicenseInfoBasicDTO.fromJson(map));
 	}
 
 	Future<bool> heartRateAsync(TokenRequest request) async {
@@ -584,5 +507,82 @@ class DeviceService extends JsonRpcClientBase {
 		return rpcRst;
 	}
 
+	Future<ProbeApplicationSettingInfoDTO> getProbeApplicationSettingAsync(GetControlParametersRequest request) async {
+		var rpcRst = await call("GetProbeApplicationSettingAsync", request);
+		var result = ProbeApplicationSettingInfoDTO.fromJson(rpcRst as Map<String, dynamic>);
+		return result;
+	}
+
+	Future<RemoteConnectsRequest> findConnectingDeviceListAsync(GetDeviceRequest request) async {
+		var rpcRst = await call("FindConnectingDeviceListAsync", request);
+		var result = RemoteConnectsRequest.fromJson(rpcRst as Map<String, dynamic>);
+		return result;
+	}
+
+	Future<bool> closeConnectingDeviceListAsync(GetDeviceRequest request) async {
+		var rpcRst = await call("CloseConnectingDeviceListAsync", request);
+		return rpcRst;
+	}
+
+	Future<List<DevicePrinterParameterDTO>> getDevicePrintersForUploadAsync(GetDevicePrintersForUploadRequest request) async {
+		var rpcRst = await call("GetDevicePrintersForUploadAsync", request);
+		var result = (rpcRst as List).map((e)=>DevicePrinterParameterDTO.fromJson(e as Map<String, dynamic>)).toList();
+		return result;
+	}
+
+	Future<List<String>> getDevicePatchTypeListAsync(TokenRequest request) async {
+		var rpcRst = await call("GetDevicePatchTypeListAsync", request);
+		var result = (rpcRst as List).cast<String>().toList();
+		return result;
+	}
+
+	Future<bool> existsDevicePrinterAsync(ExistsDevicePrinterRequest request) async {
+		var rpcRst = await call("ExistsDevicePrinterAsync", request);
+		return rpcRst;
+	}
+
+	Future<bool> batchInsertDevicePrintersDataAsync(MigrateDevicePrinterRequest request) async {
+		var rpcRst = await call("BatchInsertDevicePrintersDataAsync", request);
+		return rpcRst;
+	}
+
+	Future<bool> batchInsertDevicePatchsDataAsync(MigrateDevicePatchRequest request) async {
+		var rpcRst = await call("BatchInsertDevicePatchsDataAsync", request);
+		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> existConnectingDeviceInfoAsync(GetDeviceRequest request) async {
+		var rpcRst = await call("ExistConnectingDeviceInfoAsync", request);
+		return rpcRst;
+	}
+
+	Future<List<LicenseInfoBasicDTO>> getLicenseInfoListAsync(TokenRequest request) async {
+		var rpcRst = await call("GetLicenseInfoListAsync", request);
+		var result = (rpcRst as List).map((e)=>LicenseInfoBasicDTO.fromJson(e as Map<String, dynamic>)).toList();
+		return result;
+	}
+
+	Future<bool> saveLicenseInfoListAsync(SaveLicenseInfoRequest request) async {
+		var rpcRst = await call("SaveLicenseInfoListAsync", request);
+		return rpcRst;
+	}
+
+	Future<bool> saveDongleInfoListAsync(SaveDongleInfoRequest request) async {
+		var rpcRst = await call("SaveDongleInfoListAsync", request);
+		return rpcRst;
+	}
+
 }
 

lib/services/other.m.dart

@@ -19825,6 +19825,63 @@ class MeasureSpecialImplDTO {
 	}
 }
 
+class MeasureUnitDetailDTO {
+	String? type;
+	List<String>? unitNames;
+	List<int>? units;
+
+	MeasureUnitDetailDTO({
+		this.type,
+		this.unitNames,
+		this.units,
+	});
+
+	factory MeasureUnitDetailDTO.fromJson(Map<String, dynamic> map) {
+		return MeasureUnitDetailDTO( 
+			type: map['Type'],
+			unitNames: map['UnitNames']?.cast<String>().toList(),
+			units: map['Units']?.cast<int>().toList(),
+		);
+	}
+
+	Map<String, dynamic> toJson() {
+		final map = Map<String, dynamic>();
+		if (type != null)
+			map['Type'] = type;
+		if (unitNames != null)
+			map['UnitNames'] = unitNames;
+		if (units != null)
+			map['Units'] = units;
+		return map;
+	}
+}
+
+class MeasureUnitSettingDTO {
+	String? version;
+	List<MeasureUnitDetailDTO>? dataList;
+
+	MeasureUnitSettingDTO({
+		this.version,
+		this.dataList,
+	});
+
+	factory MeasureUnitSettingDTO.fromJson(Map<String, dynamic> map) {
+		return MeasureUnitSettingDTO( 
+			version: map['Version'],
+			dataList: map['DataList'] != null ? (map['DataList'] as List).map((e)=>MeasureUnitDetailDTO.fromJson(e as Map<String,dynamic>)).toList() : null,
+		);
+	}
+
+	Map<String, dynamic> toJson() {
+		final map = Map<String, dynamic>();
+		if (version != null)
+			map['Version'] = version;
+		if (dataList != null)
+			map['DataList'] = dataList;
+		return map;
+	}
+}
+
 class MultiMethodItemDTO extends MeasureItemDTO{
 
 	MultiMethodItemDTO({

lib/services/remedical.m.dart

@@ -781,12 +781,14 @@ class OutputItemMetaDTO {
 	String? description;
 	int unit;
 	bool? isWorking;
+	List<int>? units;
 
 	OutputItemMetaDTO({
 		this.name,
 		this.description,
 		this.unit = 0,
 		this.isWorking,
+		this.units,
 	});
 
 	factory OutputItemMetaDTO.fromJson(Map<String, dynamic> map) {
@@ -795,6 +797,7 @@ class OutputItemMetaDTO {
 			description: map['Description'],
 			unit: map['Unit'],
 			isWorking: map['IsWorking'],
+			units: map['Units']?.cast<int>().toList(),
 		);
 	}
 
@@ -807,6 +810,8 @@ class OutputItemMetaDTO {
 		map['Unit'] = unit;
 		if (isWorking != null)
 			map['IsWorking'] = isWorking;
+		if (units != null)
+			map['Units'] = units;
 		return map;
 	}
 }
@@ -1673,7 +1678,7 @@ enum Unit {
 	mm3,
 	ml,
 	L,
-	placeHolder_64,
+	mil,
 	placeHolder_65,
 	placeHolder_66,
 	placeHolder_67,
@@ -1703,7 +1708,7 @@ enum Unit {
 	mls,
 	mlmin,
 	Lmin,
-	placeHolder_94,
+	milmin,
 	placeHolder_95,
 	placeHolder_96,
 	placeHolder_97,
@@ -1765,7 +1770,7 @@ enum Unit {
 	cm3minm2,
 	mlminm2,
 	Lminm2,
-	placeHolder_156,
+	mlmincm2,
 	placeHolder_157,
 	placeHolder_158,
 	placeHolder_159,

lib/services/vitalFacturyPostHistory.dart

@@ -57,5 +57,10 @@ class VitalFacturyPostHistoryService extends JsonRpcClientBase {
 		return rpcRst;
 	}
 
+	Future<bool> createJingQiReportPostHistoryAsync(CreateJingQiReportPostHistoryRequest request) async {
+		var rpcRst = await call("CreateJingQiReportPostHistoryAsync", request);
+		return rpcRst;
+	}
+
 }
 

lib/services/vitalFacturyPostHistory.m.dart

@@ -312,4 +312,29 @@ class CreateJingQiExamPostHistoryRequest extends TokenRequest{
 	}
 }
 
+class CreateJingQiReportPostHistoryRequest extends TokenRequest{
+	String? reportCode;
+
+	CreateJingQiReportPostHistoryRequest({
+		this.reportCode,
+		String? token,
+	}) : super(
+			token: token,
+		);
+
+	factory CreateJingQiReportPostHistoryRequest.fromJson(Map<String, dynamic> map) {
+		return CreateJingQiReportPostHistoryRequest( 
+			reportCode: map['ReportCode'],
+			token: map['Token'],
+		);
+	}
+
+	Map<String, dynamic> toJson() {
+		final map = super.toJson();
+		if (reportCode != null)
+			map['ReportCode'] = reportCode;
+		return map;
+	}
+}
+