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

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

@@ -34,14 +34,14 @@ export class Tab3Page {
   currentProduct: any;      // 当前选择的药品信息
 
   categories = [
-    { name: '皮肤用药', image: '../../assets/image/doctor7.png' },
-    { name: '妇科用药', image: '../../assets/image/doctor7.png' },
-    { name: '肠胃消化', image: '../../assets/image/doctor7.png' },
-    { name: '呼吸用药', image: '../../assets/image/doctor7.png' },
-    { name: '营养补充', image: '../../assets/image/doctor7.png' },
-    { name: '家庭常备', image: '../../assets/image/doctor7.png' },
-    { name: '耳鼻咽喉', image: '../../assets/image/doctor7.png' },
-    { name: '男科用药', image: '../../assets/image/doctor7.png' },
+    { name: '皮肤用药', image: 'https://app.fmode.cn/dev/jxnu/202226701019/yao1.png' },
+    { name: '肠胃消化', image: 'https://app.fmode.cn/dev/jxnu/202226701019/yao5.png' },
+    { name: '呼吸用药', image: 'https://app.fmode.cn/dev/jxnu/202226701019/yao11.png' },
+    { name: '营养补充', image: 'https://app.fmode.cn/dev/jxnu/202226701019/yao9.png' },
+    { name: '家庭常备', image: 'https://app.fmode.cn/dev/jxnu/202226701019/yao12.png' },
+    { name: '耳鼻咽喉', image: 'https://app.fmode.cn/dev/jxnu/202226701019/yao10.png' },
+    { name: '骨科疼痛', image: 'https://app.fmode.cn/dev/jxnu/202226701019/yao6.png' },
+    { name: '心脑血管', image: 'https://app.fmode.cn/dev/jxnu/202226701019/yao7.png' },
   ];
 
   products: Array<CloudObject> = [];

wisdom-server/migration/import-data.js

@@ -12,35 +12,36 @@ DataMap = {
 };
 
 async function inportDapartAndDoctor() {
-    // 导入药品数据
-    // let drugList = DrugList;
-    // for (let index = 0; index < drugList.length; index++) {
-    //     let drug = drugList[index];
-    //     drug = await importObject("Drug", drug);
-    // }
+    导入药品数据
+    let drugList = DrugList;
+    for (let index = 0; index < drugList.length; index++) {
+        let drug = drugList[index];
+        drug = await importObject("Drug", drug);
+    }
 
-    // 如果需要导入其他数据（科室、医生、热点），可以取消注释以下代码
+    //如果需要导入其他数据（科室、医生、热点），可以取消注释以下代码
    
-    // // 导入科室数据
-    // let departList = DepartList;
-    // for (let index = 0; index < departList.length; index++) {
-    //     let depart = departList[index];
-    //     depart = await importObject("Department", depart);
-    // }
+    // 导入科室数据
+    let departList = DepartList;
+    for (let index = 0; index < departList.length; index++) {
+        let depart = departList[index];
+        depart = await importObject("Department", depart);
+    }
 
-    // // 导入医生数据
-    // let doctorList = DoctorList;
-    // for (let index = 0; index < doctorList.length; index++) {
-    //     let doctor = doctorList[index];
-    //     doctor = await importObject("Doctor", doctor);
-    // }
+    // 导入医生数据
+    let doctorList = DoctorList;
+    for (let index = 0; index < doctorList.length; index++) {
+        let doctor = doctorList[index];
+        doctor = await importObject("Doctor", doctor);
+    }
 
-    // 导入热点数据
+    导入热点数据
     let hotDotList = HotDotList;
     for (let index = 0; index < hotDotList.length; index++) {
         let hotDot = hotDotList[index];
         hotDot = await importObject("HotDot", hotDot);
     }
+    
     console.log("药品数据导入完成");
 }