Merge branch 'master' of http://git.fmode.cn:3000/yuebuzu/s202226701018

wisdom-app/deploy.ps1

@@ -16,3 +16,18 @@ obsutil chattri obs://nova-cloud/dev/jxnu/202226701018 -r -f -i=XSUWJSVMZNHLWFAI
 
 # 列举对象
 obsutil ls obs://nova-cloud/dev/jxnu/202226701018  -i=XSUWJSVMZNHLWFAINRZ1 -k=P4TyfwfDovVNqz08tI1IXoLWXyEOSTKJRVlsGcV6 -e="obs.cn-south-1.myhuaweicloud.com"
+
+
+# SSH 登录线上服务器 密码 notest
+ssh test@dev.fmode.cn
+
+# 进入www目录
+cd ~/www
+
+# 注意 git地址替换成自己的
+git clone http://git.fmode.cn:3000/yuebuzu/s202226701018.git 202226701018
+
+gitstats 202226701018 report202226701018
+
+# 同步报告目录
+obsutil sync ./report202226701018 obs://nova-cloud/dev/jxnu/202226701018/report  -i=XSUWJSVMZNHLWFAINRZ1 -k=P4TyfwfDovVNqz08tI1IXoLWXyEOSTKJRVlsGcV6 -e="obs.cn-south-1.myhuaweicloud.com" -acl=public-read

wisdom-app/package.json

@@ -45,6 +45,7 @@
     "@angular/compiler-cli": "^18.0.0",
     "@angular/language-service": "^18.0.0",
     "@capacitor/cli": "6.2.0",
+    "@compodoc/compodoc": "^1.1.26",
     "@ionic/angular-toolkit": "^11.0.1",
     "@types/amap-js-api": "^1.4.16",
     "@types/jasmine": "~5.1.0",
@@ -64,4 +65,4 @@
     "typescript": "~5.4.0"
   },
   "description": "An Ionic project"
-}
+}

wisdom-app/src/app/page/inquiry-human/inquiry-human.component.html

@@ -182,6 +182,11 @@
             <p style="color: grey;">{{doctor.expertise}}</p>
           </div>
         </div>
+        <div>
+          <ion-buttons>
+            <ion-button (click)="appoint(doctor.id)">立即预约</ion-button>
+          </ion-buttons>
+        </div>
       </ion-content>
       <ion-footer>
         <ion-button style="border-radius: 10px;" expand="block" color="success" (click)="openConsult()">立即咨询（￥120/次）</ion-button>

wisdom-app/src/app/page/inquiry-human/inquiry-human.component.ts

@@ -6,6 +6,7 @@ import { airplane, bluetooth, call, wifi, star, checkmarkCircle } from 'ionicons
 import { Router } from '@angular/router';
 import { CommonModule } from '@angular/common';
 import { FormsModule } from '@angular/forms';
+import { CloudObject, CloudUser } from 'src/lib/ncloud';
 
 addIcons({ airplane, bluetooth, call, wifi });
 
@@ -96,7 +97,7 @@ export class InquiryHumanComponent implements OnInit {
       unit: '',
       isAvailable: false
     }
