jeremy 9 mesiacov pred
rodič
commit
2044459798

+ 4 - 1
src/jsonrpc/services/device.m.js

@@ -54,7 +54,7 @@ exports.PeripheralDeviceDTO = PeripheralDeviceDTO;
 var CreateDeviceRequest = /** @class */ (function (_super) {
     __extends(CreateDeviceRequest, _super);
     function CreateDeviceRequest(_a) {
-        var code = _a.code, serialNumber = _a.serialNumber, model = _a.model, softwareVersion = _a.softwareVersion, oSVersion = _a.oSVersion, description = _a.description, organizationCode = _a.organizationCode, teamCode = _a.teamCode, peripheralPermissions = _a.peripheralPermissions, token = _a.token;
+        var code = _a.code, serialNumber = _a.serialNumber, model = _a.model, softwareVersion = _a.softwareVersion, oSVersion = _a.oSVersion, description = _a.description, organizationCode = _a.organizationCode, teamCode = _a.teamCode, peripheralPermissions = _a.peripheralPermissions, deviceType = _a.deviceType, token = _a.token;
         var _this = _super.call(this, {
             token: token,
         }) || this;
@@ -67,6 +67,7 @@ var CreateDeviceRequest = /** @class */ (function (_super) {
         _this.organizationCode = organizationCode;
         _this.teamCode = teamCode;
         _this.peripheralPermissions = peripheralPermissions;
+        _this.deviceType = deviceType || 0;
         _this.token = token;
         return _this;
     }
@@ -80,6 +81,7 @@ var CreateDeviceRequest = /** @class */ (function (_super) {
             organizationCode: map['OrganizationCode'],
             teamCode: map['TeamCode'],
             peripheralPermissions: map['PeripheralPermissions'] && map['PeripheralPermissions'].length > 0 ? map['PeripheralPermissions'].map(function (e) { return PeripheralDeviceDTO.fromJson(e); }) : null,
+            deviceType: map['DeviceType'],
             token: map['Token'], });
     };
     CreateDeviceRequest.prototype.toJson = function () {
@@ -102,6 +104,7 @@ var CreateDeviceRequest = /** @class */ (function (_super) {
             map['TeamCode'] = this.teamCode;
         if (this.peripheralPermissions != null)
             map['PeripheralPermissions'] = this.peripheralPermissions;
+        map['DeviceType'] = this.deviceType;
         return map;
     };
     return CreateDeviceRequest;

+ 5 - 0
src/jsonrpc/services/device.m.ts

@@ -62,6 +62,7 @@ export class CreateDeviceRequest extends TokenRequest {
 	organizationCode: String;
 	teamCode: String;
 	peripheralPermissions: PeripheralDeviceDTO[];
+	deviceType: Number;
 
 	constructor({
 		code,
@@ -73,6 +74,7 @@ export class CreateDeviceRequest extends TokenRequest {
 		organizationCode,
 		teamCode,
 		peripheralPermissions,
+		deviceType,
 		token,
 	}) {
 		super({
@@ -87,6 +89,7 @@ export class CreateDeviceRequest extends TokenRequest {
 		this.organizationCode = organizationCode;
 		this.teamCode = teamCode;
 		this.peripheralPermissions = peripheralPermissions;
+		this.deviceType = deviceType||0;
 		this.token = token;
 	}
 
@@ -101,6 +104,7 @@ export class CreateDeviceRequest extends TokenRequest {
 			organizationCode: map['OrganizationCode'],
 			teamCode: map['TeamCode'],
 			peripheralPermissions: map['PeripheralPermissions']&& map['PeripheralPermissions'].length>0 ? (map['PeripheralPermissions'] as any[]).map((e)=>PeripheralDeviceDTO.fromJson(e)) : null,
+			deviceType: map['DeviceType'],
 			token: map['Token'],
 }		);
 	}
@@ -125,6 +129,7 @@ export class CreateDeviceRequest extends TokenRequest {
 			map['TeamCode'] = this.teamCode;
 		if(this.peripheralPermissions != null)
 			map['PeripheralPermissions'] = this.peripheralPermissions;
+		map['DeviceType'] = this.deviceType;
 		return map;
 	}
 }

+ 13 - 0
src/jsonrpc/services/electrocardiogram.js

@@ -103,6 +103,19 @@ var VitalElectrocardiogramService = /** @class */ (function (_super) {
             });
         });
     };
+    VitalElectrocardiogramService.prototype.updateElectrocardiogramExamInfoRecordAsync = function (request) {
+        return __awaiter(this, void 0, void 0, function () {
+            var rpcRst;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.call("UpdateElectrocardiogramExamInfoRecordAsync", request)];
+                    case 1:
+                        rpcRst = _a.sent();
+                        return [2 /*return*/, rpcRst];
+                }
+            });
+        });
+    };
     return VitalElectrocardiogramService;
 }(client_base_1.default));
 exports.VitalElectrocardiogramService = VitalElectrocardiogramService;

