bugfix

src/app/components/configurationCenter/configuration-inspect/configuration-inspect-batch/configuration-inspect-batch.component.ts

@@ -199,21 +199,21 @@ export class ConfigurationInspectBatchComponent implements OnInit {
        this.loading = false;
        if (result.status == 200) {
          this.configs = result.list[0] || {};
-         this.activeDictionaryKey.postData.ibActiveStartTime1 = this.configs.ibActiveStartTime1 || undefined;
-         this.activeDictionaryKey.postData.ibActiveEndTime1 = this.configs.ibActiveEndTime1 || undefined;
-         this.activeDictionaryKey.postData.ibActiveStartTime2 = this.configs.ibActiveStartTime2 || undefined;
-         this.activeDictionaryKey.postData.ibActiveEndTime2 = this.configs.ibActiveEndTime2 || undefined;
-         this.activeDictionaryKey.postData.ibDefaultStartTime = this.configs.ibDefaultStartTime || undefined;
-         this.activeDictionaryKey.postData.ibDefaultEndTime = this.configs.ibDefaultEndTime || undefined;
+         this.activeDictionaryKey.postData.ibActiveStartTime1 = this.configs.ibActiveStartTime1 ? new Date(this.configs.ibActiveStartTime1) : undefined;
+         this.activeDictionaryKey.postData.ibActiveEndTime1 = this.configs.ibActiveEndTime1 ? new Date(this.configs.ibActiveEndTime1) : undefined;
+         this.activeDictionaryKey.postData.ibActiveStartTime2 = this.configs.ibActiveStartTime2 ? new Date(this.configs.ibActiveStartTime2) : undefined;
+         this.activeDictionaryKey.postData.ibActiveEndTime2 = this.configs.ibActiveEndTime2 ? new Date(this.configs.ibActiveEndTime2) : undefined;
+         this.activeDictionaryKey.postData.ibDefaultStartTime = this.configs.ibDefaultStartTime ? new Date(this.configs.ibDefaultStartTime) : undefined;
+         this.activeDictionaryKey.postData.ibDefaultEndTime = this.configs.ibDefaultEndTime ? new Date(this.configs.ibDefaultEndTime) : undefined;
          this.activeDictionaryKey.postData.ibDefaultDayStart[0].checked = this.configs.ibDefaultDayStart == 1;
          this.activeDictionaryKey.postData.ibDefaultDayEnd[0].checked = this.configs.ibDefaultDayEnd == 1;
 
-         this.activeDictionaryKey.postData.ib2ActiveStartTime1 = this.configs.ib2ActiveStartTime1 || undefined;
-         this.activeDictionaryKey.postData.ib2ActiveEndTime1 = this.configs.ib2ActiveEndTime1 || undefined;
-         this.activeDictionaryKey.postData.ib2ActiveStartTime2 = this.configs.ib2ActiveStartTime2 || undefined;
-         this.activeDictionaryKey.postData.ib2ActiveEndTime2 = this.configs.ib2ActiveEndTime2 || undefined;
-         this.activeDictionaryKey.postData.ib2DefaultStartTime = this.configs.ib2DefaultStartTime || undefined;
-         this.activeDictionaryKey.postData.ib2DefaultEndTime = this.configs.ib2DefaultEndTime || undefined;
+         this.activeDictionaryKey.postData.ib2ActiveStartTime1 = this.configs.ib2ActiveStartTime1 ? new Date(this.configs.ib2ActiveStartTime1) : undefined;
+         this.activeDictionaryKey.postData.ib2ActiveEndTime1 = this.configs.ib2ActiveEndTime1 ? new Date(this.configs.ib2ActiveEndTime1) : undefined;
+         this.activeDictionaryKey.postData.ib2ActiveStartTime2 = this.configs.ib2ActiveStartTime2 ? new Date(this.configs.ib2ActiveStartTime2) : undefined;
+         this.activeDictionaryKey.postData.ib2ActiveEndTime2 = this.configs.ib2ActiveEndTime2 ? new Date(this.configs.ib2ActiveEndTime2) : undefined;
+         this.activeDictionaryKey.postData.ib2DefaultStartTime = this.configs.ib2DefaultStartTime ? new Date(this.configs.ib2DefaultStartTime) : undefined;
+         this.activeDictionaryKey.postData.ib2DefaultEndTime = this.configs.ib2DefaultEndTime ? new Date(this.configs.ib2DefaultEndTime) : undefined;
          this.activeDictionaryKey.postData.ib2DefaultDayStart[0].checked = this.configs.ib2DefaultDayStart == 1;
          this.activeDictionaryKey.postData.ib2DefaultDayEnd[0].checked = this.configs.ib2DefaultDayEnd == 1;
        }

src/app/views/patient-inspect-log-detail/patient-inspect-log-detail.component.html

@@ -45,7 +45,7 @@
           <div class="info" nz-row>
             <div nz-col nzSpan="6">关联检查项目：{{ orderInfo.state && (orderInfo.state.value == 1 || orderInfo.state.value == 2) ? orderInfo.planInspectCount : orderInfo. inspectCount }}</div>
             <div nz-col nzSpan="6">状态：{{ orderInfo.state?.name }}</div>
-            <div nz-col nzSpan="6">携带设备：{{ orderInfo.goodsType?.name }}</div>
+            <div nz-col nzSpan="6">携带设备：{{ orderInfo.goodsNames }}</div>
             <div nz-col nzSpan="6">出行方式：{{ orderInfo.tripTypeDTO?.inspectMode }}</div>
           </div>
 

src/app/views/patient-inspect-log-detail/patient-inspect-log-detail.component.ts

@@ -66,7 +66,11 @@ export class PatientInspectLogDetailComponent implements OnInit {
           this.message.remove(this.maskFlag);
           this.maskFlag = false;
         }
-        this.orderInfo = data.data || {};
+        let orderInfo = data.data || {};
+        if(orderInfo.goodsList){
+          orderInfo.goodsNames = orderInfo.goodsList.map(v => v.name).toString();
+        }
+        this.orderInfo = orderInfo;
       });
   }
 

src/app/views/patient-inspect-log/patient-inspect-log.component.html

@@ -64,7 +64,7 @@
             <td>{{data.careLevel?.name}}<br>{{data.illnessState?.name}}</td>
             <td>{{data.outDeptTime | date:'yyyy-MM-dd HH:mm'}}<br>{{data.outDeptUserDTO?.name}}</td>
             <td>{{data.backDeptTime | date:'yyyy-MM-dd HH:mm'}}<br>{{data.backDeptUserDTO?.name}}</td>
-            <td>{{data.goodsType?.name}}<br>{{data.tripTypeDTO?.inspectMode}}</td>
+            <td>{{data.goodsNames}}<br>{{data.tripTypeDTO?.inspectMode}}</td>
             <td>{{data.yyTime | date:'yyyy-MM-dd HH:mm'}}</td>
             <td>{{data.state?.name}}</td>
             <td>

src/app/views/patient-inspect-log/patient-inspect-log.component.ts

@@ -98,7 +98,15 @@ export class PatientInspectLogComponent implements OnInit {
       .subscribe((data) => {
         this.loading1 = false;
         if (data.status == 200) {
-          this.listOfData = data.list;
+          let listOfData = data.list || [];
+          listOfData.forEach((v) => {
+            if(v.goodsList){
+              v.goodsNames = v.goodsList.map(v => v.name).toString();
+            }else{
+              v.goodsNames = "";
+            }
+          })
+          this.listOfData = listOfData;
           this.listLength = data.totalNum;
         }else{
           this.message.error(data.msg || "请求数据失败");