Browse Source

更新接口

loki.wu 1 year ago
parent
commit
df4593f0f9

+ 5 - 0
lib/services/deployPlatform.dart

@@ -165,5 +165,10 @@ class DeployPlatformService extends JsonRpcClientBase {
 		return result;
 	}
 
+	Future<bool> runAutoTestApplication() async {
+		var rpcRst = await call("RunAutoTestApplication", );
+		return rpcRst;
+	}
+
 }
 

+ 31 - 23
lib/services/education.m.dart

@@ -194,7 +194,7 @@ class ApplyCourseRequest extends TokenRequest{
 	String? name;
 	String? courseIntro;
 	String? teacherCode;
-	String? poster;
+	String? cover;
 	DateTime? startTime;
 	int duration;
 	CourseTypeEnum courseType;
@@ -218,7 +218,7 @@ class ApplyCourseRequest extends TokenRequest{
 		this.name,
 		this.courseIntro,
 		this.teacherCode,
-		this.poster,
+		this.cover,
 		this.startTime,
 		this.duration = 0,
 		this.courseType = CourseTypeEnum.Unknown,
@@ -247,7 +247,7 @@ class ApplyCourseRequest extends TokenRequest{
 			name: map['Name'],
 			courseIntro: map['CourseIntro'],
 			teacherCode: map['TeacherCode'],
-			poster: map['Poster'],
+			cover: map['Cover'],
 			startTime: map['StartTime'] != null ? DateTime.parse(map['StartTime']) : null,
 			duration: map['Duration'],
 			courseType: CourseTypeEnum.values.firstWhere((e) => e.index == map['CourseType']),
@@ -278,8 +278,8 @@ class ApplyCourseRequest extends TokenRequest{
 			map['CourseIntro'] = courseIntro;
 		if(teacherCode != null)
 			map['TeacherCode'] = teacherCode;
-		if(poster != null)
-			map['Poster'] = poster;
+		if(cover != null)
+			map['Cover'] = cover;
 		if(startTime != null)
 			map['StartTime'] = JsonRpcUtils.dateFormat(startTime!);
 		map['Duration'] = duration;
@@ -559,6 +559,7 @@ enum StudentCourseStatusEnum {
 	NoSignUp,
 	Joined,
 	Ended,
+	MyCreated,
 }
 
 enum LearnerStatusEnum {
@@ -656,7 +657,7 @@ class BaseCourseInfoDTO {
 	String? courseIntro;
 	String? teacherCode;
 	String? teacherName;
-	String? poster;
+	String? cover;
 	DateTime? startTime;
 	int duration;
 	DateTime? actualStartTime;
@@ -697,7 +698,7 @@ class BaseCourseInfoDTO {
 		this.courseIntro,
 		this.teacherCode,
 		this.teacherName,
-		this.poster,
+		this.cover,
 		this.startTime,
 		this.duration = 0,
 		this.actualStartTime,
@@ -740,7 +741,7 @@ class BaseCourseInfoDTO {
 			courseIntro: map['CourseIntro'],
 			teacherCode: map['TeacherCode'],
 			teacherName: map['TeacherName'],
-			poster: map['Poster'],
+			cover: map['Cover'],
 			startTime: map['StartTime'] != null ? DateTime.parse(map['StartTime']) : null,
 			duration: map['Duration'],
 			actualStartTime: map['ActualStartTime'] != null ? DateTime.parse(map['ActualStartTime']) : null,
@@ -789,8 +790,8 @@ class BaseCourseInfoDTO {
 			map['TeacherCode'] = teacherCode;
 		if(teacherName != null)
 			map['TeacherName'] = teacherName;
-		if(poster != null)
-			map['Poster'] = poster;
+		if(cover != null)
+			map['Cover'] = cover;
 		if(startTime != null)
 			map['StartTime'] = JsonRpcUtils.dateFormat(startTime!);
 		map['Duration'] = duration;
@@ -1057,7 +1058,7 @@ class CourseInfoDetailDTO extends BaseCourseInfoDTO{
 		String? courseIntro,
 		String? teacherCode,
 		String? teacherName,
-		String? poster,
+		String? cover,
 		DateTime? startTime,
 		int duration = 0,
 		DateTime? actualStartTime,
@@ -1097,7 +1098,7 @@ class CourseInfoDetailDTO extends BaseCourseInfoDTO{
 			courseIntro: courseIntro,
 			teacherCode: teacherCode,
 			teacherName: teacherName,
-			poster: poster,
+			cover: cover,
 			startTime: startTime,
 			duration: duration,
 			actualStartTime: actualStartTime,
@@ -1153,7 +1154,7 @@ class CourseInfoDetailDTO extends BaseCourseInfoDTO{
 			courseIntro: map['CourseIntro'],
 			teacherCode: map['TeacherCode'],
 			teacherName: map['TeacherName'],
-			poster: map['Poster'],
+			cover: map['Cover'],
 			startTime: map['StartTime'] != null ? DateTime.parse(map['StartTime']) : null,
 			duration: map['Duration'],
 			actualStartTime: map['ActualStartTime'] != null ? DateTime.parse(map['ActualStartTime']) : null,
@@ -1318,7 +1319,7 @@ class UpdateCourseRequest extends TokenRequest{
 	String? name;
 	String? courseIntro;
 	String? teacherCode;
-	String? poster;
+	String? cover;
 	DateTime? startTime;
 	int duration;
 	CourseTypeEnum courseType;
@@ -1343,7 +1344,7 @@ class UpdateCourseRequest extends TokenRequest{
 		this.name,
 		this.courseIntro,
 		this.teacherCode,
-		this.poster,
+		this.cover,
 		this.startTime,
 		this.duration = 0,
 		this.courseType = CourseTypeEnum.Unknown,
@@ -1373,7 +1374,7 @@ class UpdateCourseRequest extends TokenRequest{
 			name: map['Name'],
 			courseIntro: map['CourseIntro'],
 			teacherCode: map['TeacherCode'],
-			poster: map['Poster'],
+			cover: map['Cover'],
 			startTime: map['StartTime'] != null ? DateTime.parse(map['StartTime']) : null,
 			duration: map['Duration'],
 			courseType: CourseTypeEnum.values.firstWhere((e) => e.index == map['CourseType']),
@@ -1406,8 +1407,8 @@ class UpdateCourseRequest extends TokenRequest{
 			map['CourseIntro'] = courseIntro;
 		if(teacherCode != null)
 			map['TeacherCode'] = teacherCode;
-		if(poster != null)
-			map['Poster'] = poster;
+		if(cover != null)
+			map['Cover'] = cover;
 		if(startTime != null)
 			map['StartTime'] = JsonRpcUtils.dateFormat(startTime!);
 		map['Duration'] = duration;
@@ -3072,6 +3073,7 @@ class RemoteExaminationDTO extends BaseDTO{
 	RemedicalFileDataTypeEnum fileDataType;
 	MeasuredResultsDTO? measuredResult;
 	ScanImageDTO? commentResult;
+	bool isDelete;
 
 	RemoteExaminationDTO({
 		this.code,
@@ -3086,6 +3088,7 @@ class RemoteExaminationDTO extends BaseDTO{
 		this.fileDataType = RemedicalFileDataTypeEnum.VinnoVidSingle,
 		this.measuredResult,
 		this.commentResult,
+		this.isDelete = false,
 		DateTime? createTime,
 		DateTime? updateTime,
 	}) : super(
@@ -3107,6 +3110,7 @@ class RemoteExaminationDTO extends BaseDTO{
 			fileDataType: RemedicalFileDataTypeEnum.values.firstWhere((e) => e.index == map['FileDataType']),
 			measuredResult: map['MeasuredResult'] != null ? MeasuredResultsDTO.fromJson(map['MeasuredResult']) : null,
 			commentResult: map['CommentResult'] != null ? ScanImageDTO.fromJson(map['CommentResult']) : null,
+			isDelete: map['IsDelete'],
 			createTime: map['CreateTime'] != null ? DateTime.parse(map['CreateTime']) : null,
 			updateTime: map['UpdateTime'] != null ? DateTime.parse(map['UpdateTime']) : null,
 		);
@@ -3136,6 +3140,7 @@ class RemoteExaminationDTO extends BaseDTO{
 			map['MeasuredResult'] = measuredResult;
 		if(commentResult != null)
 			map['CommentResult'] = commentResult;
+		map['IsDelete'] = isDelete;
 		return map;
 	}
 }
@@ -3157,6 +3162,7 @@ class RemoteExaminationPageDTO extends RemoteExaminationDTO{
 		RemedicalFileDataTypeEnum fileDataType = RemedicalFileDataTypeEnum.VinnoVidSingle,
 		MeasuredResultsDTO? measuredResult,
 		ScanImageDTO? commentResult,
+		bool isDelete = false,
 		DateTime? createTime,
 		DateTime? updateTime,
 	}) : super(
@@ -3172,6 +3178,7 @@ class RemoteExaminationPageDTO extends RemoteExaminationDTO{
 			fileDataType: fileDataType,
 			measuredResult: measuredResult,
 			commentResult: commentResult,
+			isDelete: isDelete,
 			createTime: createTime,
 			updateTime: updateTime,
 		);
@@ -3191,6 +3198,7 @@ class RemoteExaminationPageDTO extends RemoteExaminationDTO{
 			fileDataType: RemedicalFileDataTypeEnum.values.firstWhere((e) => e.index == map['FileDataType']),
 			measuredResult: map['MeasuredResult'] != null ? MeasuredResultsDTO.fromJson(map['MeasuredResult']) : null,
 			commentResult: map['CommentResult'] != null ? ScanImageDTO.fromJson(map['CommentResult']) : null,
+			isDelete: map['IsDelete'],
 			createTime: map['CreateTime'] != null ? DateTime.parse(map['CreateTime']) : null,
 			updateTime: map['UpdateTime'] != null ? DateTime.parse(map['UpdateTime']) : null,
 		);
@@ -3458,7 +3466,7 @@ class CourseCommonInfoDTO extends BaseCourseAlbumDTO{
 class CourseAlbumExtendDTO extends BaseCourseAlbumDTO{
 	List<CourseInfoDetailDTO >? courseInfos;
 	int studentCount;
-	String? poster;
+	String? cover;
 	List<String >? courseCodes;
 	String? courseIntro;
 	List<String >? courseLabelCodes;
@@ -3476,7 +3484,7 @@ class CourseAlbumExtendDTO extends BaseCourseAlbumDTO{
 	CourseAlbumExtendDTO({
 		this.courseInfos,
 		this.studentCount = 0,
-		this.poster,
+		this.cover,
 		this.courseCodes,
 		this.courseIntro,
 		this.courseLabelCodes,
@@ -3501,7 +3509,7 @@ class CourseAlbumExtendDTO extends BaseCourseAlbumDTO{
 		return CourseAlbumExtendDTO( 
 			courseInfos: map['CourseInfos'] != null ? (map['CourseInfos'] as List).map((e)=>CourseInfoDetailDTO.fromJson(e as Map<String,dynamic>)).toList() : null,
 			studentCount: map['StudentCount'],
-			poster: map['Poster'],
+			cover: map['Cover'],
 			courseCodes: map['CourseCodes'] != null ? map['CourseCodes'].cast<String>().toList() : null,
 			courseIntro: map['CourseIntro'],
 			courseLabelCodes: map['CourseLabelCodes'] != null ? map['CourseLabelCodes'].cast<String>().toList() : null,
@@ -3525,8 +3533,8 @@ class CourseAlbumExtendDTO extends BaseCourseAlbumDTO{
 		if(courseInfos != null)
 			map['CourseInfos'] = courseInfos;
 		map['StudentCount'] = studentCount;
-		if(poster != null)
-			map['Poster'] = poster;
+		if(cover != null)
+			map['Cover'] = cover;
 		if(courseCodes != null)
 			map['CourseCodes'] = courseCodes;
 		if(courseIntro != null)

+ 63 - 0
lib/services/liveConsultation.m.dart

@@ -4938,6 +4938,64 @@ enum FollowUpVisitStatusEnum {
 	VisitCompleted,
 }
 
+class SyncFollowUpVisitRequest extends FollowUpVisitDTO{
+	bool isDelete;
+	DateTime? createTime;
+	DateTime? updateTime;
+
+	SyncFollowUpVisitRequest({
+		this.isDelete = false,
+		this.createTime,
+		this.updateTime,
+		String? followUpVisitCode,
+		String? consultationRecordCode,
+		String? patientName,
+		String? patientPhone,
+		String? generalCase,
+		String? clinicalSituation,
+		String? doctorCode,
+		String? doctorName,
+		DateTime? occurredTime,
+	}) : super(
+			followUpVisitCode: followUpVisitCode,
+			consultationRecordCode: consultationRecordCode,
+			patientName: patientName,
+			patientPhone: patientPhone,
+			generalCase: generalCase,
+			clinicalSituation: clinicalSituation,
+			doctorCode: doctorCode,
+			doctorName: doctorName,
+			occurredTime: occurredTime,
+		);
+
+	factory SyncFollowUpVisitRequest.fromJson(Map<String, dynamic> map) {
+		return SyncFollowUpVisitRequest( 
+			isDelete: map['IsDelete'],
+			createTime: map['CreateTime'] != null ? DateTime.parse(map['CreateTime']) : null,
+			updateTime: map['UpdateTime'] != null ? DateTime.parse(map['UpdateTime']) : null,
+			followUpVisitCode: map['FollowUpVisitCode'],
+			consultationRecordCode: map['ConsultationRecordCode'],
+			patientName: map['PatientName'],
+			patientPhone: map['PatientPhone'],
+			generalCase: map['GeneralCase'],
+			clinicalSituation: map['ClinicalSituation'],
+			doctorCode: map['DoctorCode'],
+			doctorName: map['DoctorName'],
+			occurredTime: map['OccurredTime'] != null ? DateTime.parse(map['OccurredTime']) : null,
+		);
+	}
+
+	Map<String, dynamic> toJson() {
+		final map = super.toJson();
+		map['IsDelete'] = isDelete;
+		if(createTime != null)
+			map['CreateTime'] = JsonRpcUtils.dateFormat(createTime!);
+		if(updateTime != null)
+			map['UpdateTime'] = JsonRpcUtils.dateFormat(updateTime!);
+		return map;
+	}
+}
+
 class SyncConsultationRequest {
 	String? consultationCode;
 	DateTime? createTime;
@@ -4960,6 +5018,7 @@ class SyncConsultationRequest {
 	String? primaryDiagnosis;
 	EvaluateGradeEnum evaluateGradeEnum;
 	FollowUpVisitStatusEnum followUpVisitStatus;
+	List<SyncFollowUpVisitRequest >? syncFollowUpVisitList;
 
 	SyncConsultationRequest({
 		this.consultationCode,
@@ -4983,6 +5042,7 @@ class SyncConsultationRequest {
 		this.primaryDiagnosis,
 		this.evaluateGradeEnum = EvaluateGradeEnum.UnSet,
 		this.followUpVisitStatus = FollowUpVisitStatusEnum.Unknown,
+		this.syncFollowUpVisitList,
 	});
 
 	factory SyncConsultationRequest.fromJson(Map<String, dynamic> map) {
@@ -5008,6 +5068,7 @@ class SyncConsultationRequest {
 			primaryDiagnosis: map['PrimaryDiagnosis'],
 			evaluateGradeEnum: EvaluateGradeEnum.values.firstWhere((e) => e.index == map['EvaluateGradeEnum']),
 			followUpVisitStatus: FollowUpVisitStatusEnum.values.firstWhere((e) => e.index == map['FollowUpVisitStatus']),
+			syncFollowUpVisitList: map['SyncFollowUpVisitList'] != null ? (map['SyncFollowUpVisitList'] as List).map((e)=>SyncFollowUpVisitRequest.fromJson(e as Map<String,dynamic>)).toList() : null,
 		);
 	}
 
@@ -5052,6 +5113,8 @@ class SyncConsultationRequest {
 			map['PrimaryDiagnosis'] = primaryDiagnosis;
 		map['EvaluateGradeEnum'] = evaluateGradeEnum.index;
 		map['FollowUpVisitStatus'] = followUpVisitStatus.index;
+		if(syncFollowUpVisitList != null)
+			map['SyncFollowUpVisitList'] = syncFollowUpVisitList;
 		return map;
 	}
 }

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

@@ -746,6 +746,7 @@ class ServerSettingResult {
 	String? notificationUrl;
 	int liveConsultationRateSeconds;
 	String? cMSUrl;
+	String? courseUrl;
 	bool isSelfRtcService;
 	String? liveProtocol;
 	TransactionStatusEnum liveProtocolType;
@@ -758,6 +759,7 @@ class ServerSettingResult {
 		this.notificationUrl,
 		this.liveConsultationRateSeconds = 0,
 		this.cMSUrl,
+		this.courseUrl,
 		this.isSelfRtcService = false,
 		this.liveProtocol,
 		this.liveProtocolType = TransactionStatusEnum.Applied,
@@ -772,6 +774,7 @@ class ServerSettingResult {
 			notificationUrl: map['NotificationUrl'],
 			liveConsultationRateSeconds: map['LiveConsultationRateSeconds'],
 			cMSUrl: map['CMSUrl'],
+			courseUrl: map['CourseUrl'],
 			isSelfRtcService: map['IsSelfRtcService'],
 			liveProtocol: map['LiveProtocol'],
 			liveProtocolType: TransactionStatusEnum.values.firstWhere((e) => e.index == map['LiveProtocolType']),
@@ -791,6 +794,8 @@ class ServerSettingResult {
 		map['LiveConsultationRateSeconds'] = liveConsultationRateSeconds;
 		if(cMSUrl != null)
 			map['CMSUrl'] = cMSUrl;
+		if(courseUrl != null)
+			map['CourseUrl'] = courseUrl;
 		map['IsSelfRtcService'] = isSelfRtcService;
 		if(liveProtocol != null)
 			map['LiveProtocol'] = liveProtocol;

+ 183 - 21
lib/services/other.m.dart

@@ -2356,7 +2356,7 @@ class AdminApplyCourseRequest extends TokenRequest{
 	String? name;
 	String? courseIntro;
 	String? teacherCode;
-	String? poster;
+	String? cover;
 	DateTime? startTime;
 	int duration;
 	CourseTypeEnum courseType;
@@ -2382,7 +2382,7 @@ class AdminApplyCourseRequest extends TokenRequest{
 		this.name,
 		this.courseIntro,
 		this.teacherCode,
-		this.poster,
+		this.cover,
 		this.startTime,
 		this.duration = 0,
 		this.courseType = CourseTypeEnum.Unknown,
@@ -2413,7 +2413,7 @@ class AdminApplyCourseRequest extends TokenRequest{
 			name: map['Name'],
 			courseIntro: map['CourseIntro'],
 			teacherCode: map['TeacherCode'],
-			poster: map['Poster'],
+			cover: map['Cover'],
 			startTime: map['StartTime'] != null ? DateTime.parse(map['StartTime']) : null,
 			duration: map['Duration'],
 			courseType: CourseTypeEnum.values.firstWhere((e) => e.index == map['CourseType']),
@@ -2446,8 +2446,8 @@ class AdminApplyCourseRequest extends TokenRequest{
 			map['CourseIntro'] = courseIntro;
 		if(teacherCode != null)
 			map['TeacherCode'] = teacherCode;
-		if(poster != null)
-			map['Poster'] = poster;
+		if(cover != null)
+			map['Cover'] = cover;
 		if(startTime != null)
 			map['StartTime'] = JsonRpcUtils.dateFormat(startTime!);
 		map['Duration'] = duration;
@@ -2590,7 +2590,7 @@ class AdminUpdateCourseRequest extends TokenRequest{
 	String? name;
 	String? courseIntro;
 	String? teacherCode;
-	String? poster;
+	String? cover;
 	DateTime? startTime;
 	int duration;
 	CourseTypeEnum courseType;
@@ -2617,7 +2617,7 @@ class AdminUpdateCourseRequest extends TokenRequest{
 		this.name,
 		this.courseIntro,
 		this.teacherCode,
-		this.poster,
+		this.cover,
 		this.startTime,
 		this.duration = 0,
 		this.courseType = CourseTypeEnum.Unknown,
@@ -2649,7 +2649,7 @@ class AdminUpdateCourseRequest extends TokenRequest{
 			name: map['Name'],
 			courseIntro: map['CourseIntro'],
 			teacherCode: map['TeacherCode'],
-			poster: map['Poster'],
+			cover: map['Cover'],
 			startTime: map['StartTime'] != null ? DateTime.parse(map['StartTime']) : null,
 			duration: map['Duration'],
 			courseType: CourseTypeEnum.values.firstWhere((e) => e.index == map['CourseType']),
@@ -2684,8 +2684,8 @@ class AdminUpdateCourseRequest extends TokenRequest{
 			map['CourseIntro'] = courseIntro;
 		if(teacherCode != null)
 			map['TeacherCode'] = teacherCode;
-		if(poster != null)
-			map['Poster'] = poster;
+		if(cover != null)
+			map['Cover'] = cover;
 		if(startTime != null)
 			map['StartTime'] = JsonRpcUtils.dateFormat(startTime!);
 		map['Duration'] = duration;
@@ -2917,9 +2917,11 @@ enum AdminMigratoryRoleEnum {
 
 class AdminMigratoryInfo extends AdminInfoDTO{
 	AdminMigratoryRoleEnum adminRole;
+	bool isDelete;
 
 	AdminMigratoryInfo({
 		this.adminRole = AdminMigratoryRoleEnum.PrimaryAdmin01,
+		this.isDelete = false,
 		String? adminCode,
 		String? fatherCode,
 		String? adminName,
@@ -2960,6 +2962,7 @@ class AdminMigratoryInfo extends AdminInfoDTO{
 	factory AdminMigratoryInfo.fromJson(Map<String, dynamic> map) {
 		return AdminMigratoryInfo( 
 			adminRole: AdminMigratoryRoleEnum.values.firstWhere((e) => e.index == map['AdminRole']),
+			isDelete: map['IsDelete'],
 			adminCode: map['AdminCode'],
 			fatherCode: map['FatherCode'],
 			adminName: map['AdminName'],
@@ -2983,6 +2986,7 @@ class AdminMigratoryInfo extends AdminInfoDTO{
 	Map<String, dynamic> toJson() {
 		final map = super.toJson();
 		map['AdminRole'] = adminRole.index;
+		map['IsDelete'] = isDelete;
 		return map;
 	}
 }
@@ -3013,12 +3017,14 @@ class BatchInsertAdminRequest extends TokenRequest{
 }
 
 class CourseLabelMigratoryInfo extends BaseDTO{
+	bool isDelete;
 	String? code;
 	List<LabelLanguageConfigDTO >? labelLanguageConfigs;
 	OrganizationPatientTypeEnum useObjectType;
 	LabelTypeEnum type;
 
 	CourseLabelMigratoryInfo({
+		this.isDelete = false,
 		this.code,
 		this.labelLanguageConfigs,
 		this.useObjectType = OrganizationPatientTypeEnum.Person,
@@ -3032,6 +3038,7 @@ class CourseLabelMigratoryInfo extends BaseDTO{
 
 	factory CourseLabelMigratoryInfo.fromJson(Map<String, dynamic> map) {
 		return CourseLabelMigratoryInfo( 
+			isDelete: map['IsDelete'],
 			code: map['Code'],
 			labelLanguageConfigs: map['LabelLanguageConfigs'] != null ? (map['LabelLanguageConfigs'] as List).map((e)=>LabelLanguageConfigDTO.fromJson(e as Map<String,dynamic>)).toList() : null,
 			useObjectType: OrganizationPatientTypeEnum.values.firstWhere((e) => e.index == map['UseObjectType']),
@@ -3043,6 +3050,7 @@ class CourseLabelMigratoryInfo extends BaseDTO{
 
 	Map<String, dynamic> toJson() {
 		final map = super.toJson();
+		map['IsDelete'] = isDelete;
 		if(code != null)
 			map['Code'] = code;
 		if(labelLanguageConfigs != null)
@@ -3079,6 +3087,7 @@ class BatchInsertCourseLabelRequest extends TokenRequest{
 }
 
 class CourseMigratoryInfo extends BaseDTO{
+	bool isDelete;
 	String? code;
 	String? name;
 	String? courseIntro;
@@ -3116,6 +3125,7 @@ class CourseMigratoryInfo extends BaseDTO{
 	int playCount;
 
 	CourseMigratoryInfo({
+		this.isDelete = false,
 		this.code,
 		this.name,
 		this.courseIntro,
@@ -3160,6 +3170,7 @@ class CourseMigratoryInfo extends BaseDTO{
 
 	factory CourseMigratoryInfo.fromJson(Map<String, dynamic> map) {
 		return CourseMigratoryInfo( 
+			isDelete: map['IsDelete'],
 			code: map['Code'],
 			name: map['Name'],
 			courseIntro: map['CourseIntro'],
@@ -3202,6 +3213,7 @@ class CourseMigratoryInfo extends BaseDTO{
 
 	Map<String, dynamic> toJson() {
 		final map = super.toJson();
+		map['IsDelete'] = isDelete;
 		if(code != null)
 			map['Code'] = code;
 		if(name != null)
@@ -3266,6 +3278,7 @@ class CourseMigratoryInfo extends BaseDTO{
 }
 
 class VideoMigratoryInfo extends BaseDTO{
+	bool isDelete;
 	String? code;
 	String? name;
 	String? videoToken;
@@ -3282,6 +3295,7 @@ class VideoMigratoryInfo extends BaseDTO{
 	String? srcFileToken;
 
 	VideoMigratoryInfo({
+		this.isDelete = false,
 		this.code,
 		this.name,
 		this.videoToken,
@@ -3305,6 +3319,7 @@ class VideoMigratoryInfo extends BaseDTO{
 
 	factory VideoMigratoryInfo.fromJson(Map<String, dynamic> map) {
 		return VideoMigratoryInfo( 
+			isDelete: map['IsDelete'],
 			code: map['Code'],
 			name: map['Name'],
 			videoToken: map['VideoToken'],
@@ -3326,6 +3341,7 @@ class VideoMigratoryInfo extends BaseDTO{
 
 	Map<String, dynamic> toJson() {
 		final map = super.toJson();
+		map['IsDelete'] = isDelete;
 		if(code != null)
 			map['Code'] = code;
 		if(name != null)
@@ -3408,6 +3424,7 @@ class ExaminationPaperDTO {
 }
 
 class ExaminationQuestionDTO extends BaseDTO{
+	bool isDelete;
 	String? code;
 	String? stem;
 	QuestionTypeEnum questionType;
@@ -3418,6 +3435,7 @@ class ExaminationQuestionDTO extends BaseDTO{
 	bool trueOrFalse;
 
 	ExaminationQuestionDTO({
+		this.isDelete = false,
 		this.code,
 		this.stem,
 		this.questionType = QuestionTypeEnum.Judge,
@@ -3435,6 +3453,7 @@ class ExaminationQuestionDTO extends BaseDTO{
 
 	factory ExaminationQuestionDTO.fromJson(Map<String, dynamic> map) {
 		return ExaminationQuestionDTO( 
+			isDelete: map['IsDelete'],
 			code: map['Code'],
 			stem: map['Stem'],
 			questionType: QuestionTypeEnum.values.firstWhere((e) => e.index == map['QuestionType']),
@@ -3450,6 +3469,7 @@ class ExaminationQuestionDTO extends BaseDTO{
 
 	Map<String, dynamic> toJson() {
 		final map = super.toJson();
+		map['IsDelete'] = isDelete;
 		if(code != null)
 			map['Code'] = code;
 		if(stem != null)
@@ -3473,12 +3493,14 @@ enum RelevanceTypeEnum {
 }
 
 class StudentExaminationDTO extends BaseStudentExaminationDTO{
+	bool isDelete;
 	RelevanceTypeEnum relevanceType;
 	String? relevanceCode;
 	List<ExaminationAnswerDTO >? studentAnswers;
 	int submitCount;
 
 	StudentExaminationDTO({
+		this.isDelete = false,
 		this.relevanceType = RelevanceTypeEnum.Course,
 		this.relevanceCode,
 		this.studentAnswers,
@@ -3498,6 +3520,7 @@ class StudentExaminationDTO extends BaseStudentExaminationDTO{
 
 	factory StudentExaminationDTO.fromJson(Map<String, dynamic> map) {
 		return StudentExaminationDTO( 
+			isDelete: map['IsDelete'],
 			relevanceType: RelevanceTypeEnum.values.firstWhere((e) => e.index == map['RelevanceType']),
 			relevanceCode: map['RelevanceCode'],
 			studentAnswers: map['StudentAnswers'] != null ? (map['StudentAnswers'] as List).map((e)=>ExaminationAnswerDTO.fromJson(e as Map<String,dynamic>)).toList() : null,
@@ -3512,6 +3535,7 @@ class StudentExaminationDTO extends BaseStudentExaminationDTO{
 
 	Map<String, dynamic> toJson() {
 		final map = super.toJson();
+		map['IsDelete'] = isDelete;
 		map['RelevanceType'] = relevanceType.index;
 		if(relevanceCode != null)
 			map['RelevanceCode'] = relevanceCode;
@@ -3523,10 +3547,12 @@ class StudentExaminationDTO extends BaseStudentExaminationDTO{
 }
 
 class ExamMigratoryInfo extends ExaminationPaperDTO{
+	bool isDelete;
 	List<ExaminationQuestionDTO >? examinationQuestions;
 	List<StudentExaminationDTO >? studentExamination;
 
 	ExamMigratoryInfo({
+		this.isDelete = false,
 		this.examinationQuestions,
 		this.studentExamination,
 		String? code,
@@ -3550,6 +3576,7 @@ class ExamMigratoryInfo extends ExaminationPaperDTO{
 
 	factory ExamMigratoryInfo.fromJson(Map<String, dynamic> map) {
 		return ExamMigratoryInfo( 
+			isDelete: map['IsDelete'],
 			examinationQuestions: map['ExaminationQuestions'] != null ? (map['ExaminationQuestions'] as List).map((e)=>ExaminationQuestionDTO.fromJson(e as Map<String,dynamic>)).toList() : null,
 			studentExamination: map['StudentExamination'] != null ? (map['StudentExamination'] as List).map((e)=>StudentExaminationDTO.fromJson(e as Map<String,dynamic>)).toList() : null,
 			code: map['Code'],
@@ -3565,6 +3592,7 @@ class ExamMigratoryInfo extends ExaminationPaperDTO{
 
 	Map<String, dynamic> toJson() {
 		final map = super.toJson();
+		map['IsDelete'] = isDelete;
 		if(examinationQuestions != null)
 			map['ExaminationQuestions'] = examinationQuestions;
 		if(studentExamination != null)
@@ -3621,9 +3649,11 @@ enum DiagnosisModuleEnum {
 }
 
 class DeviceMigratoryInfo extends DeviceInfoDTO{
+	bool isDelete;
 	List<DiagnosisModuleEnum >? diagnosisModule;
 
 	DeviceMigratoryInfo({
+		this.isDelete = false,
 		this.diagnosisModule,
 		String? deviceCode,
 		String? serialNumber,
@@ -3688,6 +3718,7 @@ class DeviceMigratoryInfo extends DeviceInfoDTO{
 
 	factory DeviceMigratoryInfo.fromJson(Map<String, dynamic> map) {
 		return DeviceMigratoryInfo( 
+			isDelete: map['IsDelete'],
 			diagnosisModule: map['DiagnosisModule'] != null ? (map['DiagnosisModule'] as List).map((e)=>DiagnosisModuleEnum.values.firstWhere((i) => i.index == e)).toList() : null,
 			deviceCode: map['DeviceCode'],
 			serialNumber: map['SerialNumber'],
@@ -3723,6 +3754,7 @@ class DeviceMigratoryInfo extends DeviceInfoDTO{
 
 	Map<String, dynamic> toJson() {
 		final map = super.toJson();
+		map['IsDelete'] = isDelete;
 		if(diagnosisModule != null)
 			map['DiagnosisModule'] = diagnosisModule;
 		return map;
@@ -3755,10 +3787,12 @@ class BatchInsertDeviceRequest extends TokenRequest{
 }
 
 class OrganizationMigratoryInfo extends OrganizationDTO{
+	bool isDelete;
 	List<DiagnosisModuleEnum >? diagnosisModule;
 	String? regionName;
 
 	OrganizationMigratoryInfo({
+		this.isDelete = false,
 		this.diagnosisModule,
 		this.regionName,
 		String? description,
@@ -3826,6 +3860,7 @@ class OrganizationMigratoryInfo extends OrganizationDTO{
 
 	factory OrganizationMigratoryInfo.fromJson(Map<String, dynamic> map) {
 		return OrganizationMigratoryInfo( 
+			isDelete: map['IsDelete'],
 			diagnosisModule: map['DiagnosisModule'] != null ? (map['DiagnosisModule'] as List).map((e)=>DiagnosisModuleEnum.values.firstWhere((i) => i.index == e)).toList() : null,
 			regionName: map['RegionName'],
 			description: map['Description'],
@@ -3863,6 +3898,7 @@ class OrganizationMigratoryInfo extends OrganizationDTO{
 
 	Map<String, dynamic> toJson() {
 		final map = super.toJson();
+		map['IsDelete'] = isDelete;
 		if(diagnosisModule != null)
 			map['DiagnosisModule'] = diagnosisModule;
 		if(regionName != null)
@@ -3896,6 +3932,57 @@ class BatchInsertOrganizationRequest extends TokenRequest{
 	}
 }
 
+class MedicalConsortiumDetail {
+	String? name;
+	String? code;
+	OrganizationPatientTypeEnum patientType;
+
+	MedicalConsortiumDetail({
+		this.name,
+		this.code,
+		this.patientType = OrganizationPatientTypeEnum.Person,
+	});
+
+	factory MedicalConsortiumDetail.fromJson(Map<String, dynamic> map) {
+		return MedicalConsortiumDetail( 
+			name: map['Name'],
+			code: map['Code'],
+			patientType: OrganizationPatientTypeEnum.values.firstWhere((e) => e.index == map['PatientType']),
+		);
+	}
+
+	Map<String, dynamic> toJson() {
+		final map = Map<String, dynamic>();
+		if(name != null)
+			map['Name'] = name;
+		if(code != null)
+			map['Code'] = code;
+		map['PatientType'] = patientType.index;
+		return map;
+	}
+}
+
+class BatchInsertMedicalConsortiumRequest {
+	List<MedicalConsortiumDetail >? medicalConsortiumDetails;
+
+	BatchInsertMedicalConsortiumRequest({
+		this.medicalConsortiumDetails,
+	});
+
+	factory BatchInsertMedicalConsortiumRequest.fromJson(Map<String, dynamic> map) {
+		return BatchInsertMedicalConsortiumRequest( 
+			medicalConsortiumDetails: map['MedicalConsortiumDetails'] != null ? (map['MedicalConsortiumDetails'] as List).map((e)=>MedicalConsortiumDetail.fromJson(e as Map<String,dynamic>)).toList() : null,
+		);
+	}
+
+	Map<String, dynamic> toJson() {
+		final map = Map<String, dynamic>();
+		if(medicalConsortiumDetails != null)
+			map['MedicalConsortiumDetails'] = medicalConsortiumDetails;
+		return map;
+	}
+}
+
 enum ReportPosterTypeEnum {
 	Default,
 	BJAid,
@@ -4005,10 +4092,12 @@ class BatchInsertPosterConfigRequest extends TokenRequest{
 }
 
 class ReportTemplateMigratoryInfo extends ReportTemplateDTO{
+	bool isDelete;
 	DateTime? createTime;
 	DateTime? updateTime;
 
 	ReportTemplateMigratoryInfo({
+		this.isDelete = false,
 		this.createTime,
 		this.updateTime,
 		String? reportTemplateCode,
@@ -4044,6 +4133,7 @@ class ReportTemplateMigratoryInfo extends ReportTemplateDTO{
 
 	factory ReportTemplateMigratoryInfo.fromJson(Map<String, dynamic> map) {
 		return ReportTemplateMigratoryInfo( 
+			isDelete: map['IsDelete'],
 			createTime: map['CreateTime'] != null ? DateTime.parse(map['CreateTime']) : null,
 			updateTime: map['UpdateTime'] != null ? DateTime.parse(map['UpdateTime']) : null,
 			reportTemplateCode: map['ReportTemplateCode'],
@@ -4065,6 +4155,7 @@ class ReportTemplateMigratoryInfo extends ReportTemplateDTO{
 
 	Map<String, dynamic> toJson() {
 		final map = super.toJson();
+		map['IsDelete'] = isDelete;
 		if(createTime != null)
 			map['CreateTime'] = JsonRpcUtils.dateFormat(createTime!);
 		if(updateTime != null)
@@ -4098,7 +4189,75 @@ class BatchInsertReportTemplateRequest extends TokenRequest{
 	}
 }
 
+class ReportLabelMigratoryInfo extends ReportLabelDTO{
+	bool isDelete;
+
+	ReportLabelMigratoryInfo({
+		this.isDelete = false,
+		String? reportLabelCode,
+		String? labelName,
+		String? languageCode,
+		ReportLabelUsageTypeEnum usageType = ReportLabelUsageTypeEnum.People,
+		List<String >? labelItems,
+		DateTime? createTime,
+		DateTime? updateTime,
+	}) : super(
+			reportLabelCode: reportLabelCode,
+			labelName: labelName,
+			languageCode: languageCode,
+			usageType: usageType,
+			labelItems: labelItems,
+			createTime: createTime,
+			updateTime: updateTime,
+		);
+
+	factory ReportLabelMigratoryInfo.fromJson(Map<String, dynamic> map) {
+		return ReportLabelMigratoryInfo( 
+			isDelete: map['IsDelete'],
+			reportLabelCode: map['ReportLabelCode'],
+			labelName: map['LabelName'],
+			languageCode: map['LanguageCode'],
+			usageType: ReportLabelUsageTypeEnum.values.firstWhere((e) => e.index == map['UsageType']),
+			labelItems: map['LabelItems'] != null ? map['LabelItems'].cast<String>().toList() : null,
+			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();
+		map['IsDelete'] = isDelete;
+		return map;
+	}
+}
+
+class BatchInsertReportLabelRequest extends TokenRequest{
+	List<ReportLabelMigratoryInfo >? reportLabelData;
+
+	BatchInsertReportLabelRequest({
+		this.reportLabelData,
+		String? token,
+	}) : super(
+			token: token,
+		);
+
+	factory BatchInsertReportLabelRequest.fromJson(Map<String, dynamic> map) {
+		return BatchInsertReportLabelRequest( 
+			reportLabelData: map['ReportLabelData'] != null ? (map['ReportLabelData'] as List).map((e)=>ReportLabelMigratoryInfo.fromJson(e as Map<String,dynamic>)).toList() : null,
+			token: map['Token'],
+		);
+	}
+
+	Map<String, dynamic> toJson() {
+		final map = super.toJson();
+		if(reportLabelData != null)
+			map['ReportLabelData'] = reportLabelData;
+		return map;
+	}
+}
+
 class UserGroupMigratoryInfo extends BaseDTO{
+	bool isDelete;
 	String? code;
 	String? name;
 	int maxPeople;
@@ -4108,6 +4267,7 @@ class UserGroupMigratoryInfo extends BaseDTO{
 	bool isAgent;
 
 	UserGroupMigratoryInfo({
+		this.isDelete = false,
 		this.code,
 		this.name,
 		this.maxPeople = 0,
@@ -4124,6 +4284,7 @@ class UserGroupMigratoryInfo extends BaseDTO{
 
 	factory UserGroupMigratoryInfo.fromJson(Map<String, dynamic> map) {
 		return UserGroupMigratoryInfo( 
+			isDelete: map['IsDelete'],
 			code: map['Code'],
 			name: map['Name'],
 			maxPeople: map['MaxPeople'],
@@ -4138,6 +4299,7 @@ class UserGroupMigratoryInfo extends BaseDTO{
 
 	Map<String, dynamic> toJson() {
 		final map = super.toJson();
+		map['IsDelete'] = isDelete;
 		if(code != null)
 			map['Code'] = code;
 		if(name != null)
@@ -20282,7 +20444,7 @@ class CourseAlbumDetailDTO extends CourseAlbumDTO{
 class BaseCoursePageDTO {
 	String? code;
 	String? name;
-	String? poster;
+	String? cover;
 	DateTime? startTime;
 	DateTime? createTime;
 	int playCount;
@@ -20298,7 +20460,7 @@ class BaseCoursePageDTO {
 	BaseCoursePageDTO({
 		this.code,
 		this.name,
-		this.poster,
+		this.cover,
 		this.startTime,
 		this.createTime,
 		this.playCount = 0,
@@ -20316,7 +20478,7 @@ class BaseCoursePageDTO {
 		return BaseCoursePageDTO( 
 			code: map['Code'],
 			name: map['Name'],
-			poster: map['Poster'],
+			cover: map['Cover'],
 			startTime: map['StartTime'] != null ? DateTime.parse(map['StartTime']) : null,
 			createTime: map['CreateTime'] != null ? DateTime.parse(map['CreateTime']) : null,
 			playCount: map['PlayCount'],
@@ -20337,8 +20499,8 @@ class BaseCoursePageDTO {
 			map['Code'] = code;
 		if(name != null)
 			map['Name'] = name;
-		if(poster != null)
-			map['Poster'] = poster;
+		if(cover != null)
+			map['Cover'] = cover;
 		if(startTime != null)
 			map['StartTime'] = JsonRpcUtils.dateFormat(startTime!);
 		if(createTime != null)
@@ -20364,7 +20526,7 @@ class CoursePageDTO extends BaseCoursePageDTO{
 	CoursePageDTO({
 		String? code,
 		String? name,
-		String? poster,
+		String? cover,
 		DateTime? startTime,
 		DateTime? createTime,
 		int playCount = 0,
@@ -20379,7 +20541,7 @@ class CoursePageDTO extends BaseCoursePageDTO{
 	}) : super(
 			code: code,
 			name: name,
-			poster: poster,
+			cover: cover,
 			startTime: startTime,
 			createTime: createTime,
 			playCount: playCount,
@@ -20397,7 +20559,7 @@ class CoursePageDTO extends BaseCoursePageDTO{
 		return CoursePageDTO( 
 			code: map['Code'],
 			name: map['Name'],
-			poster: map['Poster'],
+			cover: map['Cover'],
 			startTime: map['StartTime'] != null ? DateTime.parse(map['StartTime']) : null,
 			createTime: map['CreateTime'] != null ? DateTime.parse(map['CreateTime']) : null,
 			playCount: map['PlayCount'],
@@ -20502,7 +20664,7 @@ class StudentInCoursePageDTO extends BaseCoursePageDTO{
 		this.isPay = false,
 		String? code,
 		String? name,
-		String? poster,
+		String? cover,
 		DateTime? startTime,
 		DateTime? createTime,
 		int playCount = 0,
@@ -20517,7 +20679,7 @@ class StudentInCoursePageDTO extends BaseCoursePageDTO{
 	}) : super(
 			code: code,
 			name: name,
-			poster: poster,
+			cover: cover,
 			startTime: startTime,
 			createTime: createTime,
 			playCount: playCount,
@@ -20537,7 +20699,7 @@ class StudentInCoursePageDTO extends BaseCoursePageDTO{
 			isPay: map['IsPay'],
 			code: map['Code'],
 			name: map['Name'],
-			poster: map['Poster'],
+			cover: map['Cover'],
 			startTime: map['StartTime'] != null ? DateTime.parse(map['StartTime']) : null,
 			createTime: map['CreateTime'] != null ? DateTime.parse(map['CreateTime']) : null,
 			playCount: map['PlayCount'],

+ 7 - 0
lib/services/payment.dart

@@ -26,6 +26,7 @@ class PaymentService extends JsonRpcClientBase {
 		FJsonConvert.setDecoder((map) => PageResult<OrderDetailDTO>.fromJson(map));
 		FJsonConvert.setDecoder((map) => PayInfoDTO.fromJson(map));
 		FJsonConvert.setDecoder((map) => PayCallbackDTO.fromJson(map));
+		FJsonConvert.setDecoder((map) => PayableTypeDTO.fromJson(map));
 	}
 
 	Future<CreateOrderResultDTO> createOrderAsync(CreateOrderRequest request) async {
@@ -58,5 +59,11 @@ class PaymentService extends JsonRpcClientBase {
 		return result;
 	}
 
+	Future<PayableTypeDTO> getPayableTypes() async {
+		var rpcRst = await call("GetPayableTypes", );
+		var result = PayableTypeDTO.fromJson(rpcRst as Map<String, dynamic>);
+		return result;
+	}
+
 }
 

+ 21 - 0
lib/services/payment.m.dart

@@ -293,4 +293,25 @@ class PayCallbackDTO extends BaseDTO{
 	}
 }
 
+class PayableTypeDTO {
+	List<String >? payTypes;
+
+	PayableTypeDTO({
+		this.payTypes,
+	});
+
+	factory PayableTypeDTO.fromJson(Map<String, dynamic> map) {
+		return PayableTypeDTO( 
+			payTypes: map['PayTypes'] != null ? map['PayTypes'].cast<String>().toList() : null,
+		);
+	}
+
+	Map<String, dynamic> toJson() {
+		final map = Map<String, dynamic>();
+		if(payTypes != null)
+			map['PayTypes'] = payTypes;
+		return map;
+	}
+}
+
 

+ 1 - 1
lib/services/user.dart

@@ -162,7 +162,7 @@ class UserService extends JsonRpcClientBase {
 		return rpcRst;
 	}
 
-	Future<MigrateRecordDTO> queryMigrateTimeAsync(TokenRequest request) async {
+	Future<MigrateRecordDTO> queryMigrateTimeAsync(QueryMigrateTimeRequest request) async {
 		var rpcRst = await call("QueryMigrateTimeAsync", request);
 		var result = MigrateRecordDTO.fromJson(rpcRst as Map<String, dynamic>);
 		return result;

+ 28 - 0
lib/services/user.m.dart

@@ -996,12 +996,14 @@ enum UserMigratoryRoleEnum {
 }
 
 class UserMigratoryInfo extends UserDTO{
+	bool isDelete;
 	String? secretPassword;
 	DateTime? passwordUpdateTime;
 	List<String >? passwordRecords;
 	UserMigratoryRoleEnum userRole;
 
 	UserMigratoryInfo({
+		this.isDelete = false,
 		this.secretPassword,
 		this.passwordUpdateTime,
 		this.passwordRecords,
@@ -1091,6 +1093,7 @@ class UserMigratoryInfo extends UserDTO{
 
 	factory UserMigratoryInfo.fromJson(Map<String, dynamic> map) {
 		return UserMigratoryInfo( 
+			isDelete: map['IsDelete'],
 			secretPassword: map['SecretPassword'],
 			passwordUpdateTime: map['PasswordUpdateTime'] != null ? DateTime.parse(map['PasswordUpdateTime']) : null,
 			passwordRecords: map['PasswordRecords'] != null ? map['PasswordRecords'].cast<String>().toList() : null,
@@ -1140,6 +1143,7 @@ class UserMigratoryInfo extends UserDTO{
 
 	Map<String, dynamic> toJson() {
 		final map = super.toJson();
+		map['IsDelete'] = isDelete;
 		if(secretPassword != null)
 			map['SecretPassword'] = secretPassword;
 		if(passwordUpdateTime != null)
@@ -1211,4 +1215,28 @@ class MigrateRecordDTO {
 	}
 }
 
+class QueryMigrateTimeRequest extends TokenRequest{
+	bool isInitMigreate;
+
+	QueryMigrateTimeRequest({
+		this.isInitMigreate = false,
+		String? token,
+	}) : super(
+			token: token,
+		);
+
+	factory QueryMigrateTimeRequest.fromJson(Map<String, dynamic> map) {
+		return QueryMigrateTimeRequest( 
+			isInitMigreate: map['IsInitMigreate'],
+			token: map['Token'],
+		);
+	}
+
+	Map<String, dynamic> toJson() {
+		final map = super.toJson();
+		map['IsInitMigreate'] = isInitMigreate;
+		return map;
+	}
+}
+