水分测试护理报告

src/moduleIOT/pages/iotCarePlan/FR200.tsx

@@ -691,7 +691,7 @@ class IotCarePlanFR200 extends Component<any, any> {
 
       let formattedDate = `${year}.${month}.${day}`;
 
-       
+
       this.moistureTest(params.nursingData, formattedDate, ActiveModeItem.id, currentDevice.id)
     }, 2000);
   };
@@ -717,12 +717,14 @@ class IotCarePlanFR200 extends Component<any, any> {
     }
     let gears: any = []
     let eDate: any = []
-    echartsData.map(item => {
+    echartsData?.map(item => {
+      console.log(item,'查看数据');
+      
       const result = item.createTime.split(' ')[0].substring(5);
       eDate.push(result)
       item.nursingData = JSON.parse(item.nursingData)
       let level: any = 0
-      item.nursingData.GearData.map(gear => {
+      item.nursingData?.GearData?.map(gear => {
         level = level + gear.forehead
       })
       level = Math.floor(level / 3)
@@ -2017,7 +2019,13 @@ class IotCarePlanFR200 extends Component<any, any> {
     console.log(nowFR200NursingHistory, 'nowFR200NursingHistory');
 
     // 护理脸部
-    if (nowFR200NursingHistory.jsonStatus.workMode === "face") {
+    if ([
+      "face",
+      "eyes",
+      "nasolabialFold",
+      "mandibularLine",
+      "headLiftingPro",
+    ].includes(nowFR200NursingHistory.jsonStatus.workMode)) {
       //  把working=工作中的状态数据筛选出来
       let filtered = nowFR200NursingHistory.dataArray.filter(
         (item) => item.workStatus === "working"
@@ -2081,7 +2089,7 @@ class IotCarePlanFR200 extends Component<any, any> {
 
       return nursingData;
     }
-    return { nursingData:JSON.stringify({workMode: nowFR200NursingHistory.workMode,})  }  
+    return { nursingData: JSON.stringify({ workMode: nowFR200NursingHistory.workMode, }),showFace:true }
   };
 
   // 计算挡位
@@ -2118,11 +2126,12 @@ class IotCarePlanFR200 extends Component<any, any> {
       };
     }
     let res1: any = await this.todoPromise();
-    if(res1){
+    if (!res1?.showFace) {
+   
       params = { ...params, ...res1 };
     }
     console.log(res1, "查看返回数据");
-    
+
     let res2: any = await InstrumentInfo.apiNursingLog.addLog(params);
     console.log("PostNursingLogClock", res2);
     if (res2.data.code === 200) {
@@ -2274,9 +2283,9 @@ class IotCarePlanFR200 extends Component<any, any> {
       console.log("水分测试");
     } else {
       console.log('跳转11111111');
-      
+
       let report = true;
-      
+
       go(
         "/recoding/pages/face_report/face_report?id=" +
         deviceid +

src/recoding/pages/recording/recording.tsx

@@ -357,6 +357,8 @@ export default class Recording extends Component<any, any> {
       instrumentId: allData.instrumentId
     }
     let res = await InstrumentInfo.fr200.moistureTest(data);
+    console.log(res,'查看返回数据');
+    
     let echartsData = res.data.rows
     for (let i = 0; i < echartsData.length; i++) {
       for (let j = i + 1; j < echartsData.length; j++) {
@@ -372,12 +374,15 @@ export default class Recording extends Component<any, any> {
     }
     let gears: any = []
     let eDate: any = []
+    console.log(echartsData,'echartsDataechartsData');
+    
     echartsData.map(item => {
+      
       const result = item.createTime.split(' ')[0].substring(5);
       eDate.push(result)
       item.nursingData = JSON.parse(item.nursingData)
       let level: any = 0
-      item.nursingData.GearData.map(gear => {
+      item.nursingData?.GearData?.map(gear => {
         level = level + gear.forehead
       })
       level = Math.floor(level / 3)