Browse Source

修复请求缺少Keyword、StartTime

loki.wu 1 year ago
parent
commit
5c49382d3e

+ 4 - 0
lib/services/device.m.dart

@@ -785,12 +785,14 @@ class DeviceExtendInfoDTO extends DeviceInfoDTO{
 
 class PageCollection<T> {
 	int currentPage;
+	int pageIndex;
 	int pageSize;
 	int dataCount;
 	List<T>? pageData;
 
 	PageCollection({
 		this.currentPage = 0,
+		this.pageIndex = 0,
 		this.pageSize = 0,
 		this.dataCount = 0,
 		this.pageData,
@@ -804,6 +806,7 @@ class PageCollection<T> {
 		}
 		return PageCollection( 
 			currentPage: map['CurrentPage'],
+			pageIndex: map['PageIndex'],
 			pageSize: map['PageSize'],
 			dataCount: map['DataCount'],
 			pageData: pageDataList,
@@ -813,6 +816,7 @@ class PageCollection<T> {
 	Map<String, dynamic> toJson() {
 		final map = Map<String, dynamic>();
 		map['CurrentPage'] = currentPage;
+		map['PageIndex'] = pageIndex;
 		map['PageSize'] = pageSize;
 		map['DataCount'] = dataCount;
 		if (pageData != null) {

+ 40 - 0
lib/services/other.m.dart

@@ -1273,6 +1273,46 @@ class AuditContractRecordRequest extends TokenRequest{
 	}
 }
 
+class GetTokenRequest {
+	String? grantType;
+	String? account;
+	String? password;
+	String? clientType;
+
+	GetTokenRequest({
+		this.grantType,
+		this.account,
+		this.password,
+		this.clientType,
+	});
+
+	factory GetTokenRequest.fromJson(Map<String, dynamic> map) {
+		return GetTokenRequest( 
+			grantType: map['GrantType'],
+			account: map['Account'],
+			password: map['Password'],
+			clientType: map['ClientType'],
+		);
+	}
+
+	Map<String, dynamic> toJson() {
+		final map = Map<String, dynamic>();
+		if (grantType != null) {
+			map['GrantType'] = grantType;
+		}
+		if (account != null) {
+			map['Account'] = account;
+		}
+		if (password != null) {
+			map['Password'] = password;
+		}
+		if (clientType != null) {
+			map['ClientType'] = clientType;
+		}
+		return map;
+	}
+}
+
 class CreateNotificationRequest extends TokenRequest{
 	String? code;
 	String? version;

+ 15 - 0
lib/services/vitalDiagnosis.m.dart

@@ -231,11 +231,17 @@ class DiagnosisPageRequest extends PageRequest{
 	String? appDataId;
 	String? cardNo;
 	String? patientCode;
+	String? keyword;
+	DateTime? startTime;
+	DateTime? endTime;
 
 	DiagnosisPageRequest({
 		this.appDataId,
 		this.cardNo,
 		this.patientCode,
+		this.keyword,
+		this.startTime,
+		this.endTime,
 		int pageIndex = 0,
 		int pageSize = 0,
 		String? token,
@@ -250,6 +256,9 @@ class DiagnosisPageRequest extends PageRequest{
 			appDataId: map['AppDataId'],
 			cardNo: map['CardNo'],
 			patientCode: map['PatientCode'],
+			keyword: map['Keyword'],
+			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'],
@@ -264,6 +273,12 @@ class DiagnosisPageRequest extends PageRequest{
 			map['CardNo'] = cardNo;
 		if (patientCode != null)
 			map['PatientCode'] = patientCode;
+		if (keyword != null)
+			map['Keyword'] = keyword;
+		if (startTime != null)
+			map['StartTime'] = JsonRpcUtils.dateFormat(startTime!);
+		if (endTime != null)
+			map['EndTime'] = JsonRpcUtils.dateFormat(endTime!);
 		return map;
 	}
 }

+ 5 - 0
lib/services/vitalOrganization.m.dart

@@ -472,11 +472,13 @@ class TeamBaseDTO {
 }
 
 class OrganizationTreeDTO extends BaseDTO{
+	String? code;
 	String? fatherCode;
 	String? organizationName;
 	List<TeamBaseDTO>? teams;
 
 	OrganizationTreeDTO({
+		this.code,
 		this.fatherCode,
 		this.organizationName,
 		this.teams,
@@ -489,6 +491,7 @@ class OrganizationTreeDTO extends BaseDTO{
 
 	factory OrganizationTreeDTO.fromJson(Map<String, dynamic> map) {
 		return OrganizationTreeDTO( 
+			code: map['Code'],
 			fatherCode: map['FatherCode'],
 			organizationName: map['OrganizationName'],
 			teams: map['Teams'] != null ? (map['Teams'] as List).map((e)=>TeamBaseDTO.fromJson(e as Map<String,dynamic>)).toList() : null,
@@ -499,6 +502,8 @@ class OrganizationTreeDTO extends BaseDTO{
 
 	Map<String, dynamic> toJson() {
 		final map = super.toJson();
+		if (code != null)
+			map['Code'] = code;
 		if (fatherCode != null)
 			map['FatherCode'] = fatherCode;
 		if (organizationName != null)