+ 34 - 2
src/jsonrpc/services/electrocardiogram.m.js

@@ -15,7 +15,7 @@ var __extends = (this && this.__extends) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GetElectrocardiogramRecordByPhysicalExamNumberRequest = exports.ElectrocardiogramRecordPageRequest = exports.GetElectrocardiogramRecordRequest = exports.ElectrocardiogramRecord = void 0;
+exports.UpdateElectrocardiogramExamInfoRecordRequest = exports.GetElectrocardiogramRecordByPhysicalExamNumberRequest = exports.ElectrocardiogramRecordPageRequest = exports.GetElectrocardiogramRecordRequest = exports.ElectrocardiogramRecord = void 0;
 var healthExamBooking_m_1 = require("./healthExamBooking.m");
 var exam_m_1 = require("./exam.m");
 var authentication_m_1 = require("./authentication.m");
@@ -129,7 +129,7 @@ exports.GetElectrocardiogramRecordRequest = GetElectrocardiogramRecordRequest;
 var ElectrocardiogramRecordPageRequest = /** @class */ (function (_super) {
     __extends(ElectrocardiogramRecordPageRequest, _super);
     function ElectrocardiogramRecordPageRequest(_a) {
-        var state = _a.state, keyWord = _a.keyWord, startTime = _a.startTime, endTime = _a.endTime, _b = _a.pageIndex, pageIndex = _b === void 0 ? 0 : _b, _c = _a.pageSize, pageSize = _c === void 0 ? 0 : _c, token = _a.token;
+        var state = _a.state, keyWord = _a.keyWord, startTime = _a.startTime, endTime = _a.endTime, isQuerySubordinate = _a.isQuerySubordinate, _b = _a.pageIndex, pageIndex = _b === void 0 ? 0 : _b, _c = _a.pageSize, pageSize = _c === void 0 ? 0 : _c, token = _a.token;
         var _this = _super.call(this, {
             pageIndex: pageIndex,
             pageSize: pageSize,
@@ -139,6 +139,7 @@ var ElectrocardiogramRecordPageRequest = /** @class */ (function (_super) {
         _this.keyWord = keyWord;
         _this.startTime = startTime;
         _this.endTime = endTime;
+        _this.isQuerySubordinate = isQuerySubordinate || false;
         _this.pageIndex = pageIndex || 0;
         _this.pageSize = pageSize || 0;
         _this.token = token;
@@ -149,6 +150,7 @@ var ElectrocardiogramRecordPageRequest = /** @class */ (function (_super) {
             keyWord: map['KeyWord'],
             startTime: map['StartTime'] !== null ? new Date(map['StartTime']) : null,
             endTime: map['EndTime'] !== null ? new Date(map['EndTime']) : null,
+            isQuerySubordinate: map['IsQuerySubordinate'],
             pageIndex: map['PageIndex'],
             pageSize: map['PageSize'],
             token: map['Token'],
@@ -164,6 +166,7 @@ var ElectrocardiogramRecordPageRequest = /** @class */ (function (_super) {
             map['StartTime'] = JsonRpcUtils_1.default.dateFormat(this.startTime);
         if (this.endTime != null)
             map['EndTime'] = JsonRpcUtils_1.default.dateFormat(this.endTime);
+        map['IsQuerySubordinate'] = this.isQuerySubordinate;
         return map;
     };
     return ElectrocardiogramRecordPageRequest;
@@ -194,3 +197,32 @@ var GetElectrocardiogramRecordByPhysicalExamNumberRequest = /** @class */ (funct
     return GetElectrocardiogramRecordByPhysicalExamNumberRequest;
 }(authentication_m_1.TokenRequest));
 exports.GetElectrocardiogramRecordByPhysicalExamNumberRequest = GetElectrocardiogramRecordByPhysicalExamNumberRequest;
+var UpdateElectrocardiogramExamInfoRecordRequest = /** @class */ (function (_super) {
+    __extends(UpdateElectrocardiogramExamInfoRecordRequest, _super);
+    function UpdateElectrocardiogramExamInfoRecordRequest(_a) {
+        var code = _a.code, examData = _a.examData, token = _a.token;
+        var _this = _super.call(this, {
+            token: token,
+        }) || this;
+        _this.code = code;
+        _this.examData = examData;
+        _this.token = token;
+        return _this;
+    }
+    UpdateElectrocardiogramExamInfoRecordRequest.fromJson = function (map) {
+        return new UpdateElectrocardiogramExamInfoRecordRequest({ code: map['Code'],
+            examData: map['ExamData'],
+            token: map['Token'],
+        });
+    };
+    UpdateElectrocardiogramExamInfoRecordRequest.prototype.toJson = function () {
+        var map = _super.prototype.toJson.call(this);
+        if (this.code != null)
+            map['Code'] = this.code;
+        if (this.examData != null)
+            map['ExamData'] = this.examData;
+        return map;
+    };
+    return UpdateElectrocardiogramExamInfoRecordRequest;
+}(authentication_m_1.TokenRequest));
+exports.UpdateElectrocardiogramExamInfoRecordRequest = UpdateElectrocardiogramExamInfoRecordRequest;

+ 40 - 0
src/jsonrpc/services/electrocardiogram.m.ts

@@ -152,12 +152,14 @@ export class ElectrocardiogramRecordPageRequest extends PageRequest {
 	keyWord: String;
 	startTime: Date|null;
 	endTime: Date|null;
+	isQuerySubordinate: boolean;
 
 	constructor({
 		state,
 		keyWord,
 		startTime,
 		endTime,
+		isQuerySubordinate,
 		pageIndex= 0,
 		pageSize= 0,
 		token,
@@ -171,6 +173,7 @@ export class ElectrocardiogramRecordPageRequest extends PageRequest {
 		this.keyWord = keyWord;
 		this.startTime = startTime;
 		this.endTime = endTime;
+		this.isQuerySubordinate = isQuerySubordinate||false;
 		this.pageIndex = pageIndex||0;
 		this.pageSize = pageSize||0;
 		this.token = token;
@@ -182,6 +185,7 @@ export class ElectrocardiogramRecordPageRequest extends PageRequest {
 			keyWord: map['KeyWord'],
 			startTime: map['StartTime'] !== null ? new Date(map['StartTime']) : null,
 			endTime: map['EndTime'] !== null ? new Date(map['EndTime']) : null,
+			isQuerySubordinate: map['IsQuerySubordinate'],
 			pageIndex: map['PageIndex'],
 			pageSize: map['PageSize'],
 			token: map['Token'],
@@ -198,6 +202,7 @@ export class ElectrocardiogramRecordPageRequest extends PageRequest {
 			map['StartTime'] = JsonRpcUtils.dateFormat(this.startTime!);
 		if(this.endTime != null)
 			map['EndTime'] = JsonRpcUtils.dateFormat(this.endTime!);
+		map['IsQuerySubordinate'] = this.isQuerySubordinate;
 		return map;
 	}
 }
@@ -231,4 +236,39 @@ export class GetElectrocardiogramRecordByPhysicalExamNumberRequest extends Token
 	}
 }
 
+export class UpdateElectrocardiogramExamInfoRecordRequest extends TokenRequest {
+	code: String;
+	examData: String;
+
+	constructor({
+		code,
+		examData,
+		token,
+	}) {
+		super({
+		token,
+		});
+		this.code = code;
+		this.examData = examData;
+		this.token = token;
+	}
+
+	static fromJson(map: { [key: string]: any }): UpdateElectrocardiogramExamInfoRecordRequest {
+		return new UpdateElectrocardiogramExamInfoRecordRequest( 
+{ 			code: map['Code'],
+			examData: map['ExamData'],
+			token: map['Token'],
+}		);
+	}
+
+	toJson(): Record<string, unknown> {
+		const map: Record<string, unknown> = super.toJson();
+		if(this.code != null)
+			map['Code'] = this.code;
+		if(this.examData != null)
+			map['ExamData'] = this.examData;
+		return map;
+	}
+}
+
 

+ 6 - 1
src/jsonrpc/services/electrocardiogram.ts

@@ -1,5 +1,5 @@
 import JsonRpcClientBase from '../client_base'
-import {ElectrocardiogramRecord,GetElectrocardiogramRecordRequest,ElectrocardiogramRecordPageRequest,GetElectrocardiogramRecordByPhysicalExamNumberRequest,} from  './electrocardiogram.m'
+import {ElectrocardiogramRecord,GetElectrocardiogramRecordRequest,ElectrocardiogramRecordPageRequest,GetElectrocardiogramRecordByPhysicalExamNumberRequest,UpdateElectrocardiogramExamInfoRecordRequest,} from  './electrocardiogram.m'
 import { GetUserInfoByVitalOpenIdRequest,PatientGenderEnum,PersonInfoBaseDTO,FaceScanErrorTypeEnum,PersonInfoByFaceImageDTO,GetPersonInfoByFaceImageRequest,RegisterConfirmRequest,PersonRegisterDTO,PersonInfoFullDTO,PageCollection,GetPersonPageRequest,GetPersonRequest,DeletePersonRequest,EnterPersonFaceQueryResult,EnterPersonFaceQueryRequest,EnterPersonFaceRequest, } from './register.m';
 
 
@@ -38,5 +38,10 @@ export class VitalElectrocardiogramService extends JsonRpcClientBase {
 		return result;
 	}
 
+	async updateElectrocardiogramExamInfoRecordAsync(request: UpdateElectrocardiogramExamInfoRecordRequest): Promise<boolean> {
+		var rpcRst = await this.call("UpdateElectrocardiogramExamInfoRecordAsync", request);
+		return rpcRst;
+	}
+
 }
 

+ 1 - 4
src/jsonrpc/services/healthExamBooking.m.js

@@ -873,7 +873,7 @@ exports.RegisterInfoDTO = RegisterInfoDTO;
 var GetRegiterInfoPageRequest = /** @class */ (function (_super) {
     __extends(GetRegiterInfoPageRequest, _super);
     function GetRegiterInfoPageRequest(_a) {
-        var keyword = _a.keyword, operatorCode = _a.operatorCode, startTime = _a.startTime, endTime = _a.endTime, iDCardNo = _a.iDCardNo, projectType = _a.projectType, isQuerySubordinate = _a.isQuerySubordinate, _b = _a.pageIndex, pageIndex = _b === void 0 ? 0 : _b, _c = _a.pageSize, pageSize = _c === void 0 ? 0 : _c, token = _a.token;
+        var keyword = _a.keyword, operatorCode = _a.operatorCode, startTime = _a.startTime, endTime = _a.endTime, iDCardNo = _a.iDCardNo, projectType = _a.projectType, _b = _a.pageIndex, pageIndex = _b === void 0 ? 0 : _b, _c = _a.pageSize, pageSize = _c === void 0 ? 0 : _c, token = _a.token;
         var _this = _super.call(this, {
             pageIndex: pageIndex,
             pageSize: pageSize,
@@ -885,7 +885,6 @@ var GetRegiterInfoPageRequest = /** @class */ (function (_super) {
         _this.endTime = endTime;
         _this.iDCardNo = iDCardNo;
         _this.projectType = projectType;
-        _this.isQuerySubordinate = isQuerySubordinate || false;
         _this.pageIndex = pageIndex || 0;
         _this.pageSize = pageSize || 0;
         _this.token = token;
@@ -898,7 +897,6 @@ var GetRegiterInfoPageRequest = /** @class */ (function (_super) {
             endTime: map['EndTime'] !== null ? new Date(map['EndTime']) : null,
             iDCardNo: map['IDCardNo'],
             projectType: map['ProjectType'],
-            isQuerySubordinate: map['IsQuerySubordinate'],
             pageIndex: map['PageIndex'],
             pageSize: map['PageSize'],
             token: map['Token'],
@@ -918,7 +916,6 @@ var GetRegiterInfoPageRequest = /** @class */ (function (_super) {
             map['IDCardNo'] = this.iDCardNo;
         if (this.projectType != null)
             map['ProjectType'] = this.projectType;
-        map['IsQuerySubordinate'] = this.isQuerySubordinate;
         return map;
     };
     return GetRegiterInfoPageRequest;

+ 0 - 5
src/jsonrpc/services/healthExamBooking.m.ts

@@ -1162,7 +1162,6 @@ export class GetRegiterInfoPageRequest extends PageRequest {
 	endTime: Date|null;
 	iDCardNo: String;
 	projectType: VitalProjectTypeEnum|null;
-	isQuerySubordinate: boolean;
 
 	constructor({
 		keyword,
@@ -1171,7 +1170,6 @@ export class GetRegiterInfoPageRequest extends PageRequest {
 		endTime,
 		iDCardNo,
 		projectType,
-		isQuerySubordinate,
 		pageIndex= 0,
 		pageSize= 0,
 		token,
@@ -1187,7 +1185,6 @@ export class GetRegiterInfoPageRequest extends PageRequest {
 		this.endTime = endTime;
 		this.iDCardNo = iDCardNo;
 		this.projectType = projectType;
-		this.isQuerySubordinate = isQuerySubordinate||false;
 		this.pageIndex = pageIndex||0;
 		this.pageSize = pageSize||0;
 		this.token = token;
@@ -1201,7 +1198,6 @@ export class GetRegiterInfoPageRequest extends PageRequest {
 			endTime: map['EndTime'] !== null ? new Date(map['EndTime']) : null,
 			iDCardNo: map['IDCardNo'],
 			projectType: map['ProjectType'] ,
-			isQuerySubordinate: map['IsQuerySubordinate'],
 			pageIndex: map['PageIndex'],
 			pageSize: map['PageSize'],
 			token: map['Token'],
@@ -1222,7 +1218,6 @@ export class GetRegiterInfoPageRequest extends PageRequest {
 			map['IDCardNo'] = this.iDCardNo;
 		if(this.projectType != null)
 			map['ProjectType'] = this.projectType;
-		map['IsQuerySubordinate'] = this.isQuerySubordinate;
 		return map;
 	}
 }

+ 9 - 1
src/jsonrpc/services/user.m.js

@@ -288,7 +288,7 @@ exports.GetUserByKeyRequest = GetUserByKeyRequest;
 var UserPageRequest = /** @class */ (function (_super) {
     __extends(UserPageRequest, _super);
     function UserPageRequest(_a) {
-        var keyword = _a.keyword, startTime = _a.startTime, endTime = _a.endTime, _b = _a.pageIndex, pageIndex = _b === void 0 ? 0 : _b, _c = _a.pageSize, pageSize = _c === void 0 ? 0 : _c, token = _a.token;
+        var keyword = _a.keyword, startTime = _a.startTime, endTime = _a.endTime, organizationCode = _a.organizationCode, teamCode = _a.teamCode, _b = _a.pageIndex, pageIndex = _b === void 0 ? 0 : _b, _c = _a.pageSize, pageSize = _c === void 0 ? 0 : _c, token = _a.token;
         var _this = _super.call(this, {
             pageIndex: pageIndex,
             pageSize: pageSize,
@@ -297,6 +297,8 @@ var UserPageRequest = /** @class */ (function (_super) {
         _this.keyword = keyword;
         _this.startTime = startTime;
         _this.endTime = endTime;
+        _this.organizationCode = organizationCode;
+        _this.teamCode = teamCode;
         _this.pageIndex = pageIndex || 0;
         _this.pageSize = pageSize || 0;
         _this.token = token;
@@ -306,6 +308,8 @@ var UserPageRequest = /** @class */ (function (_super) {
         return new UserPageRequest({ keyword: map['Keyword'],
             startTime: map['StartTime'] !== null ? new Date(map['StartTime']) : null,
             endTime: map['EndTime'] !== null ? new Date(map['EndTime']) : null,
+            organizationCode: map['OrganizationCode'],
+            teamCode: map['TeamCode'],
             pageIndex: map['PageIndex'],
             pageSize: map['PageSize'],
             token: map['Token'],
@@ -319,6 +323,10 @@ var UserPageRequest = /** @class */ (function (_super) {
             map['StartTime'] = JsonRpcUtils_1.default.dateFormat(this.startTime);
         if (this.endTime != null)
             map['EndTime'] = JsonRpcUtils_1.default.dateFormat(this.endTime);
+        if (this.organizationCode != null)
+            map['OrganizationCode'] = this.organizationCode;
+        if (this.teamCode != null)
+            map['TeamCode'] = this.teamCode;
         return map;
     };
     return UserPageRequest;

+ 12 - 0
src/jsonrpc/services/user.m.ts

@@ -373,11 +373,15 @@ export class UserPageRequest extends PageRequest {
 	keyword: String;
 	startTime: Date|null;
 	endTime: Date|null;
+	organizationCode: String;
+	teamCode: String;
 
 	constructor({
 		keyword,
 		startTime,
 		endTime,
+		organizationCode,
+		teamCode,
 		pageIndex= 0,
 		pageSize= 0,
 		token,
@@ -390,6 +394,8 @@ export class UserPageRequest extends PageRequest {
 		this.keyword = keyword;
 		this.startTime = startTime;
 		this.endTime = endTime;
+		this.organizationCode = organizationCode;
+		this.teamCode = teamCode;
 		this.pageIndex = pageIndex||0;
 		this.pageSize = pageSize||0;
 		this.token = token;
@@ -400,6 +406,8 @@ export class UserPageRequest extends PageRequest {
 { 			keyword: map['Keyword'],
 			startTime: map['StartTime'] !== null ? new Date(map['StartTime']) : null,
 			endTime: map['EndTime'] !== null ? new Date(map['EndTime']) : null,
+			organizationCode: map['OrganizationCode'],
+			teamCode: map['TeamCode'],
 			pageIndex: map['PageIndex'],
 			pageSize: map['PageSize'],
 			token: map['Token'],
@@ -414,6 +422,10 @@ export class UserPageRequest extends PageRequest {
 			map['StartTime'] = JsonRpcUtils.dateFormat(this.startTime!);
 		if(this.endTime != null)
 			map['EndTime'] = JsonRpcUtils.dateFormat(this.endTime!);
+		if(this.organizationCode != null)
+			map['OrganizationCode'] = this.organizationCode;
+		if(this.teamCode != null)
+			map['TeamCode'] = this.teamCode;
 		return map;
 	}
 }