rpc更新

public/highBloodPressureTable.html

@@ -474,6 +474,7 @@
 			</div>
 		</div>
 		<script>
+			debugger
 			const data = window.parent.tableData;
 				document.getElementById("PatientName").innerHTML =
 				data[0].PatientName;

src/jsonrpc/services/followUp.m.js

@@ -431,7 +431,7 @@ exports.GetFollowUpPageByKeyRequest = GetFollowUpPageByKeyRequest;
 var GetFollowUpPatientPageByKeyRequest = /** @class */ (function (_super) {
     __extends(GetFollowUpPatientPageByKeyRequest, _super);
     function GetFollowUpPatientPageByKeyRequest(_a) {
-        var key = _a.key, followUpState = _a.followUpState, _b = _a.pageIndex, pageIndex = _b === void 0 ? 0 : _b, _c = _a.pageSize, pageSize = _c === void 0 ? 0 : _c, keyword = _a.keyword, startTime = _a.startTime, endTime = _a.endTime, token = _a.token;
+        var key = _a.key, _b = _a.pageIndex, pageIndex = _b === void 0 ? 0 : _b, _c = _a.pageSize, pageSize = _c === void 0 ? 0 : _c, keyword = _a.keyword, startTime = _a.startTime, endTime = _a.endTime, token = _a.token;
         var _this = _super.call(this, {
             pageIndex: pageIndex,
             pageSize: pageSize,
@@ -441,7 +441,6 @@ var GetFollowUpPatientPageByKeyRequest = /** @class */ (function (_super) {
             token: token,
         }) || this;
         _this.key = key;
-        _this.followUpState = followUpState;
         _this.pageIndex = pageIndex || 0;
         _this.pageSize = pageSize || 0;
         _this.keyword = keyword;
@@ -452,7 +451,6 @@ var GetFollowUpPatientPageByKeyRequest = /** @class */ (function (_super) {
     }
     GetFollowUpPatientPageByKeyRequest.fromJson = function (map) {
         return new GetFollowUpPatientPageByKeyRequest({ key: map['Key'],
-            followUpState: map['FollowUpState'],
             pageIndex: map['PageIndex'],
             pageSize: map['PageSize'],
             keyword: map['Keyword'],
@@ -465,8 +463,6 @@ var GetFollowUpPatientPageByKeyRequest = /** @class */ (function (_super) {
         var map = _super.prototype.toJson.call(this);
         if (this.key != null)
             map['Key'] = this.key;
-        if (this.followUpState != null)
-            map['FollowUpState'] = this.followUpState;
         return map;
     };
     return GetFollowUpPatientPageByKeyRequest;

src/jsonrpc/services/followUp.m.ts

@@ -528,11 +528,9 @@ export class GetFollowUpPageByKeyRequest extends PageRequest {
 
 export class GetFollowUpPatientPageByKeyRequest extends PageRequest {
 	key: String;
-	followUpState: FollowUpStateEnum|null;
 
 	constructor({
 		key,
-		followUpState,
 		pageIndex= 0,
 		pageSize= 0,
 		keyword,
@@ -549,7 +547,6 @@ export class GetFollowUpPatientPageByKeyRequest extends PageRequest {
 		token,
 		});
 		this.key = key;
-		this.followUpState = followUpState;
 		this.pageIndex = pageIndex||0;
 		this.pageSize = pageSize||0;
 		this.keyword = keyword;
@@ -561,7 +558,6 @@ export class GetFollowUpPatientPageByKeyRequest extends PageRequest {
 	static fromJson(map: { [key: string]: any }): GetFollowUpPatientPageByKeyRequest {
 		return new GetFollowUpPatientPageByKeyRequest( 
 { 			key: map['Key'],
-			followUpState: map['FollowUpState'] ,
 			pageIndex: map['PageIndex'],
 			pageSize: map['PageSize'],
 			keyword: map['Keyword'],
@@ -575,8 +571,6 @@ export class GetFollowUpPatientPageByKeyRequest extends PageRequest {
 		const map: Record<string, unknown> = super.toJson();
 		if(this.key != null)
 			map['Key'] = this.key;
-		if(this.followUpState != null)
-			map['FollowUpState'] = this.followUpState;
 		return map;
 	}
 }

src/views/followUp/components/personalFollowUpRecord.vue

@@ -4,7 +4,12 @@
       <el-header>
         <div class="left-panel">
           <el-button type="primary" icon="el-icon-plus" @click="addfollowUp" />
-          <!-- <el-button type="danger" plain icon="el-icon-delete" /> -->
+          <el-button type="primary" plain @click="previewfollowUpRecord"
+            >2014</el-button
+          >
+          <el-button type="primary" plain @click="previewfollowUpRecord"
+            >2013</el-button
+          >
         </div>
       </el-header>
       <el-main class="nopadding">
@@ -63,15 +68,17 @@
           <el-table-column label="操作" width="180" align="center">
             <template #default="props">
               <div>
-                <el-button v-if="props.row.followUpState!='已作废'"
+                <!-- <el-button
+                  v-if="props.row.followUpState != '已作废'"
                   link
                   type="primary"
                   size="small"
                   @click="previewfollowUpRecord(props.row)"
                 >
                   预览
-                </el-button>
-                <el-button v-if="props.row.followUpState!='已作废'"
+                </el-button> -->
+                <el-button
+                  v-if="props.row.followUpState != '已作废'"
                   link
                   type="primary"
                   size="small"
@@ -79,7 +86,8 @@
                 >
                   编辑
                 </el-button>
-                <el-button v-if="props.row.followUpState!='已作废'"
+                <el-button
+                  v-if="props.row.followUpState != '已作废'"
                   link
                   type="primary"
                   size="small"
@@ -87,14 +95,14 @@
                 >
                   作废
                 </el-button>
-                <el-button
+                <!-- <el-button
                   link
                   type="primary"
                   size="small"
                   @click="removefollowUpRecord(props.row)"
                 >
                   删除
-                </el-button>
+                </el-button> -->
               </div>
             </template>
           </el-table-column></scTable
@@ -288,11 +296,12 @@ export default {
       }
     },
     ///预览
-    async previewfollowUpRecord(row) {
-      console.log("%c Line:234 🧀 row", "color:#e41a6a", row);
+    async previewfollowUpRecord(event) {
+      const buttonName = event.target.innerText;
+      console.log("%c Line:234 🧀 row", "color:#e41a6a", buttonName);
       const getFollowUpRecordListByYearRequest =
         new GetFollowUpRecordListByYearRequest({
-          year: "2023",
+          year: buttonName,
           keys: [this.patientInfo.key],
           token: store.state.userInfo.token,
           patientCode: this.patientInfo.patientCode,
@@ -301,6 +310,7 @@ export default {
         await this.$rpc.followUp.getFollowUpRecordListByYearAsync(
           getFollowUpRecordListByYearRequest
         );
+      debugger;
       console.log(
         "%c Line:287 🎂 followUpTableData",
         "color:#3f7cff",
@@ -308,24 +318,24 @@ export default {
       );
 
       let tableData = [];
-	  if(followUpTableData!=null && followUpTableData.length>0)
-	  {
-		followUpTableData[0].followUpRecordDatas.forEach((item) => {
-			tableData.push(
-			Object.assign(
-				{
-				PatientName: this.patientInfo.patientName,
-				Follow_Time: moment(item.followUpTime).format("YYYY年MM月DD日"),
-				Follow_Type: item.followUpMode + 1,
-				Next_Follow_Up_Time: moment(item.nextFollowUpTime).format(
-					"YYYY年MM月DD日"
-				),
-				},
-				JSON.parse(item.followUpData)
-			)
-			);
-		});
-	  }
+      if (followUpTableData != null && followUpTableData.length > 0) {
+        followUpTableData[0].followUpRecordDatas.forEach((item) => {
+          tableData.push(
+            Object.assign(
+              {
+                PatientName: this.patientInfo.patientName,
+                Follow_Time: moment(item.followUpTime).format("YYYY年MM月DD日"),
+                Follow_Type: item.followUpMode + 1,
+                Next_Follow_Up_Time: moment(item.nextFollowUpTime).format(
+                  "YYYY年MM月DD日"
+                ),
+              },
+              JSON.parse(item.followUpData)
+            )
+          );
+        });
+      }
+      debugger;
       window.tableData = tableData;
       var fromConfig = await this.getTemplateDetail();
       window.fromConfig = fromConfig;