-  ];
+];
 
   selectOption(option: ConsultOption) {
     if (!option.isAvailable) return;
@@ -107,12 +108,14 @@ export class InquiryHumanComponent implements OnInit {
   isModalOpen = false;
   isPaymentModalOpen = false; // 新增状态变量
   doctor: any;
-
+  currentUser: CloudUser 
   constructor(
     private router: Router,
     private toastController: ToastController // 注入 ToastController
   ) {
-      addIcons({star,checkmarkCircle}); }
+      addIcons({star,checkmarkCircle});
+      this.currentUser = new CloudUser();
+     }
 
   ngOnInit() { }
 
@@ -189,4 +192,21 @@ export class InquiryHumanComponent implements OnInit {
   closePaymentModal() {
     this.isPaymentModalOpen = false;
   }
+  appoint(id:any){
+    let appointment = new CloudObject('appointment')
+    appointment.set({
+      doctor: {
+        __type:"Pointer",
+        className:"doctor",
+        objectId:id
+      },
+      user: {
+        __type:"Pointer",
+        className:"user",
+        objectId:this.currentUser.id
+      },
+      type: '图文咨询'
+      }
+    )
+  }
 }

wisdom-app/src/app/page/page-my-health/page-my-health.component.html

@@ -22,7 +22,7 @@
   </ion-refresher>
 
   <!-- 数据加载指示器 -->
-  <ion-spinner *ngIf="isLoading" name="crescent" class="loading-spinner"></ion-spinner>
+  <!-- <ion-spinner *ngIf="isLoading" name="crescent" class="loading-spinner"></ion-spinner> -->
 
   <!-- 数据展示区域 -->
 

wisdom-app/src/app/page/page-user-inquery/page-user-inquery.component.ts

@@ -10,27 +10,24 @@ import { CloudObject, CloudQuery, CloudUser } from 'src/lib/ncloud';
 export class PageUserInqueryComponent  implements OnInit {
   currentUser:CloudUser;
   constructor(
+
   ) {
     this.currentUser = new CloudUser();
+    this.load()
    }
-   departName:string = ''
-   objectId: string = ''
+
   ngOnInit() {}
   async load(){
     let depart = new CloudQuery('Department');
-    depart.equalTo("name", this.departName)
+    depart.equalTo("name", "妇产科")
     let object = await depart.find()
-    if (!object){
-      console.log("科室名不存在")
-      return 
-    }
     console.log('object',object)
-    this.currentUser = new CloudUser();
-    console.log('currentUser',this.currentUser)
+    // this.currentUser = new CloudUser();
+    // console.log('currentUser',this.currentUser)
     let doctor = new CloudObject('Doctor1');
     doctor.set({
       avatar: 'https://app.fmode.cn/dev/jxnu/202226701019/doctor7.png',
-    name: '张三',
+    name: '李四',
     title: '主任医师',
     depart: {
       __type:"Pointer",
@@ -55,7 +52,7 @@ export class PageUserInqueryComponent  implements OnInit {
     user: {
       __type:"Pointer",
       className:"User",
-      objectId:this.objectId
+      objectId:"Gx3N24u5gl"
     }
     })
     doctor.save()

wisdom-app/src/app/tab1/tab1.page.html

@@ -22,18 +22,21 @@ node --max_old_space_size=8192 node_modules/@angular/cli/bin/ng serve -->
 <!-- 1234567890 1234 -->
 
 <ion-content [fullscreen]="true">
-  <!-- @if(currentUser?.id ==  adminList[0].id){ -->
-    <!-- <ion-card>
-      <ion-card-header>
-        <ion-card-title>管理员</ion-card-title>
-      </ion-card-header>
-      <ion-card-content>
-        <ion-button (click)="goToPageUser()">{{current}}</ion-button>
-        <ion-button (click)="goToPageDoctor()">查看医生</ion-button>
-        <ion-button (click)="goToPageDrug()">查看药品</ion-button>
-      </ion-card-content>
-    </ion-card> -->
-  <!-- } -->
+  @for (doctor of realDoctorList;track doctor) {
+    @if(currentUser?.id == doctor.data["user"]?.objectId){
+      <ion-card>
+        <ion-card-header>
+          <ion-card-title>医生</ion-card-title>
+        </ion-card-header>
+        <ion-card-content>
+          <ion-button (click)="goToPageUser()">去看预约</ion-button>
+          <ion-button (click)="goToPageDoctor()">查看医生</ion-button>
+          <ion-button (click)="goToPageDrug()">查看药品</ion-button>
+        </ion-card-content>
+      </ion-card>
+    }
+  }
+  
   <!-- @if (currentUser?.id !=  adminList[0]){ -->
     <!-- 轮播图区域 -->
     <div class="carousel-container" style="border-radius: 25px; margin: 5px auto;">

wisdom-app/src/app/tab1/tab1.page.ts

@@ -155,14 +155,26 @@ export class Tab1Page {
       backgroundColor: "#FFF5EB"
     }
   ];
+  realDoctorList: Array<CloudObject> = []
   constructor(
     private router: Router,
     private modalCtrl: ModalController,
     private http: HttpClient // 注入 HttpClient
   ) {
-    
+    this.loadRealDoctorList();
+    }
+    async loadRealDoctorList() {
+      this.currentUser = new CloudUser();
+      let query = new CloudQuery('Doctor1');
+      query.include('user')
+      query.include('depart')
+      this.realDoctorList =await query.find()
+      // console.log(this.realDoctorList)
+      console.log(this.realDoctorList[0].data["user"]?.objectId)
+      console.log(this.realDoctorList[1].data["user"]?.objectId)
+      console.log(this.realDoctorList[2].data["user"]?.objectId)
+      console.log(this.currentUser.id)
     }
-    
  /**
   * 轮播图
   */
@@ -256,6 +268,7 @@ export class Tab1Page {
     { label: '健康科普', icon: 'medkit', route: '/tabs/tab2' },
   ];
 
+
   // 导航到指定路由
   navigateTo(route: string) {
     let user = new CloudUser;
@@ -268,17 +281,6 @@ export class Tab1Page {
   }
 
   ngOnInit() {
-    
-    // let user = new CloudUser();
-    // let doctor = new CloudObject("Doctor")
-    // doctor.set({
-    //   user: {
-    //     __type:"Pointer",
-    //     className:"_User",
-    //     objectId:user.get("username")?.objectId
-    //   },
-    // })
-    // doctor.save()
     this.loadDoctorList();
     this.startAutoSlide();
   }
@@ -291,17 +293,14 @@ export class Tab1Page {
     for(let i = 0; i < 3; i++) {
       this.doctorList.push(List[i])
     }
-    let query1 = new CloudQuery('Consultation');
-    // query1.include('doctor');
-    // query1.include('user');
-    // query1.include('depart');
-    let content = await query1.find()
-    // 把content中的所有数据都打印出来
-    console.log("content: ",content)
-    for (let i = 0; i < content.length; i++) {
-      console.log("content: ",content[i].data["allContent"])
-    }
-    // console.log("content: ",content[0]?.get("allContent"))
+    // let query1 = new CloudQuery('Consultation');
+    // let content = await query1.find()
+    // // 把content中的所有数据都打印出来
+    // console.log("content: ",content)
+    // for (let i = 0; i < content.length; i++) {
+    //   console.log("content: ",content[i].data["allContent"])
+    // }
+    // // console.log("content: ",content[0]?.get("allContent"))
   }
   goToViewAll(){
     console.log(['route'])

wisdom-app/tsconfig.doc.json

@@ -0,0 +1,3 @@
+{    
+     "include": ["src/**/*.ts"]
+}