更新rpc

src/jsonrpc/services/authentication.m.js

@@ -3359,9 +3359,9 @@ var CustomerRpcCode;
     CustomerRpcCode[CustomerRpcCode["DeviceNameExisted"] = 3075] = "DeviceNameExisted";
     CustomerRpcCode[CustomerRpcCode["AddDeviceAccountFailed"] = 3076] = "AddDeviceAccountFailed";
     CustomerRpcCode[CustomerRpcCode["AdminOldPasswordError"] = 3077] = "AdminOldPasswordError";
-    CustomerRpcCode[CustomerRpcCode["placeHolder_3078"] = 3078] = "placeHolder_3078";
-    CustomerRpcCode[CustomerRpcCode["placeHolder_3079"] = 3079] = "placeHolder_3079";
-    CustomerRpcCode[CustomerRpcCode["placeHolder_3080"] = 3080] = "placeHolder_3080";
+    CustomerRpcCode[CustomerRpcCode["DongleUsbRequired"] = 3078] = "DongleUsbRequired";
+    CustomerRpcCode[CustomerRpcCode["DongleLicenseRequired"] = 3079] = "DongleLicenseRequired";
+    CustomerRpcCode[CustomerRpcCode["ReconnectCloudRequire"] = 3080] = "ReconnectCloudRequire";
     CustomerRpcCode[CustomerRpcCode["placeHolder_3081"] = 3081] = "placeHolder_3081";
     CustomerRpcCode[CustomerRpcCode["placeHolder_3082"] = 3082] = "placeHolder_3082";
     CustomerRpcCode[CustomerRpcCode["placeHolder_3083"] = 3083] = "placeHolder_3083";
@@ -4359,10 +4359,10 @@ var CustomerRpcCode;
     CustomerRpcCode[CustomerRpcCode["RecordReportNotQualityControl"] = 4075] = "RecordReportNotQualityControl";
     CustomerRpcCode[CustomerRpcCode["CollectedByOtherDevice"] = 4076] = "CollectedByOtherDevice";
     CustomerRpcCode[CustomerRpcCode["NeverRelatedDevice"] = 4077] = "NeverRelatedDevice";
-    CustomerRpcCode[CustomerRpcCode["placeHolder_4078"] = 4078] = "placeHolder_4078";
-    CustomerRpcCode[CustomerRpcCode["placeHolder_4079"] = 4079] = "placeHolder_4079";
-    CustomerRpcCode[CustomerRpcCode["placeHolder_4080"] = 4080] = "placeHolder_4080";
-    CustomerRpcCode[CustomerRpcCode["placeHolder_4081"] = 4081] = "placeHolder_4081";
+    CustomerRpcCode[CustomerRpcCode["NotPurchasedChargeMeasureResourcePackage"] = 4078] = "NotPurchasedChargeMeasureResourcePackage";
+    CustomerRpcCode[CustomerRpcCode["ChargeMeasureResourcePackageExpired"] = 4079] = "ChargeMeasureResourcePackageExpired";
+    CustomerRpcCode[CustomerRpcCode["ProbationMeasureResourcePackageExpired"] = 4080] = "ProbationMeasureResourcePackageExpired";
+    CustomerRpcCode[CustomerRpcCode["MeasureResourcePackageExpiringSoon"] = 4081] = "MeasureResourcePackageExpiringSoon";
     CustomerRpcCode[CustomerRpcCode["placeHolder_4082"] = 4082] = "placeHolder_4082";
     CustomerRpcCode[CustomerRpcCode["placeHolder_4083"] = 4083] = "placeHolder_4083";
     CustomerRpcCode[CustomerRpcCode["placeHolder_4084"] = 4084] = "placeHolder_4084";
@@ -7371,7 +7371,7 @@ var CustomerRpcCode;
     CustomerRpcCode[CustomerRpcCode["UserSignedFail"] = 7087] = "UserSignedFail";
     CustomerRpcCode[CustomerRpcCode["CourseVisitorNameIsEmpty"] = 7088] = "CourseVisitorNameIsEmpty";
     CustomerRpcCode[CustomerRpcCode["CourseLabelRONameRepeat"] = 7089] = "CourseLabelRONameRepeat";
-    CustomerRpcCode[CustomerRpcCode["placeHolder_7090"] = 7090] = "placeHolder_7090";
+    CustomerRpcCode[CustomerRpcCode["RenewalRepeated"] = 7090] = "RenewalRepeated";
     CustomerRpcCode[CustomerRpcCode["placeHolder_7091"] = 7091] = "placeHolder_7091";
     CustomerRpcCode[CustomerRpcCode["placeHolder_7092"] = 7092] = "placeHolder_7092";
     CustomerRpcCode[CustomerRpcCode["placeHolder_7093"] = 7093] = "placeHolder_7093";
@@ -9304,6 +9304,7 @@ var CustomerRpcCode;
     CustomerRpcCode[CustomerRpcCode["LicenseURMConfigOrExpireError"] = 9020] = "LicenseURMConfigOrExpireError";
     CustomerRpcCode[CustomerRpcCode["LicenseBindAgencyExist"] = 9021] = "LicenseBindAgencyExist";
     CustomerRpcCode[CustomerRpcCode["LicenseIdOrDongleIdOrAgencyNameOrContentEmptyError"] = 9022] = "LicenseIdOrDongleIdOrAgencyNameOrContentEmptyError";
+    CustomerRpcCode[CustomerRpcCode["PatientContractSigned"] = 9023] = "PatientContractSigned";
 })(CustomerRpcCode || (exports.CustomerRpcCode = CustomerRpcCode = {}));
 var ValidateTokenResult = /** @class */ (function () {
     function ValidateTokenResult(_a) {

src/jsonrpc/services/authentication.m.ts

@@ -3454,9 +3454,9 @@ export enum CustomerRpcCode {
 	DeviceNameExisted,
 	AddDeviceAccountFailed,
 	AdminOldPasswordError,
-	placeHolder_3078,
-	placeHolder_3079,
-	placeHolder_3080,
+	DongleUsbRequired,
+	DongleLicenseRequired,
+	ReconnectCloudRequire,
 	placeHolder_3081,
 	placeHolder_3082,
 	placeHolder_3083,
@@ -4454,10 +4454,10 @@ export enum CustomerRpcCode {
 	RecordReportNotQualityControl,
 	CollectedByOtherDevice,
 	NeverRelatedDevice,
-	placeHolder_4078,
-	placeHolder_4079,
-	placeHolder_4080,
-	placeHolder_4081,
+	NotPurchasedChargeMeasureResourcePackage,
+	ChargeMeasureResourcePackageExpired,
+	ProbationMeasureResourcePackageExpired,
+	MeasureResourcePackageExpiringSoon,
 	placeHolder_4082,
 	placeHolder_4083,
 	placeHolder_4084,
@@ -7466,7 +7466,7 @@ export enum CustomerRpcCode {
 	UserSignedFail,
 	CourseVisitorNameIsEmpty,
 	CourseLabelRONameRepeat,
-	placeHolder_7090,
+	RenewalRepeated,
 	placeHolder_7091,
 	placeHolder_7092,
 	placeHolder_7093,
@@ -9399,6 +9399,7 @@ export enum CustomerRpcCode {
 	LicenseURMConfigOrExpireError,
 	LicenseBindAgencyExist,
 	LicenseIdOrDongleIdOrAgencyNameOrContentEmptyError,
+	PatientContractSigned,
 }
 
 export class ValidateTokenResult {

src/jsonrpc/services/contractRecord.js

@@ -210,6 +210,20 @@ var VitalContractRecordService = /** @class */ (function (_super) {
             });
         });
     };
+    VitalContractRecordService.prototype.getDoctorContractRecordAsync = function (request) {
+        return __awaiter(this, void 0, void 0, function () {
+            var rpcRst, result;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.call("GetDoctorContractRecordAsync", request)];
+                    case 1:
+                        rpcRst = _a.sent();
+                        result = contractRecord_m_1.ContractRecordDTO.fromJson(rpcRst);
+                        return [2 /*return*/, result];
+                }
+            });
+        });
+    };
     return VitalContractRecordService;
 }(client_base_1.default));
 exports.VitalContractRecordService = VitalContractRecordService;

src/jsonrpc/services/contractRecord.m.js

@@ -15,7 +15,7 @@ var __extends = (this && this.__extends) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RenewalContractRecordRequest = exports.UpdateContractRecordStateRequest = exports.GetContractPatientPageRequest = exports.GetContractRecordPageByPatientCodeRequest = exports.UpdateContractRecordRequest = exports.GetContractRecordListRequest = exports.RemoveContractRecordRequest = exports.ContractRecordPageRequest = exports.GetContractRecordByKeyRequest = exports.GetContractRecordRequest = exports.ContractRecordDTO = exports.ServicePackDTO = exports.ServicePackTypeEnum = exports.AuditStateEnum = exports.CreateContractRecordRequest = exports.ContractStateEnum = void 0;
+exports.GetDoctorContractRecordRequest = exports.RenewalContractRecordRequest = exports.UpdateContractRecordStateRequest = exports.GetContractPatientPageRequest = exports.GetContractRecordPageByPatientCodeRequest = exports.UpdateContractRecordRequest = exports.GetContractRecordListRequest = exports.RemoveContractRecordRequest = exports.ContractRecordPageRequest = exports.GetContractRecordByKeyRequest = exports.GetContractRecordRequest = exports.ContractRecordDTO = exports.ServicePackDTO = exports.ServicePackTypeEnum = exports.AuditStateEnum = exports.CreateContractRecordRequest = exports.ContractStateEnum = void 0;
 var authentication_m_1 = require("./authentication.m");
 var healthExamBooking_m_1 = require("./healthExamBooking.m");
 var exam_m_1 = require("./exam.m");
@@ -32,7 +32,7 @@ var ContractStateEnum;
 var CreateContractRecordRequest = /** @class */ (function (_super) {
     __extends(CreateContractRecordRequest, _super);
     function CreateContractRecordRequest(_a) {
-        var code = _a.code, contractRecordNo = _a.contractRecordNo, contractedDoctor = _a.contractedDoctor, contractedPatient = _a.contractedPatient, contractedTeam = _a.contractedTeam, contractedTime = _a.contractedTime, contractedFileUrl = _a.contractedFileUrl, servicePacks = _a.servicePacks, serviceStartDate = _a.serviceStartDate, serviceEndDate = _a.serviceEndDate, photos = _a.photos, notes = _a.notes, contractState = _a.contractState, reason = _a.reason, token = _a.token;
+        var code = _a.code, contractRecordNo = _a.contractRecordNo, contractedDoctor = _a.contractedDoctor, contractedPatient = _a.contractedPatient, contractedTeam = _a.contractedTeam, contractedTime = _a.contractedTime, contractedFileUrl = _a.contractedFileUrl, servicePacks = _a.servicePacks, serviceStartDate = _a.serviceStartDate, serviceEndDate = _a.serviceEndDate, photos = _a.photos, notes = _a.notes, contractState = _a.contractState, reason = _a.reason, contractedDoctorName = _a.contractedDoctorName, contractedDoctorPhone = _a.contractedDoctorPhone, teamLeaderName = _a.teamLeaderName, preceptorName = _a.preceptorName, renewalContractCode = _a.renewalContractCode, token = _a.token;
         var _this = _super.call(this, {
             token: token,
         }) || this;
@@ -50,6 +50,11 @@ var CreateContractRecordRequest = /** @class */ (function (_super) {
         _this.notes = notes;
         _this.contractState = contractState;
         _this.reason = reason;
+        _this.contractedDoctorName = contractedDoctorName;
+        _this.contractedDoctorPhone = contractedDoctorPhone;
+        _this.teamLeaderName = teamLeaderName;
+        _this.preceptorName = preceptorName;
+        _this.renewalContractCode = renewalContractCode;
         _this.token = token;
         return _this;
     }
@@ -68,6 +73,11 @@ var CreateContractRecordRequest = /** @class */ (function (_super) {
             notes: map['Notes'],
             contractState: map['ContractState'],
             reason: map['Reason'],
+            contractedDoctorName: map['ContractedDoctorName'],
+            contractedDoctorPhone: map['ContractedDoctorPhone'],
+            teamLeaderName: map['TeamLeaderName'],
+            preceptorName: map['PreceptorName'],
+            renewalContractCode: map['RenewalContractCode'],
             token: map['Token'],
         });
     };
@@ -101,6 +111,16 @@ var CreateContractRecordRequest = /** @class */ (function (_super) {
             map['ContractState'] = this.contractState;
         if (this.reason != null)
             map['Reason'] = this.reason;
+        if (this.contractedDoctorName != null)
+            map['ContractedDoctorName'] = this.contractedDoctorName;
+        if (this.contractedDoctorPhone != null)
+            map['ContractedDoctorPhone'] = this.contractedDoctorPhone;
+        if (this.teamLeaderName != null)
+            map['TeamLeaderName'] = this.teamLeaderName;
+        if (this.preceptorName != null)
+            map['PreceptorName'] = this.preceptorName;
+        if (this.renewalContractCode != null)
+            map['RenewalContractCode'] = this.renewalContractCode;
         return map;
     };
     return CreateContractRecordRequest;
@@ -182,7 +202,7 @@ exports.ServicePackDTO = ServicePackDTO;
 var ContractRecordDTO = /** @class */ (function (_super) {
     __extends(ContractRecordDTO, _super);
     function ContractRecordDTO(_a) {
-        var code = _a.code, contractRecordNo = _a.contractRecordNo, contractState = _a.contractState, contractIsValid = _a.contractIsValid, contractedDoctor = _a.contractedDoctor, contractedDoctorCode = _a.contractedDoctorCode, contractedPatient = _a.contractedPatient, contractedTeam = _a.contractedTeam, contractedTeamCode = _a.contractedTeamCode, supervisingPhysician = _a.supervisingPhysician, contractedTime = _a.contractedTime, auditState = _a.auditState, contractedFileUrl = _a.contractedFileUrl, servicePacks = _a.servicePacks, serviceStartDate = _a.serviceStartDate, serviceEndDate = _a.serviceEndDate, patientName = _a.patientName, patientGender = _a.patientGender, phone = _a.phone, cardNo = _a.cardNo, birthday = _a.birthday, patientAddress = _a.patientAddress, nationality = _a.nationality, crowdLabels = _a.crowdLabels, labelNames = _a.labelNames, organizationName = _a.organizationName, photos = _a.photos, notes = _a.notes, reason = _a.reason, _b = _a.isDelete, isDelete = _b === void 0 ? false : _b, createTime = _a.createTime, updateTime = _a.updateTime;
+        var code = _a.code, contractRecordNo = _a.contractRecordNo, contractState = _a.contractState, contractIsValid = _a.contractIsValid, contractedDoctor = _a.contractedDoctor, contractedDoctorCode = _a.contractedDoctorCode, contractedPatient = _a.contractedPatient, contractedTeam = _a.contractedTeam, contractedTeamCode = _a.contractedTeamCode, supervisingPhysician = _a.supervisingPhysician, contractedTime = _a.contractedTime, auditState = _a.auditState, contractedFileUrl = _a.contractedFileUrl, servicePacks = _a.servicePacks, serviceStartDate = _a.serviceStartDate, serviceEndDate = _a.serviceEndDate, patientName = _a.patientName, patientGender = _a.patientGender, phone = _a.phone, cardNo = _a.cardNo, birthday = _a.birthday, patientAddress = _a.patientAddress, nationality = _a.nationality, crowdLabels = _a.crowdLabels, labelNames = _a.labelNames, organizationName = _a.organizationName, photos = _a.photos, notes = _a.notes, reason = _a.reason, contractedDoctorName = _a.contractedDoctorName, contractedDoctorPhone = _a.contractedDoctorPhone, teamLeaderName = _a.teamLeaderName, preceptorName = _a.preceptorName, renewalContractCode = _a.renewalContractCode, _b = _a.isDelete, isDelete = _b === void 0 ? false : _b, createTime = _a.createTime, updateTime = _a.updateTime;
         var _this = _super.call(this, {
             isDelete: isDelete,
             createTime: createTime,
@@ -217,6 +237,11 @@ var ContractRecordDTO = /** @class */ (function (_super) {
         _this.photos = photos;
         _this.notes = notes;
         _this.reason = reason;
+        _this.contractedDoctorName = contractedDoctorName;
+        _this.contractedDoctorPhone = contractedDoctorPhone;
+        _this.teamLeaderName = teamLeaderName;
+        _this.preceptorName = preceptorName;
+        _this.renewalContractCode = renewalContractCode;
         _this.isDelete = isDelete || false;
         _this.createTime = createTime;
         _this.updateTime = updateTime;
@@ -252,6 +277,11 @@ var ContractRecordDTO = /** @class */ (function (_super) {
             photos: !map['Photos'] ? [] : Array.from(map['Photos']),
             notes: map['Notes'],
             reason: map['Reason'],
+            contractedDoctorName: map['ContractedDoctorName'],
+            contractedDoctorPhone: map['ContractedDoctorPhone'],
+            teamLeaderName: map['TeamLeaderName'],
+            preceptorName: map['PreceptorName'],
+            renewalContractCode: map['RenewalContractCode'],
             isDelete: map['IsDelete'],
             createTime: map['CreateTime'] !== null ? new Date(map['CreateTime']) : null,
             updateTime: map['UpdateTime'] !== null ? new Date(map['UpdateTime']) : null, });
@@ -312,6 +342,16 @@ var ContractRecordDTO = /** @class */ (function (_super) {
             map['Notes'] = this.notes;
         if (this.reason != null)
             map['Reason'] = this.reason;
+        if (this.contractedDoctorName != null)
+            map['ContractedDoctorName'] = this.contractedDoctorName;
+        if (this.contractedDoctorPhone != null)
+            map['ContractedDoctorPhone'] = this.contractedDoctorPhone;
+        if (this.teamLeaderName != null)
+            map['TeamLeaderName'] = this.teamLeaderName;
+        if (this.preceptorName != null)
+            map['PreceptorName'] = this.preceptorName;
+        if (this.renewalContractCode != null)
+            map['RenewalContractCode'] = this.renewalContractCode;
         return map;
     };
     return ContractRecordDTO;
@@ -692,3 +732,24 @@ var RenewalContractRecordRequest = /** @class */ (function (_super) {
     return RenewalContractRecordRequest;
 }(authentication_m_1.TokenRequest));
 exports.RenewalContractRecordRequest = RenewalContractRecordRequest;
+var GetDoctorContractRecordRequest = /** @class */ (function (_super) {
+    __extends(GetDoctorContractRecordRequest, _super);
+    function GetDoctorContractRecordRequest(_a) {
+        var token = _a.token;
+        var _this = _super.call(this, {
+            token: token,
+        }) || this;
+        _this.token = token;
+        return _this;
+    }
+    GetDoctorContractRecordRequest.fromJson = function (map) {
+        return new GetDoctorContractRecordRequest({ token: map['Token'],
+        });
+    };
+    GetDoctorContractRecordRequest.prototype.toJson = function () {
+        var map = _super.prototype.toJson.call(this);
+        return map;
+    };
+    return GetDoctorContractRecordRequest;
+}(authentication_m_1.TokenRequest));
+exports.GetDoctorContractRecordRequest = GetDoctorContractRecordRequest;

src/jsonrpc/services/contractRecord.m.ts

@@ -29,6 +29,11 @@ export class CreateContractRecordRequest extends TokenRequest {
 	notes: String;
 	contractState: ContractStateEnum|null;
 	reason: String;
+	contractedDoctorName: String;
+	contractedDoctorPhone: String;
+	teamLeaderName: String;
+	preceptorName: String;
+	renewalContractCode: String;
 
 	constructor({
 		code,
@@ -45,6 +50,11 @@ export class CreateContractRecordRequest extends TokenRequest {
 		notes,
 		contractState,
 		reason,
+		contractedDoctorName,
+		contractedDoctorPhone,
+		teamLeaderName,
+		preceptorName,
+		renewalContractCode,
 		token,
 	}) {
 		super({
@@ -64,6 +74,11 @@ export class CreateContractRecordRequest extends TokenRequest {
 		this.notes = notes;
 		this.contractState = contractState;
 		this.reason = reason;
+		this.contractedDoctorName = contractedDoctorName;
+		this.contractedDoctorPhone = contractedDoctorPhone;
+		this.teamLeaderName = teamLeaderName;
+		this.preceptorName = preceptorName;
+		this.renewalContractCode = renewalContractCode;
 		this.token = token;
 	}
 
@@ -83,6 +98,11 @@ export class CreateContractRecordRequest extends TokenRequest {
 			notes: map['Notes'],
 			contractState: map['ContractState'] ,
 			reason: map['Reason'],
+			contractedDoctorName: map['ContractedDoctorName'],
+			contractedDoctorPhone: map['ContractedDoctorPhone'],
+			teamLeaderName: map['TeamLeaderName'],
+			preceptorName: map['PreceptorName'],
+			renewalContractCode: map['RenewalContractCode'],
 			token: map['Token'],
 }		);
 	}
@@ -117,6 +137,16 @@ export class CreateContractRecordRequest extends TokenRequest {
 			map['ContractState'] = this.contractState;
 		if(this.reason != null)
 			map['Reason'] = this.reason;
+		if(this.contractedDoctorName != null)
+			map['ContractedDoctorName'] = this.contractedDoctorName;
+		if(this.contractedDoctorPhone != null)
+			map['ContractedDoctorPhone'] = this.contractedDoctorPhone;
+		if(this.teamLeaderName != null)
+			map['TeamLeaderName'] = this.teamLeaderName;
+		if(this.preceptorName != null)
+			map['PreceptorName'] = this.preceptorName;
+		if(this.renewalContractCode != null)
+			map['RenewalContractCode'] = this.renewalContractCode;
 		return map;
 	}
 }
@@ -244,6 +274,11 @@ export class ContractRecordDTO extends BaseDTO {
 	photos: String[];
 	notes: String;
 	reason: String;
+	contractedDoctorName: String;
+	contractedDoctorPhone: String;
+	teamLeaderName: String;
+	preceptorName: String;
+	renewalContractCode: String;
 
 	constructor({
 		code,
@@ -275,6 +310,11 @@ export class ContractRecordDTO extends BaseDTO {
 		photos,
 		notes,
 		reason,
+		contractedDoctorName,
+		contractedDoctorPhone,
+		teamLeaderName,
+		preceptorName,
+		renewalContractCode,
 		isDelete= false,
 		createTime,
 		updateTime,
@@ -313,6 +353,11 @@ export class ContractRecordDTO extends BaseDTO {
 		this.photos = photos;
 		this.notes = notes;
 		this.reason = reason;
+		this.contractedDoctorName = contractedDoctorName;
+		this.contractedDoctorPhone = contractedDoctorPhone;
+		this.teamLeaderName = teamLeaderName;
+		this.preceptorName = preceptorName;
+		this.renewalContractCode = renewalContractCode;
 		this.isDelete = isDelete||false;
 		this.createTime = createTime;
 		this.updateTime = updateTime;
@@ -349,6 +394,11 @@ export class ContractRecordDTO extends BaseDTO {
 			photos: !map['Photos'] ? []  :Array.from(map['Photos']),
 			notes: map['Notes'],
 			reason: map['Reason'],
+			contractedDoctorName: map['ContractedDoctorName'],
+			contractedDoctorPhone: map['ContractedDoctorPhone'],
+			teamLeaderName: map['TeamLeaderName'],
+			preceptorName: map['PreceptorName'],
+			renewalContractCode: map['RenewalContractCode'],
 			isDelete: map['IsDelete'],
 			createTime: map['CreateTime'] !== null ? new Date(map['CreateTime']) : null,
 			updateTime: map['UpdateTime'] !== null ? new Date(map['UpdateTime']) : null,
@@ -411,6 +461,16 @@ export class ContractRecordDTO extends BaseDTO {
 			map['Notes'] = this.notes;
 		if(this.reason != null)
 			map['Reason'] = this.reason;
+		if(this.contractedDoctorName != null)
+			map['ContractedDoctorName'] = this.contractedDoctorName;
+		if(this.contractedDoctorPhone != null)
+			map['ContractedDoctorPhone'] = this.contractedDoctorPhone;
+		if(this.teamLeaderName != null)
+			map['TeamLeaderName'] = this.teamLeaderName;
+		if(this.preceptorName != null)
+			map['PreceptorName'] = this.preceptorName;
+		if(this.renewalContractCode != null)
+			map['RenewalContractCode'] = this.renewalContractCode;
 		return map;
 	}
 }
@@ -890,4 +950,27 @@ export class RenewalContractRecordRequest extends TokenRequest {
 	}
 }
 
+export class GetDoctorContractRecordRequest extends TokenRequest {
+
+	constructor({
+		token,
+	}) {
+		super({
+		token,
+		});
+		this.token = token;
+	}
+
+	static fromJson(map: { [key: string]: any }): GetDoctorContractRecordRequest {
+		return new GetDoctorContractRecordRequest( 
+{ 			token: map['Token'],
+}		);
+	}
+
+	toJson(): Record<string, unknown> {
+		const map: Record<string, unknown> = super.toJson();
+		return map;
+	}
+}
+
 

src/jsonrpc/services/contractRecord.ts

@@ -1,5 +1,5 @@
 import JsonRpcClientBase from '../client_base'
-import {ContractStateEnum,CreateContractRecordRequest,AuditStateEnum,ServicePackTypeEnum,ServicePackDTO,ContractRecordDTO,GetContractRecordRequest,GetContractRecordByKeyRequest,ContractRecordPageRequest,RemoveContractRecordRequest,GetContractRecordListRequest,UpdateContractRecordRequest,GetContractRecordPageByPatientCodeRequest,GetContractPatientPageRequest,UpdateContractRecordStateRequest,RenewalContractRecordRequest,} from  './contractRecord.m'
+import {ContractStateEnum,CreateContractRecordRequest,AuditStateEnum,ServicePackTypeEnum,ServicePackDTO,ContractRecordDTO,GetContractRecordRequest,GetContractRecordByKeyRequest,ContractRecordPageRequest,RemoveContractRecordRequest,GetContractRecordListRequest,UpdateContractRecordRequest,GetContractRecordPageByPatientCodeRequest,GetContractPatientPageRequest,UpdateContractRecordStateRequest,RenewalContractRecordRequest,GetDoctorContractRecordRequest,} from  './contractRecord.m'
 import { GetUserInfoByVitalOpenIdRequest,PatientGenderEnum,PersonInfoBaseDTO,FaceScanErrorTypeEnum,PersonInfoByFaceImageDTO,GetPersonInfoByFaceImageRequest,RegisterConfirmRequest,PersonRegisterDTO,PersonInfoFullDTO,PageCollection,GetPersonPageRequest,GetPersonRequest,DeletePersonRequest,EnterPersonFaceQueryResult,EnterPersonFaceQueryRequest,EnterPersonFaceRequest, } from './register.m';
 
 
@@ -81,5 +81,11 @@ export class VitalContractRecordService extends JsonRpcClientBase {
 		return rpcRst;
 	}
 
+	async getDoctorContractRecordAsync(request: GetDoctorContractRecordRequest): Promise<ContractRecordDTO> {
+		var rpcRst = await this.call("GetDoctorContractRecordAsync", request);
+		var result = ContractRecordDTO.fromJson(rpcRst as Record<string, unknown>);
+		return result;
+	}
+
 }
 

src/jsonrpc/services/device.m.js

@@ -110,7 +110,7 @@ exports.CreateDeviceRequest = CreateDeviceRequest;
 var DeviceDTO = /** @class */ (function (_super) {
     __extends(DeviceDTO, _super);
     function DeviceDTO(_a) {
-        var code = _a.code, uniqueCode = _a.uniqueCode, serialNumber = _a.serialNumber, model = _a.model, softwareVersion = _a.softwareVersion, oSVersion = _a.oSVersion, description = _a.description, organizationCode = _a.organizationCode, organizationName = _a.organizationName, teamCode = _a.teamCode, teamName = _a.teamName, peripheralPermissions = _a.peripheralPermissions, _b = _a.isDelete, isDelete = _b === void 0 ? false : _b, createTime = _a.createTime, updateTime = _a.updateTime;
+        var code = _a.code, uniqueCode = _a.uniqueCode, serialNumber = _a.serialNumber, model = _a.model, softwareVersion = _a.softwareVersion, oSVersion = _a.oSVersion, description = _a.description, organizationCode = _a.organizationCode, organizationName = _a.organizationName, teamCode = _a.teamCode, teamName = _a.teamName, peripheralPermissions = _a.peripheralPermissions, deviceType = _a.deviceType, _b = _a.isDelete, isDelete = _b === void 0 ? false : _b, createTime = _a.createTime, updateTime = _a.updateTime;
         var _this = _super.call(this, {
             isDelete: isDelete,
             createTime: createTime,
@@ -128,6 +128,7 @@ var DeviceDTO = /** @class */ (function (_super) {
         _this.teamCode = teamCode;
         _this.teamName = teamName;
         _this.peripheralPermissions = peripheralPermissions;
+        _this.deviceType = deviceType || 0;
         _this.isDelete = isDelete || false;
         _this.createTime = createTime;
         _this.updateTime = updateTime;
@@ -146,6 +147,7 @@ var DeviceDTO = /** @class */ (function (_super) {
             teamCode: map['TeamCode'],
             teamName: map['TeamName'],
             peripheralPermissions: map['PeripheralPermissions'] && map['PeripheralPermissions'].length > 0 ? map['PeripheralPermissions'].map(function (e) { return PeripheralDeviceDTO.fromJson(e); }) : null,
+            deviceType: map['DeviceType'],
             isDelete: map['IsDelete'],
             createTime: map['CreateTime'] !== null ? new Date(map['CreateTime']) : null,
             updateTime: map['UpdateTime'] !== null ? new Date(map['UpdateTime']) : null, });
@@ -176,6 +178,7 @@ var DeviceDTO = /** @class */ (function (_super) {
             map['TeamName'] = this.teamName;
         if (this.peripheralPermissions != null)
             map['PeripheralPermissions'] = this.peripheralPermissions;
+        map['DeviceType'] = this.deviceType;
         return map;
     };
     return DeviceDTO;
@@ -584,7 +587,7 @@ exports.SetDeviceOrganizationRequest = SetDeviceOrganizationRequest;
 var DevicePageRequest = /** @class */ (function (_super) {
     __extends(DevicePageRequest, _super);
     function DevicePageRequest(_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, deviceType = _a.deviceType, _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,
@@ -593,6 +596,7 @@ var DevicePageRequest = /** @class */ (function (_super) {
         _this.keyword = keyword;
         _this.startTime = startTime;
         _this.endTime = endTime;
+        _this.deviceType = deviceType || 0;
         _this.pageIndex = pageIndex || 0;
         _this.pageSize = pageSize || 0;
         _this.token = token;
@@ -602,6 +606,7 @@ var DevicePageRequest = /** @class */ (function (_super) {
         return new DevicePageRequest({ keyword: map['Keyword'],
             startTime: map['StartTime'] !== null ? new Date(map['StartTime']) : null,
             endTime: map['EndTime'] !== null ? new Date(map['EndTime']) : null,
+            deviceType: map['DeviceType'],
             pageIndex: map['PageIndex'],
             pageSize: map['PageSize'],
             token: map['Token'],
@@ -615,6 +620,7 @@ var DevicePageRequest = /** @class */ (function (_super) {
             map['StartTime'] = JsonRpcUtils_1.default.dateFormat(this.startTime);
         if (this.endTime != null)
             map['EndTime'] = JsonRpcUtils_1.default.dateFormat(this.endTime);
+        map['DeviceType'] = this.deviceType;
         return map;
     };
     return DevicePageRequest;

src/jsonrpc/services/device.m.ts

@@ -142,6 +142,7 @@ export class DeviceDTO extends BaseDTO {
 	teamCode: String;
 	teamName: String;
 	peripheralPermissions: PeripheralDeviceDTO[];
+	deviceType: Number;
 
 	constructor({
 		code,
@@ -156,6 +157,7 @@ export class DeviceDTO extends BaseDTO {
 		teamCode,
 		teamName,
 		peripheralPermissions,
+		deviceType,
 		isDelete= false,
 		createTime,
 		updateTime,
@@ -177,6 +179,7 @@ export class DeviceDTO extends BaseDTO {
 		this.teamCode = teamCode;
 		this.teamName = teamName;
 		this.peripheralPermissions = peripheralPermissions;
+		this.deviceType = deviceType||0;
 		this.isDelete = isDelete||false;
 		this.createTime = createTime;
 		this.updateTime = updateTime;
@@ -196,6 +199,7 @@ export class DeviceDTO extends BaseDTO {
 			teamCode: map['TeamCode'],
 			teamName: map['TeamName'],
 			peripheralPermissions: map['PeripheralPermissions']&& map['PeripheralPermissions'].length>0 ? (map['PeripheralPermissions'] as any[]).map((e)=>PeripheralDeviceDTO.fromJson(e)) : null,
+			deviceType: map['DeviceType'],
 			isDelete: map['IsDelete'],
 			createTime: map['CreateTime'] !== null ? new Date(map['CreateTime']) : null,
 			updateTime: map['UpdateTime'] !== null ? new Date(map['UpdateTime']) : null,
@@ -228,6 +232,7 @@ export class DeviceDTO extends BaseDTO {
 			map['TeamName'] = this.teamName;
 		if(this.peripheralPermissions != null)
 			map['PeripheralPermissions'] = this.peripheralPermissions;
+		map['DeviceType'] = this.deviceType;
 		return map;
 	}
 }
@@ -782,11 +787,13 @@ export class DevicePageRequest extends PageRequest {
 	keyword: String;
 	startTime: Date|null;
 	endTime: Date|null;
+	deviceType: Number;
 
 	constructor({
 		keyword,
 		startTime,
 		endTime,
+		deviceType,
 		pageIndex= 0,
 		pageSize= 0,
 		token,
@@ -799,6 +806,7 @@ export class DevicePageRequest extends PageRequest {
 		this.keyword = keyword;
 		this.startTime = startTime;
 		this.endTime = endTime;
+		this.deviceType = deviceType||0;
 		this.pageIndex = pageIndex||0;
 		this.pageSize = pageSize||0;
 		this.token = token;
@@ -809,6 +817,7 @@ export class DevicePageRequest extends PageRequest {
 { 			keyword: map['Keyword'],
 			startTime: map['StartTime'] !== null ? new Date(map['StartTime']) : null,
 			endTime: map['EndTime'] !== null ? new Date(map['EndTime']) : null,
+			deviceType: map['DeviceType'],
 			pageIndex: map['PageIndex'],
 			pageSize: map['PageSize'],
 			token: map['Token'],
@@ -823,6 +832,7 @@ export class DevicePageRequest extends PageRequest {
 			map['StartTime'] = JsonRpcUtils.dateFormat(this.startTime!);
 		if(this.endTime != null)
 			map['EndTime'] = JsonRpcUtils.dateFormat(this.endTime!);
+		map['DeviceType'] = this.deviceType;
 		return map;
 	}
 }

src/jsonrpc/services/electrocardiogram.m.js

@@ -23,7 +23,7 @@ var JsonRpcUtils_1 = require("../JsonRpcUtils");
 var ElectrocardiogramRecord = /** @class */ (function (_super) {
     __extends(ElectrocardiogramRecord, _super);
     function ElectrocardiogramRecord(_a) {
-        var code = _a.code, examData = _a.examData, patientName = _a.patientName, cardNo = _a.cardNo, patientGender = _a.patientGender, patientAddress = _a.patientAddress, birthday = _a.birthday, examState = _a.examState, examTime = _a.examTime, examDoctor = _a.examDoctor, physicalExamNumber = _a.physicalExamNumber, organizationCode = _a.organizationCode, _b = _a.isDelete, isDelete = _b === void 0 ? false : _b, createTime = _a.createTime, updateTime = _a.updateTime;
+        var code = _a.code, examData = _a.examData, patientName = _a.patientName, cardNo = _a.cardNo, patientGender = _a.patientGender, patientAddress = _a.patientAddress, birthday = _a.birthday, examState = _a.examState, examTime = _a.examTime, examDoctor = _a.examDoctor, physicalExamNumber = _a.physicalExamNumber, organizationCode = _a.organizationCode, phone = _a.phone, deviceCode = _a.deviceCode, _b = _a.isDelete, isDelete = _b === void 0 ? false : _b, createTime = _a.createTime, updateTime = _a.updateTime;
         var _this = _super.call(this, {
             isDelete: isDelete,
             createTime: createTime,
@@ -41,6 +41,8 @@ var ElectrocardiogramRecord = /** @class */ (function (_super) {
         _this.examDoctor = examDoctor;
         _this.physicalExamNumber = physicalExamNumber;
         _this.organizationCode = organizationCode;
+        _this.phone = phone;
+        _this.deviceCode = deviceCode;
         _this.isDelete = isDelete || false;
         _this.createTime = createTime;
         _this.updateTime = updateTime;
@@ -59,6 +61,8 @@ var ElectrocardiogramRecord = /** @class */ (function (_super) {
             examDoctor: map['ExamDoctor'],
             physicalExamNumber: map['PhysicalExamNumber'],
             organizationCode: map['OrganizationCode'],
+            phone: map['Phone'],
+            deviceCode: map['DeviceCode'],
             isDelete: map['IsDelete'],
             createTime: map['CreateTime'] !== null ? new Date(map['CreateTime']) : null,
             updateTime: map['UpdateTime'] !== null ? new Date(map['UpdateTime']) : null,
@@ -88,6 +92,10 @@ var ElectrocardiogramRecord = /** @class */ (function (_super) {
             map['PhysicalExamNumber'] = this.physicalExamNumber;
         if (this.organizationCode != null)
             map['OrganizationCode'] = this.organizationCode;
+        if (this.phone != null)
+            map['Phone'] = this.phone;
+        if (this.deviceCode != null)
+            map['DeviceCode'] = this.deviceCode;
         return map;
     };
     return ElectrocardiogramRecord;
@@ -161,22 +169,28 @@ var ElectrocardiogramRecordPageRequest = /** @class */ (function (_super) {
     return ElectrocardiogramRecordPageRequest;
 }(authentication_m_1.PageRequest));
 exports.ElectrocardiogramRecordPageRequest = ElectrocardiogramRecordPageRequest;
-var GetElectrocardiogramRecordByPhysicalExamNumberRequest = /** @class */ (function () {
+var GetElectrocardiogramRecordByPhysicalExamNumberRequest = /** @class */ (function (_super) {
+    __extends(GetElectrocardiogramRecordByPhysicalExamNumberRequest, _super);
     function GetElectrocardiogramRecordByPhysicalExamNumberRequest(_a) {
-        var physicalExamNumber = _a.physicalExamNumber;
-        this.physicalExamNumber = physicalExamNumber;
+        var physicalExamNumber = _a.physicalExamNumber, token = _a.token;
+        var _this = _super.call(this, {
+            token: token,
+        }) || this;
+        _this.physicalExamNumber = physicalExamNumber;
+        _this.token = token;
+        return _this;
     }
     GetElectrocardiogramRecordByPhysicalExamNumberRequest.fromJson = function (map) {
         return new GetElectrocardiogramRecordByPhysicalExamNumberRequest({ physicalExamNumber: map['PhysicalExamNumber'],
+            token: map['Token'],
         });
     };
     GetElectrocardiogramRecordByPhysicalExamNumberRequest.prototype.toJson = function () {
-        var map = {};
-        if (this.physicalExamNumber !== null) {
+        var map = _super.prototype.toJson.call(this);
+        if (this.physicalExamNumber != null)
             map['PhysicalExamNumber'] = this.physicalExamNumber;
-        }
         return map;
     };
     return GetElectrocardiogramRecordByPhysicalExamNumberRequest;
-}());
+}(authentication_m_1.TokenRequest));
 exports.GetElectrocardiogramRecordByPhysicalExamNumberRequest = GetElectrocardiogramRecordByPhysicalExamNumberRequest;

src/jsonrpc/services/electrocardiogram.m.ts

@@ -18,6 +18,8 @@ export class ElectrocardiogramRecord extends BaseDTO {
 	examDoctor: String;
 	physicalExamNumber: String;
 	organizationCode: String;
+	phone: String;
+	deviceCode: String;
 
 	constructor({
 		code,
@@ -32,6 +34,8 @@ export class ElectrocardiogramRecord extends BaseDTO {
 		examDoctor,
 		physicalExamNumber,
 		organizationCode,
+		phone,
+		deviceCode,
 		isDelete= false,
 		createTime,
 		updateTime,
@@ -53,6 +57,8 @@ export class ElectrocardiogramRecord extends BaseDTO {
 		this.examDoctor = examDoctor;
 		this.physicalExamNumber = physicalExamNumber;
 		this.organizationCode = organizationCode;
+		this.phone = phone;
+		this.deviceCode = deviceCode;
 		this.isDelete = isDelete||false;
 		this.createTime = createTime;
 		this.updateTime = updateTime;
@@ -72,6 +78,8 @@ export class ElectrocardiogramRecord extends BaseDTO {
 			examDoctor: map['ExamDoctor'],
 			physicalExamNumber: map['PhysicalExamNumber'],
 			organizationCode: map['OrganizationCode'],
+			phone: map['Phone'],
+			deviceCode: map['DeviceCode'],
 			isDelete: map['IsDelete'],
 			createTime: map['CreateTime'] !== null ? new Date(map['CreateTime']) : null,
 			updateTime: map['UpdateTime'] !== null ? new Date(map['UpdateTime']) : null,
@@ -102,6 +110,10 @@ export class ElectrocardiogramRecord extends BaseDTO {
 			map['PhysicalExamNumber'] = this.physicalExamNumber;
 		if(this.organizationCode != null)
 			map['OrganizationCode'] = this.organizationCode;
+		if(this.phone != null)
+			map['Phone'] = this.phone;
+		if(this.deviceCode != null)
+			map['DeviceCode'] = this.deviceCode;
 		return map;
 	}
 }
@@ -190,28 +202,31 @@ export class ElectrocardiogramRecordPageRequest extends PageRequest {
 	}
 }
 
-export class GetElectrocardiogramRecordByPhysicalExamNumberRequest {
-	 physicalExamNumber: String|null;
+export class GetElectrocardiogramRecordByPhysicalExamNumberRequest extends TokenRequest {
+	physicalExamNumber: String;
 
 	constructor({
 		physicalExamNumber,
-	}: {
-	 physicalExamNumber: String|null;
+		token,
 	}) {
+		super({
+		token,
+		});
 		this.physicalExamNumber = physicalExamNumber;
+		this.token = token;
 	}
 
 	static fromJson(map: { [key: string]: any }): GetElectrocardiogramRecordByPhysicalExamNumberRequest {
 		return new GetElectrocardiogramRecordByPhysicalExamNumberRequest( 
 { 			physicalExamNumber: map['PhysicalExamNumber'],
+			token: map['Token'],
 }		);
 	}
 
-	toJson(): { [key: string]: any } {
-		const map: { [key: string]: any } = {};
-		if (this.physicalExamNumber !== null) {
+	toJson(): Record<string, unknown> {
+		const map: Record<string, unknown> = super.toJson();
+		if(this.physicalExamNumber != null)
 			map['PhysicalExamNumber'] = this.physicalExamNumber;
-		}
 		return map;
 	}
 }

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, _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, 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,
@@ -885,6 +885,7 @@ 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;
@@ -897,6 +898,7 @@ 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'],
@@ -916,6 +918,7 @@ 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;

src/jsonrpc/services/healthExamBooking.m.ts

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

src/jsonrpc/services/patient.m.js

@@ -110,7 +110,7 @@ var PatientStatusEnum;
 var PatientDTO = /** @class */ (function (_super) {
     __extends(PatientDTO, _super);
     function PatientDTO(_a) {
-        var code = _a.code, recordNo = _a.recordNo, patientName = _a.patientName, phone = _a.phone, emergencyName = _a.emergencyName, emergencyPhone = _a.emergencyPhone, cardNo = _a.cardNo, nationality = _a.nationality, birthday = _a.birthday, crowdLabels = _a.crowdLabels, cardType = _a.cardType, patientGender = _a.patientGender, patientAddress = _a.patientAddress, permanentResidenceAddress = _a.permanentResidenceAddress, teamRegionCode = _a.teamRegionCode, createdDoctor = _a.createdDoctor, contractedDoctor = _a.contractedDoctor, labelNames = _a.labelNames, createdDoctorName = _a.createdDoctorName, createdOrgName = _a.createdOrgName, createdTeamName = _a.createdTeamName, status = _a.status, createdOrgCode = _a.createdOrgCode, createdTeamCode = _a.createdTeamCode, currentTeamCode = _a.currentTeamCode, currentOrgCode = _a.currentOrgCode, contractedDoctorName = _a.contractedDoctorName, contractState = _a.contractState, photos = _a.photos, archivedDoctorName = _a.archivedDoctorName, _b = _a.isDelete, isDelete = _b === void 0 ? false : _b, createTime = _a.createTime, updateTime = _a.updateTime;
+        var code = _a.code, recordNo = _a.recordNo, patientName = _a.patientName, phone = _a.phone, emergencyName = _a.emergencyName, emergencyPhone = _a.emergencyPhone, cardNo = _a.cardNo, nationality = _a.nationality, birthday = _a.birthday, crowdLabels = _a.crowdLabels, cardType = _a.cardType, patientGender = _a.patientGender, patientAddress = _a.patientAddress, permanentResidenceAddress = _a.permanentResidenceAddress, teamRegionCode = _a.teamRegionCode, createdDoctor = _a.createdDoctor, contractedDoctor = _a.contractedDoctor, labelNames = _a.labelNames, createdDoctorName = _a.createdDoctorName, createdOrgName = _a.createdOrgName, createdTeamName = _a.createdTeamName, status = _a.status, createdOrgCode = _a.createdOrgCode, createdTeamCode = _a.createdTeamCode, currentTeamCode = _a.currentTeamCode, currentOrgCode = _a.currentOrgCode, contractedDoctorName = _a.contractedDoctorName, contractState = _a.contractState, photos = _a.photos, archivedDoctorName = _a.archivedDoctorName, serviceStartDate = _a.serviceStartDate, serviceEndDate = _a.serviceEndDate, _b = _a.isDelete, isDelete = _b === void 0 ? false : _b, createTime = _a.createTime, updateTime = _a.updateTime;
         var _this = _super.call(this, {
             isDelete: isDelete,
             createTime: createTime,
@@ -146,6 +146,8 @@ var PatientDTO = /** @class */ (function (_super) {
         _this.contractState = contractState || contractRecord_m_1.ContractStateEnum.Unsigned;
         _this.photos = photos;
         _this.archivedDoctorName = archivedDoctorName;
+        _this.serviceStartDate = serviceStartDate;
+        _this.serviceEndDate = serviceEndDate;
         _this.isDelete = isDelete || false;
         _this.createTime = createTime;
         _this.updateTime = updateTime;
@@ -182,6 +184,8 @@ var PatientDTO = /** @class */ (function (_super) {
             contractState: map['ContractState'],
             photos: !map['Photos'] ? [] : Array.from(map['Photos']),
             archivedDoctorName: map['ArchivedDoctorName'],
+            serviceStartDate: map['ServiceStartDate'] !== null ? new Date(map['ServiceStartDate']) : null,
+            serviceEndDate: map['ServiceEndDate'] !== null ? new Date(map['ServiceEndDate']) : null,
             isDelete: map['IsDelete'],
             createTime: map['CreateTime'] !== null ? new Date(map['CreateTime']) : null,
             updateTime: map['UpdateTime'] !== null ? new Date(map['UpdateTime']) : null,
@@ -245,6 +249,10 @@ var PatientDTO = /** @class */ (function (_super) {
             map['Photos'] = this.photos;
         if (this.archivedDoctorName != null)
             map['ArchivedDoctorName'] = this.archivedDoctorName;
+        if (this.serviceStartDate != null)
+            map['ServiceStartDate'] = JsonRpcUtils_1.default.dateFormat(this.serviceStartDate);
+        if (this.serviceEndDate != null)
+            map['ServiceEndDate'] = JsonRpcUtils_1.default.dateFormat(this.serviceEndDate);
         return map;
     };
     return PatientDTO;
@@ -310,7 +318,7 @@ exports.GetPatientByKeyRequest = GetPatientByKeyRequest;
 var PatientPageRequest = /** @class */ (function (_super) {
     __extends(PatientPageRequest, _super);
     function PatientPageRequest(_a) {
-        var crowdLabels = _a.crowdLabels, keyword = _a.keyword, startTime = _a.startTime, endTime = _a.endTime, createdBySelf = _a.createdBySelf, _b = _a.pageIndex, pageIndex = _b === void 0 ? 0 : _b, _c = _a.pageSize, pageSize = _c === void 0 ? 0 : _c, token = _a.token;
+        var crowdLabels = _a.crowdLabels, keyword = _a.keyword, startTime = _a.startTime, endTime = _a.endTime, createdBySelf = _a.createdBySelf, contractState = _a.contractState, _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,
@@ -321,6 +329,7 @@ var PatientPageRequest = /** @class */ (function (_super) {
         _this.startTime = startTime;
         _this.endTime = endTime;
         _this.createdBySelf = createdBySelf || false;
+        _this.contractState = contractState;
         _this.pageIndex = pageIndex || 0;
         _this.pageSize = pageSize || 0;
         _this.token = token;
@@ -332,6 +341,7 @@ var PatientPageRequest = /** @class */ (function (_super) {
             startTime: map['StartTime'] !== null ? new Date(map['StartTime']) : null,
             endTime: map['EndTime'] !== null ? new Date(map['EndTime']) : null,
             createdBySelf: map['CreatedBySelf'],
+            contractState: map['ContractState'],
             pageIndex: map['PageIndex'],
             pageSize: map['PageSize'],
             token: map['Token'],
@@ -348,6 +358,8 @@ var PatientPageRequest = /** @class */ (function (_super) {
         if (this.endTime != null)
             map['EndTime'] = JsonRpcUtils_1.default.dateFormat(this.endTime);
         map['CreatedBySelf'] = this.createdBySelf;
+        if (this.contractState != null)
+            map['ContractState'] = this.contractState;
         return map;
     };
     return PatientPageRequest;
@@ -849,19 +861,30 @@ exports.PatientStatisticDTO = PatientStatisticDTO;
 var GetPatientStatisticRequest = /** @class */ (function (_super) {
     __extends(GetPatientStatisticRequest, _super);
     function GetPatientStatisticRequest(_a) {
-        var token = _a.token;
+        var crowdLabels = _a.crowdLabels, createdBySelf = _a.createdBySelf, contractState = _a.contractState, token = _a.token;
         var _this = _super.call(this, {
             token: token,
         }) || this;
+        _this.crowdLabels = crowdLabels;
+        _this.createdBySelf = createdBySelf || false;
+        _this.contractState = contractState;
         _this.token = token;
         return _this;
     }
     GetPatientStatisticRequest.fromJson = function (map) {
-        return new GetPatientStatisticRequest({ token: map['Token'],
+        return new GetPatientStatisticRequest({ crowdLabels: !map['CrowdLabels'] ? [] : Array.from(map['CrowdLabels']),
+            createdBySelf: map['CreatedBySelf'],
+            contractState: map['ContractState'],
+            token: map['Token'],
         });
     };
     GetPatientStatisticRequest.prototype.toJson = function () {
         var map = _super.prototype.toJson.call(this);
+        if (this.crowdLabels != null)
+            map['CrowdLabels'] = this.crowdLabels;
+        map['CreatedBySelf'] = this.createdBySelf;
+        if (this.contractState != null)
+            map['ContractState'] = this.contractState;
         return map;
     };
     return GetPatientStatisticRequest;

src/jsonrpc/services/patient.m.ts

@@ -2,7 +2,7 @@ import { BaseRequest,TokenRequest,StorageServerEnum,DataItemDTO,AuthenticationRe
 import { CreateDiagnosisRequest,DiagnosisDTO,GetDiagnosisRequest,GetDiagnosisByKeyRequest,DiagnosisPageRequest,RemoveDiagnosisRequest,GetDiagnosisListRequest,UpdateDiagnosisRequest,DiagnosisAggregationData,DiagnosisAggregationRecord,DiagnosisItem,SubmitDiagnosisRequest,ReinfusionDiagnosisRequest,SetDiagnosisTimeRequest,CardTypeEnum,SyncPatientAndDiagnosisDataRequest,OldPlatformDiagnosisDataCountRequest,RemoveDiagnosisByAppDataIdRequest, } from './diagnosis.m';
 import { GetRegisterInfoPageRequest,GetRegisterInfoByPhysicalExamNumberRequest,HospitalizationHistory,HospitalAtHome,DrugUsage,InoculateHistory,GetExamInfoByPhysicalExamNumberResult,GetExamInfoByPhysicalExamNumberRequest,ReportStateEnum,PreviewDTO,ReportDTO,GetVitalReportInfoRequest,GenderEnum,ExamDTO,ExamConclusionDTO,ExamTileConslusionDTO,GetExamByPatientPageRequest,UploadElectrocardiogramReportRequest, } from './exam.m';
 import { BaseDTO,BookingTypeEnum,BookingStatusEnum,HealthExamPersonDTO,HealthExamItemDTO,HealthExamBookingDTO,GetHealthExamBookingPageRequest,SaveHealthExamBookingRequest,GetHealthExamBookingRequest,DeleteHealthExamBookingRequest,SignUpHealthExamBookingRequest,GetExamBookingByIDCardRequest,GetExamItemsByExamNoRequest,HealthExamLabelDTO,GetExamLabelsByExamNoResult,GetExamLabelsByExamNoRequest,AddRegiterInfoResult,VitalProjectTypeEnum,AddRegiterInfoRequest,UpdateRegiterInfoRequest,DataItemDTO,UpdateResultsAndSuggestionsRequest,ExamStateEnum,RegisterInfoDTO,GetRegiterInfoPageRequest,RegisterPersonInfoDTO,GetRegisterPersonRequest,RecordStatusEnum,RecordCreateTypeEnum,PatientInfoExt,DiagnosisStatusEnum,DiagnosisOrganEnum,DiagnosisConclusionEnum,DiagnosisReportStatusEnum,DiagnosisInfoDTO,RecordInfoDTO,GetVitalRecordByPhysicalExamNumberRequest,CancelHealthExamBookingRequest, } from './healthExamBooking.m';
-import { ContractStateEnum,CreateContractRecordRequest,AuditStateEnum,ServicePackTypeEnum,ServicePackDTO,ContractRecordDTO,GetContractRecordRequest,GetContractRecordByKeyRequest,ContractRecordPageRequest,RemoveContractRecordRequest,GetContractRecordListRequest,UpdateContractRecordRequest,GetContractRecordPageByPatientCodeRequest,GetContractPatientPageRequest,UpdateContractRecordStateRequest,RenewalContractRecordRequest, } from './contractRecord.m';
+import { ContractStateEnum,CreateContractRecordRequest,AuditStateEnum,ServicePackTypeEnum,ServicePackDTO,ContractRecordDTO,GetContractRecordRequest,GetContractRecordByKeyRequest,ContractRecordPageRequest,RemoveContractRecordRequest,GetContractRecordListRequest,UpdateContractRecordRequest,GetContractRecordPageByPatientCodeRequest,GetContractPatientPageRequest,UpdateContractRecordStateRequest,RenewalContractRecordRequest,GetDoctorContractRecordRequest, } from './contractRecord.m';
 import { GetUserInfoByVitalOpenIdRequest,PatientGenderEnum,PersonInfoBaseDTO,FaceScanErrorTypeEnum,PersonInfoByFaceImageDTO,GetPersonInfoByFaceImageRequest,RegisterConfirmRequest,PersonRegisterDTO,PersonInfoFullDTO,PageCollection,GetPersonPageRequest,GetPersonRequest,DeletePersonRequest,EnterPersonFaceQueryResult,EnterPersonFaceQueryRequest,EnterPersonFaceRequest, } from './register.m';
 
 import JsonRpcUtils from '../JsonRpcUtils'
@@ -154,6 +154,8 @@ export class PatientDTO extends BaseDTO {
 	contractState: ContractStateEnum;
 	photos: String[];
 	archivedDoctorName: String;
+	serviceStartDate: Date|null;
+	serviceEndDate: Date|null;
 
 	constructor({
 		code,
@@ -186,6 +188,8 @@ export class PatientDTO extends BaseDTO {
 		contractState,
 		photos,
 		archivedDoctorName,
+		serviceStartDate,
+		serviceEndDate,
 		isDelete= false,
 		createTime,
 		updateTime,
@@ -225,6 +229,8 @@ export class PatientDTO extends BaseDTO {
 		this.contractState = contractState||ContractStateEnum.Unsigned;
 		this.photos = photos;
 		this.archivedDoctorName = archivedDoctorName;
+		this.serviceStartDate = serviceStartDate;
+		this.serviceEndDate = serviceEndDate;
 		this.isDelete = isDelete||false;
 		this.createTime = createTime;
 		this.updateTime = updateTime;
@@ -262,6 +268,8 @@ export class PatientDTO extends BaseDTO {
 			contractState: map['ContractState'] ,
 			photos: !map['Photos'] ? []  :Array.from(map['Photos']),
 			archivedDoctorName: map['ArchivedDoctorName'],
+			serviceStartDate: map['ServiceStartDate'] !== null ? new Date(map['ServiceStartDate']) : null,
+			serviceEndDate: map['ServiceEndDate'] !== null ? new Date(map['ServiceEndDate']) : null,
 			isDelete: map['IsDelete'],
 			createTime: map['CreateTime'] !== null ? new Date(map['CreateTime']) : null,
 			updateTime: map['UpdateTime'] !== null ? new Date(map['UpdateTime']) : null,
@@ -326,6 +334,10 @@ export class PatientDTO extends BaseDTO {
 			map['Photos'] = this.photos;
 		if(this.archivedDoctorName != null)
 			map['ArchivedDoctorName'] = this.archivedDoctorName;
+		if(this.serviceStartDate != null)
+			map['ServiceStartDate'] = JsonRpcUtils.dateFormat(this.serviceStartDate!);
+		if(this.serviceEndDate != null)
+			map['ServiceEndDate'] = JsonRpcUtils.dateFormat(this.serviceEndDate!);
 		return map;
 	}
 }
@@ -405,6 +417,7 @@ export class PatientPageRequest extends PageRequest {
 	startTime: Date|null;
 	endTime: Date|null;
 	createdBySelf: boolean;
+	contractState: ContractStateEnum|null;
 
 	constructor({
 		crowdLabels,
@@ -412,6 +425,7 @@ export class PatientPageRequest extends PageRequest {
 		startTime,
 		endTime,
 		createdBySelf,
+		contractState,
 		pageIndex= 0,
 		pageSize= 0,
 		token,
@@ -426,6 +440,7 @@ export class PatientPageRequest extends PageRequest {
 		this.startTime = startTime;
 		this.endTime = endTime;
 		this.createdBySelf = createdBySelf||false;
+		this.contractState = contractState;
 		this.pageIndex = pageIndex||0;
 		this.pageSize = pageSize||0;
 		this.token = token;
@@ -438,6 +453,7 @@ export class PatientPageRequest extends PageRequest {
 			startTime: map['StartTime'] !== null ? new Date(map['StartTime']) : null,
 			endTime: map['EndTime'] !== null ? new Date(map['EndTime']) : null,
 			createdBySelf: map['CreatedBySelf'],
+			contractState: map['ContractState'] ,
 			pageIndex: map['PageIndex'],
 			pageSize: map['PageSize'],
 			token: map['Token'],
@@ -455,6 +471,8 @@ export class PatientPageRequest extends PageRequest {
 		if(this.endTime != null)
 			map['EndTime'] = JsonRpcUtils.dateFormat(this.endTime!);
 		map['CreatedBySelf'] = this.createdBySelf;
+		if(this.contractState != null)
+			map['ContractState'] = this.contractState;
 		return map;
 	}
 }
@@ -1122,24 +1140,41 @@ export class PatientStatisticDTO {
 }
 
 export class GetPatientStatisticRequest extends TokenRequest {
+	crowdLabels: String[];
+	createdBySelf: boolean;
+	contractState: ContractStateEnum|null;
 
 	constructor({
+		crowdLabels,
+		createdBySelf,
+		contractState,
 		token,
 	}) {
 		super({
 		token,
 		});
+		this.crowdLabels = crowdLabels;
+		this.createdBySelf = createdBySelf||false;
+		this.contractState = contractState;
 		this.token = token;
 	}
 
 	static fromJson(map: { [key: string]: any }): GetPatientStatisticRequest {
 		return new GetPatientStatisticRequest( 
-{ 			token: map['Token'],
+{ 			crowdLabels: !map['CrowdLabels'] ? []  :Array.from(map['CrowdLabels']),
+			createdBySelf: map['CreatedBySelf'],
+			contractState: map['ContractState'] ,
+			token: map['Token'],
 }		);
 	}
 
 	toJson(): Record<string, unknown> {
 		const map: Record<string, unknown> = super.toJson();
+		if(this.crowdLabels != null)
+			map['CrowdLabels'] = this.crowdLabels;
+		map['CreatedBySelf'] = this.createdBySelf;
+		if(this.contractState != null)
+			map['ContractState'] = this.contractState;
 		return map;
 	}
 }

src/jsonrpc/services/servicePack.m.ts

@@ -1,5 +1,5 @@
 import { BaseRequest,TokenRequest,StorageServerEnum,DataItemDTO,AuthenticationRequest,AccountType,Platform,LoginSource,ProxyTypeEnum,TokenDTO,ApplyTokenRequest,CustomerRpcCode,ValidateTokenResult,ValidateTokenRequest,GetTokensWithClientIdRequest,GetTokenWithClientIdsRequest,GetTokenWithValuesRequest,SetOnlineStateRequest,SetIPAddressRequest,PageResult,PageRequest,GetPagedTokensRequest,GetPagedTokensOnlineRequest,SetTokenInstallVersionRequest, } from './authentication.m';
-import { ContractStateEnum,CreateContractRecordRequest,AuditStateEnum,ServicePackTypeEnum,ServicePackDTO,ContractRecordDTO,GetContractRecordRequest,GetContractRecordByKeyRequest,ContractRecordPageRequest,RemoveContractRecordRequest,GetContractRecordListRequest,UpdateContractRecordRequest,GetContractRecordPageByPatientCodeRequest,GetContractPatientPageRequest,UpdateContractRecordStateRequest,RenewalContractRecordRequest, } from './contractRecord.m';
+import { ContractStateEnum,CreateContractRecordRequest,AuditStateEnum,ServicePackTypeEnum,ServicePackDTO,ContractRecordDTO,GetContractRecordRequest,GetContractRecordByKeyRequest,ContractRecordPageRequest,RemoveContractRecordRequest,GetContractRecordListRequest,UpdateContractRecordRequest,GetContractRecordPageByPatientCodeRequest,GetContractPatientPageRequest,UpdateContractRecordStateRequest,RenewalContractRecordRequest,GetDoctorContractRecordRequest, } from './contractRecord.m';
 import { BaseDTO,BookingTypeEnum,BookingStatusEnum,HealthExamPersonDTO,HealthExamItemDTO,HealthExamBookingDTO,GetHealthExamBookingPageRequest,SaveHealthExamBookingRequest,GetHealthExamBookingRequest,DeleteHealthExamBookingRequest,SignUpHealthExamBookingRequest,GetExamBookingByIDCardRequest,GetExamItemsByExamNoRequest,HealthExamLabelDTO,GetExamLabelsByExamNoResult,GetExamLabelsByExamNoRequest,AddRegiterInfoResult,VitalProjectTypeEnum,AddRegiterInfoRequest,UpdateRegiterInfoRequest,DataItemDTO,UpdateResultsAndSuggestionsRequest,ExamStateEnum,RegisterInfoDTO,GetRegiterInfoPageRequest,RegisterPersonInfoDTO,GetRegisterPersonRequest,RecordStatusEnum,RecordCreateTypeEnum,PatientInfoExt,DiagnosisStatusEnum,DiagnosisOrganEnum,DiagnosisConclusionEnum,DiagnosisReportStatusEnum,DiagnosisInfoDTO,RecordInfoDTO,GetVitalRecordByPhysicalExamNumberRequest,CancelHealthExamBookingRequest, } from './healthExamBooking.m';
 import { GetUserInfoByVitalOpenIdRequest,PatientGenderEnum,PersonInfoBaseDTO,FaceScanErrorTypeEnum,PersonInfoByFaceImageDTO,GetPersonInfoByFaceImageRequest,RegisterConfirmRequest,PersonRegisterDTO,PersonInfoFullDTO,PageCollection,GetPersonPageRequest,GetPersonRequest,DeletePersonRequest,EnterPersonFaceQueryResult,EnterPersonFaceQueryRequest,EnterPersonFaceRequest, } from './register.m';
 

src/jsonrpc/services/servicePack.ts

@@ -1,6 +1,6 @@
 import JsonRpcClientBase from '../client_base'
 import {CreateServicePackRequest,GetServicePackRequest,ServicePackPageRequest,RemovetServicePackRequest,UpdateServicePackRequest,UpdateServicePackForItemsRequest,ServiceItemTypeEnum,CreateServiceItemRequest,ServiceItemDTO,GetServiceItemRequest,GetServiceItemPageRequest,GetServiceItemListRequest,RemovetServiceItemRequest,UpdateServiceItemRequest,UpdateServicePackForLabelsRequest,} from  './servicePack.m'
-import { ContractStateEnum,CreateContractRecordRequest,AuditStateEnum,ServicePackTypeEnum,ServicePackDTO,ContractRecordDTO,GetContractRecordRequest,GetContractRecordByKeyRequest,ContractRecordPageRequest,RemoveContractRecordRequest,GetContractRecordListRequest,UpdateContractRecordRequest,GetContractRecordPageByPatientCodeRequest,GetContractPatientPageRequest,UpdateContractRecordStateRequest,RenewalContractRecordRequest, } from './contractRecord.m';
+import { ContractStateEnum,CreateContractRecordRequest,AuditStateEnum,ServicePackTypeEnum,ServicePackDTO,ContractRecordDTO,GetContractRecordRequest,GetContractRecordByKeyRequest,ContractRecordPageRequest,RemoveContractRecordRequest,GetContractRecordListRequest,UpdateContractRecordRequest,GetContractRecordPageByPatientCodeRequest,GetContractPatientPageRequest,UpdateContractRecordStateRequest,RenewalContractRecordRequest,GetDoctorContractRecordRequest, } from './contractRecord.m';
 import { GetUserInfoByVitalOpenIdRequest,PatientGenderEnum,PersonInfoBaseDTO,FaceScanErrorTypeEnum,PersonInfoByFaceImageDTO,GetPersonInfoByFaceImageRequest,RegisterConfirmRequest,PersonRegisterDTO,PersonInfoFullDTO,PageCollection,GetPersonPageRequest,GetPersonRequest,DeletePersonRequest,EnterPersonFaceQueryResult,EnterPersonFaceQueryRequest,EnterPersonFaceRequest, } from './register.m';
 
 

src/jsonrpc/services/user.js

@@ -184,6 +184,19 @@ var VitalUserService = /** @class */ (function (_super) {
             });
         });
     };
+    VitalUserService.prototype.bindEcgCodeAsync = 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("BindEcgCodeAsync", request)];
+                    case 1:
+                        rpcRst = _a.sent();
+                        return [2 /*return*/, rpcRst];
+                }
+            });
+        });
+    };
     VitalUserService.prototype.getUserPageByOrganizationCodeAsync = function (request) {
         return __awaiter(this, void 0, void 0, function () {
             var rpcRst, result;

src/jsonrpc/services/user.m.js

@@ -15,7 +15,7 @@ var __extends = (this && this.__extends) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GetOperationPermissionRequest = exports.GetMenuPermissionRequest = exports.SetSignatureRequest = exports.GetUserPageByTeamCodeRequest = exports.GetAreaOfResponsibilityRequest = exports.SetAreaOfResponsibilityRequest = exports.GetUserPageByOrganizationCodeRequest = exports.BindUltrasoundCodeRequest = exports.ResetUserNameRequest = exports.UpdateUserRequest = exports.GetUserListRequest = exports.RemoveUserRequest = exports.UserPageRequest = exports.GetUserByKeyRequest = exports.GetUserRequest = exports.UserDTO = exports.CreateUserRequest = void 0;
+exports.GetOperationPermissionRequest = exports.GetMenuPermissionRequest = exports.SetSignatureRequest = exports.GetUserPageByTeamCodeRequest = exports.GetAreaOfResponsibilityRequest = exports.SetAreaOfResponsibilityRequest = exports.GetUserPageByOrganizationCodeRequest = exports.BindEcgCodeRequest = exports.BindUltrasoundCodeRequest = exports.ResetUserNameRequest = exports.UpdateUserRequest = exports.GetUserListRequest = exports.RemoveUserRequest = exports.UserPageRequest = exports.GetUserByKeyRequest = exports.GetUserRequest = exports.UserDTO = exports.CreateUserRequest = void 0;
 var authentication_m_1 = require("./authentication.m");
 var healthExamBooking_m_1 = require("./healthExamBooking.m");
 var residence_m_1 = require("./residence.m");
@@ -24,7 +24,7 @@ var JsonRpcUtils_1 = require("../JsonRpcUtils");
 var CreateUserRequest = /** @class */ (function (_super) {
     __extends(CreateUserRequest, _super);
     function CreateUserRequest(_a) {
-        var code = _a.code, userName = _a.userName, phone = _a.phone, cardNo = _a.cardNo, realName = _a.realName, headImageToken = _a.headImageToken, organizationCode = _a.organizationCode, teamCode = _a.teamCode, roleCode = _a.roleCode, secretPassword = _a.secretPassword, rankName = _a.rankName, signature = _a.signature, ultrasoundCode = _a.ultrasoundCode, token = _a.token;
+        var code = _a.code, userName = _a.userName, phone = _a.phone, cardNo = _a.cardNo, realName = _a.realName, headImageToken = _a.headImageToken, organizationCode = _a.organizationCode, teamCode = _a.teamCode, roleCode = _a.roleCode, secretPassword = _a.secretPassword, rankName = _a.rankName, signature = _a.signature, ultrasoundCode = _a.ultrasoundCode, ecgCode = _a.ecgCode, token = _a.token;
         var _this = _super.call(this, {
             token: token,
         }) || this;
@@ -41,6 +41,7 @@ var CreateUserRequest = /** @class */ (function (_super) {
         _this.rankName = rankName;
         _this.signature = signature;
         _this.ultrasoundCode = ultrasoundCode;
+        _this.ecgCode = ecgCode;
         _this.token = token;
         return _this;
     }
@@ -58,6 +59,7 @@ var CreateUserRequest = /** @class */ (function (_super) {
             rankName: map['RankName'],
             signature: map['Signature'],
             ultrasoundCode: map['UltrasoundCode'],
+            ecgCode: map['EcgCode'],
             token: map['Token'],
         });
     };
@@ -89,6 +91,8 @@ var CreateUserRequest = /** @class */ (function (_super) {
             map['Signature'] = this.signature;
         if (this.ultrasoundCode != null)
             map['UltrasoundCode'] = this.ultrasoundCode;
+        if (this.ecgCode != null)
+            map['EcgCode'] = this.ecgCode;
         return map;
     };
     return CreateUserRequest;
@@ -97,7 +101,7 @@ exports.CreateUserRequest = CreateUserRequest;
 var UserDTO = /** @class */ (function (_super) {
     __extends(UserDTO, _super);
     function UserDTO(_a) {
-        var code = _a.code, userName = _a.userName, phone = _a.phone, cardNo = _a.cardNo, realName = _a.realName, headImageToken = _a.headImageToken, organizationCode = _a.organizationCode, organizationName = _a.organizationName, organizationPhone = _a.organizationPhone, teamCode = _a.teamCode, teamName = _a.teamName, roleCode = _a.roleCode, roleName = _a.roleName, rankName = _a.rankName, residence = _a.residence, principalCode = _a.principalCode, principalName = _a.principalName, principalPhone = _a.principalPhone, provinceCode = _a.provinceCode, cityCode = _a.cityCode, districtCode = _a.districtCode, signature = _a.signature, ultrasoundCode = _a.ultrasoundCode, _b = _a.isDelete, isDelete = _b === void 0 ? false : _b, createTime = _a.createTime, updateTime = _a.updateTime;
+        var code = _a.code, userName = _a.userName, phone = _a.phone, cardNo = _a.cardNo, realName = _a.realName, headImageToken = _a.headImageToken, organizationCode = _a.organizationCode, organizationName = _a.organizationName, organizationPhone = _a.organizationPhone, teamCode = _a.teamCode, teamName = _a.teamName, roleCode = _a.roleCode, roleName = _a.roleName, rankName = _a.rankName, residence = _a.residence, principalCode = _a.principalCode, principalName = _a.principalName, principalPhone = _a.principalPhone, provinceCode = _a.provinceCode, cityCode = _a.cityCode, districtCode = _a.districtCode, signature = _a.signature, ultrasoundCode = _a.ultrasoundCode, ecgCode = _a.ecgCode, isExistSubordinate = _a.isExistSubordinate, fatherOrgCode = _a.fatherOrgCode, fatherOrgName = _a.fatherOrgName, _b = _a.isDelete, isDelete = _b === void 0 ? false : _b, createTime = _a.createTime, updateTime = _a.updateTime;
         var _this = _super.call(this, {
             isDelete: isDelete,
             createTime: createTime,
@@ -126,6 +130,10 @@ var UserDTO = /** @class */ (function (_super) {
         _this.districtCode = districtCode;
         _this.signature = signature;
         _this.ultrasoundCode = ultrasoundCode;
+        _this.ecgCode = ecgCode;
+        _this.isExistSubordinate = isExistSubordinate || false;
+        _this.fatherOrgCode = fatherOrgCode;
+        _this.fatherOrgName = fatherOrgName;
         _this.isDelete = isDelete || false;
         _this.createTime = createTime;
         _this.updateTime = updateTime;
@@ -155,6 +163,10 @@ var UserDTO = /** @class */ (function (_super) {
             districtCode: map['DistrictCode'],
             signature: map['Signature'],
             ultrasoundCode: map['UltrasoundCode'],
+            ecgCode: map['EcgCode'],
+            isExistSubordinate: map['IsExistSubordinate'],
+            fatherOrgCode: map['FatherOrgCode'],
+            fatherOrgName: map['FatherOrgName'],
             isDelete: map['IsDelete'],
             createTime: map['CreateTime'] !== null ? new Date(map['CreateTime']) : null,
             updateTime: map['UpdateTime'] !== null ? new Date(map['UpdateTime']) : null, });
@@ -207,6 +219,13 @@ var UserDTO = /** @class */ (function (_super) {
             map['Signature'] = this.signature;
         if (this.ultrasoundCode != null)
             map['UltrasoundCode'] = this.ultrasoundCode;
+        if (this.ecgCode != null)
+            map['EcgCode'] = this.ecgCode;
+        map['IsExistSubordinate'] = this.isExistSubordinate;
+        if (this.fatherOrgCode != null)
+            map['FatherOrgCode'] = this.fatherOrgCode;
+        if (this.fatherOrgName != null)
+            map['FatherOrgName'] = this.fatherOrgName;
         return map;
     };
     return UserDTO;
@@ -358,7 +377,7 @@ exports.GetUserListRequest = GetUserListRequest;
 var UpdateUserRequest = /** @class */ (function (_super) {
     __extends(UpdateUserRequest, _super);
     function UpdateUserRequest(_a) {
-        var code = _a.code, phone = _a.phone, cardNo = _a.cardNo, realName = _a.realName, headImageToken = _a.headImageToken, organizationCode = _a.organizationCode, teamCode = _a.teamCode, roleCode = _a.roleCode, rankName = _a.rankName, signature = _a.signature, ultrasoundCode = _a.ultrasoundCode, token = _a.token;
+        var code = _a.code, phone = _a.phone, cardNo = _a.cardNo, realName = _a.realName, headImageToken = _a.headImageToken, organizationCode = _a.organizationCode, teamCode = _a.teamCode, roleCode = _a.roleCode, rankName = _a.rankName, signature = _a.signature, ultrasoundCode = _a.ultrasoundCode, ecgCode = _a.ecgCode, token = _a.token;
         var _this = _super.call(this, {
             token: token,
         }) || this;
@@ -373,6 +392,7 @@ var UpdateUserRequest = /** @class */ (function (_super) {
         _this.rankName = rankName;
         _this.signature = signature;
         _this.ultrasoundCode = ultrasoundCode;
+        _this.ecgCode = ecgCode;
         _this.token = token;
         return _this;
     }
@@ -388,6 +408,7 @@ var UpdateUserRequest = /** @class */ (function (_super) {
             rankName: map['RankName'],
             signature: map['Signature'],
             ultrasoundCode: map['UltrasoundCode'],
+            ecgCode: map['EcgCode'],
             token: map['Token'],
         });
     };
@@ -415,6 +436,8 @@ var UpdateUserRequest = /** @class */ (function (_super) {
             map['Signature'] = this.signature;
         if (this.ultrasoundCode != null)
             map['UltrasoundCode'] = this.ultrasoundCode;
+        if (this.ecgCode != null)
+            map['EcgCode'] = this.ecgCode;
         return map;
     };
     return UpdateUserRequest;
@@ -478,6 +501,35 @@ var BindUltrasoundCodeRequest = /** @class */ (function (_super) {
     return BindUltrasoundCodeRequest;
 }(authentication_m_1.TokenRequest));
 exports.BindUltrasoundCodeRequest = BindUltrasoundCodeRequest;
+var BindEcgCodeRequest = /** @class */ (function (_super) {
+    __extends(BindEcgCodeRequest, _super);
+    function BindEcgCodeRequest(_a) {
+        var userCode = _a.userCode, ecgCode = _a.ecgCode, token = _a.token;
+        var _this = _super.call(this, {
+            token: token,
+        }) || this;
+        _this.userCode = userCode;
+        _this.ecgCode = ecgCode;
+        _this.token = token;
+        return _this;
+    }
+    BindEcgCodeRequest.fromJson = function (map) {
+        return new BindEcgCodeRequest({ userCode: map['UserCode'],
+            ecgCode: map['EcgCode'],
+            token: map['Token'],
+        });
+    };
+    BindEcgCodeRequest.prototype.toJson = function () {
+        var map = _super.prototype.toJson.call(this);
+        if (this.userCode != null)
+            map['UserCode'] = this.userCode;
+        if (this.ecgCode != null)
+            map['EcgCode'] = this.ecgCode;
+        return map;
+    };
+    return BindEcgCodeRequest;
+}(authentication_m_1.TokenRequest));
+exports.BindEcgCodeRequest = BindEcgCodeRequest;
 var GetUserPageByOrganizationCodeRequest = /** @class */ (function (_super) {
     __extends(GetUserPageByOrganizationCodeRequest, _super);
     function GetUserPageByOrganizationCodeRequest(_a) {

src/jsonrpc/services/user.m.ts

@@ -20,6 +20,7 @@ export class CreateUserRequest extends TokenRequest {
 	rankName: String;
 	signature: String;
 	ultrasoundCode: String;
+	ecgCode: String;
 
 	constructor({
 		code,
@@ -35,6 +36,7 @@ export class CreateUserRequest extends TokenRequest {
 		rankName,
 		signature,
 		ultrasoundCode,
+		ecgCode,
 		token,
 	}) {
 		super({
@@ -53,6 +55,7 @@ export class CreateUserRequest extends TokenRequest {
 		this.rankName = rankName;
 		this.signature = signature;
 		this.ultrasoundCode = ultrasoundCode;
+		this.ecgCode = ecgCode;
 		this.token = token;
 	}
 
@@ -71,6 +74,7 @@ export class CreateUserRequest extends TokenRequest {
 			rankName: map['RankName'],
 			signature: map['Signature'],
 			ultrasoundCode: map['UltrasoundCode'],
+			ecgCode: map['EcgCode'],
 			token: map['Token'],
 }		);
 	}
@@ -103,6 +107,8 @@ export class CreateUserRequest extends TokenRequest {
 			map['Signature'] = this.signature;
 		if(this.ultrasoundCode != null)
 			map['UltrasoundCode'] = this.ultrasoundCode;
+		if(this.ecgCode != null)
+			map['EcgCode'] = this.ecgCode;
 		return map;
 	}
 }
@@ -131,6 +137,10 @@ export class UserDTO extends BaseDTO {
 	districtCode: String;
 	signature: String;
 	ultrasoundCode: String;
+	ecgCode: String;
+	isExistSubordinate: boolean;
+	fatherOrgCode: String;
+	fatherOrgName: String;
 
 	constructor({
 		code,
@@ -156,6 +166,10 @@ export class UserDTO extends BaseDTO {
 		districtCode,
 		signature,
 		ultrasoundCode,
+		ecgCode,
+		isExistSubordinate,
+		fatherOrgCode,
+		fatherOrgName,
 		isDelete= false,
 		createTime,
 		updateTime,
@@ -188,6 +202,10 @@ export class UserDTO extends BaseDTO {
 		this.districtCode = districtCode;
 		this.signature = signature;
 		this.ultrasoundCode = ultrasoundCode;
+		this.ecgCode = ecgCode;
+		this.isExistSubordinate = isExistSubordinate||false;
+		this.fatherOrgCode = fatherOrgCode;
+		this.fatherOrgName = fatherOrgName;
 		this.isDelete = isDelete||false;
 		this.createTime = createTime;
 		this.updateTime = updateTime;
@@ -218,6 +236,10 @@ export class UserDTO extends BaseDTO {
 			districtCode: map['DistrictCode'],
 			signature: map['Signature'],
 			ultrasoundCode: map['UltrasoundCode'],
+			ecgCode: map['EcgCode'],
+			isExistSubordinate: map['IsExistSubordinate'],
+			fatherOrgCode: map['FatherOrgCode'],
+			fatherOrgName: map['FatherOrgName'],
 			isDelete: map['IsDelete'],
 			createTime: map['CreateTime'] !== null ? new Date(map['CreateTime']) : null,
 			updateTime: map['UpdateTime'] !== null ? new Date(map['UpdateTime']) : null,
@@ -272,6 +294,13 @@ export class UserDTO extends BaseDTO {
 			map['Signature'] = this.signature;
 		if(this.ultrasoundCode != null)
 			map['UltrasoundCode'] = this.ultrasoundCode;
+		if(this.ecgCode != null)
+			map['EcgCode'] = this.ecgCode;
+		map['IsExistSubordinate'] = this.isExistSubordinate;
+		if(this.fatherOrgCode != null)
+			map['FatherOrgCode'] = this.fatherOrgCode;
+		if(this.fatherOrgName != null)
+			map['FatherOrgName'] = this.fatherOrgName;
 		return map;
 	}
 }
@@ -459,6 +488,7 @@ export class UpdateUserRequest extends TokenRequest {
 	rankName: String;
 	signature: String;
 	ultrasoundCode: String;
+	ecgCode: String;
 
 	constructor({
 		code,
@@ -472,6 +502,7 @@ export class UpdateUserRequest extends TokenRequest {
 		rankName,
 		signature,
 		ultrasoundCode,
+		ecgCode,
 		token,
 	}) {
 		super({
@@ -488,6 +519,7 @@ export class UpdateUserRequest extends TokenRequest {
 		this.rankName = rankName;
 		this.signature = signature;
 		this.ultrasoundCode = ultrasoundCode;
+		this.ecgCode = ecgCode;
 		this.token = token;
 	}
 
@@ -504,6 +536,7 @@ export class UpdateUserRequest extends TokenRequest {
 			rankName: map['RankName'],
 			signature: map['Signature'],
 			ultrasoundCode: map['UltrasoundCode'],
+			ecgCode: map['EcgCode'],
 			token: map['Token'],
 }		);
 	}
@@ -532,6 +565,8 @@ export class UpdateUserRequest extends TokenRequest {
 			map['Signature'] = this.signature;
 		if(this.ultrasoundCode != null)
 			map['UltrasoundCode'] = this.ultrasoundCode;
+		if(this.ecgCode != null)
+			map['EcgCode'] = this.ecgCode;
 		return map;
 	}
 }
@@ -606,6 +641,41 @@ export class BindUltrasoundCodeRequest extends TokenRequest {
 	}
 }
 
+export class BindEcgCodeRequest extends TokenRequest {
+	userCode: String;
+	ecgCode: String;
+
+	constructor({
+		userCode,
+		ecgCode,
+		token,
+	}) {
+		super({
+		token,
+		});
+		this.userCode = userCode;
+		this.ecgCode = ecgCode;
+		this.token = token;
+	}
+
+	static fromJson(map: { [key: string]: any }): BindEcgCodeRequest {
+		return new BindEcgCodeRequest( 
+{ 			userCode: map['UserCode'],
+			ecgCode: map['EcgCode'],
+			token: map['Token'],
+}		);
+	}
+
+	toJson(): Record<string, unknown> {
+		const map: Record<string, unknown> = super.toJson();
+		if(this.userCode != null)
+			map['UserCode'] = this.userCode;
+		if(this.ecgCode != null)
+			map['EcgCode'] = this.ecgCode;
+		return map;
+	}
+}
+
 export class GetUserPageByOrganizationCodeRequest extends PageRequest {
 	keyword: String;
 	startTime: Date|null;

src/jsonrpc/services/user.ts

@@ -1,5 +1,5 @@
 import JsonRpcClientBase from '../client_base'
-import {CreateUserRequest,UserDTO,GetUserRequest,GetUserByKeyRequest,UserPageRequest,RemoveUserRequest,GetUserListRequest,UpdateUserRequest,ResetUserNameRequest,BindUltrasoundCodeRequest,GetUserPageByOrganizationCodeRequest,SetAreaOfResponsibilityRequest,GetAreaOfResponsibilityRequest,GetUserPageByTeamCodeRequest,SetSignatureRequest,GetMenuPermissionRequest,GetOperationPermissionRequest,} from  './user.m'
+import {CreateUserRequest,UserDTO,GetUserRequest,GetUserByKeyRequest,UserPageRequest,RemoveUserRequest,GetUserListRequest,UpdateUserRequest,ResetUserNameRequest,BindUltrasoundCodeRequest,BindEcgCodeRequest,GetUserPageByOrganizationCodeRequest,SetAreaOfResponsibilityRequest,GetAreaOfResponsibilityRequest,GetUserPageByTeamCodeRequest,SetSignatureRequest,GetMenuPermissionRequest,GetOperationPermissionRequest,} from  './user.m'
 import { GetUserInfoByVitalOpenIdRequest,PatientGenderEnum,PersonInfoBaseDTO,FaceScanErrorTypeEnum,PersonInfoByFaceImageDTO,GetPersonInfoByFaceImageRequest,RegisterConfirmRequest,PersonRegisterDTO,PersonInfoFullDTO,PageCollection,GetPersonPageRequest,GetPersonRequest,DeletePersonRequest,EnterPersonFaceQueryResult,EnterPersonFaceQueryRequest,EnterPersonFaceRequest, } from './register.m';
 import { CreateResidenceRequest,ResidenceDTO,GetResidenceRequest,GetResidenceByKeyRequest,ResidencePageRequest,RemoveResidenceRequest,GetResidenceListRequest,UpdateResidenceRequest,GetResidencePageByTownRequest, } from './residence.m';
 import { ApplicationTypeEnum,FeatureTypeEnum,CreateUserFeatureRequest,UserFeatureDTO,GetUserFeatureRequest,GetUserFeatureByKeyRequest,UserFeaturePageRequest,RemoveUserFeatureRequest,GetUserFeatureListRequest,UpdateUserFeatureRequest, } from './userFeature.m';
@@ -71,6 +71,11 @@ export class VitalUserService extends JsonRpcClientBase {
 		return rpcRst;
 	}
 
+	async bindEcgCodeAsync(request: BindEcgCodeRequest): Promise<boolean> {
+		var rpcRst = await this.call("BindEcgCodeAsync", request);
+		return rpcRst;
+	}
+
 	async getUserPageByOrganizationCodeAsync(request: GetUserPageByOrganizationCodeRequest): Promise<PageCollection<UserDTO>> {
 		var rpcRst = await this.call("GetUserPageByOrganizationCodeAsync", request);
 		var result = PageCollection.fromJson<UserDTO>(rpcRst as Record<string, unknown>);