|
@@ -12,6 +12,8 @@ import {
|
|
|
ADD_LABEL
|
|
|
} from '../types/inspect';
|
|
|
import store from '@store'
|
|
|
+import {dateParser} from '@common/js/func';
|
|
|
+
|
|
|
const initSearchList = {
|
|
|
list: [], //搜索的结果
|
|
|
labelList: [], //选中的结果,也是需要保存的数据
|
|
@@ -265,6 +267,7 @@ function getPushList(data1,data2){ //推送数据
|
|
|
let tmpArr1 = [];
|
|
|
let tmpArr2 = [];
|
|
|
let totalTmpArr = [];
|
|
|
+ const now = dateParser(new Date());
|
|
|
data1.length>0 && data1.map((items)=>{ //excel导入的数据拼接
|
|
|
items.lisExcelRes.map((item)=>{
|
|
|
item.lisExcelItem.map((part)=>{
|
|
@@ -275,6 +278,7 @@ function getPushList(data1,data2){ //推送数据
|
|
|
tmpObj.source = '1';//数据来源
|
|
|
tmpObj.maxValue = part.max || '';
|
|
|
tmpObj.minValue = part.min || '';
|
|
|
+ tmpObj.time = part.time ||now;
|
|
|
tmpObj.units = part.unit || '';//单位
|
|
|
tmpObj.value = (part.value-0) === (part.value-0) ? part.value:'';//值
|
|
|
tmpObj.otherValue = (part.value-0) === (part.value-0) ?'':part.value; //阴性阳性
|
|
@@ -292,6 +296,7 @@ function getPushList(data1,data2){ //推送数据
|
|
|
tmpObj.source = '0'; //数据来源
|
|
|
tmpObj.maxValue = val.maxValue ? val.maxValue : '';
|
|
|
tmpObj.minValue = val.minValue ? val.minValue : '';
|
|
|
+ tmpObj.time = val.time || now;
|
|
|
tmpObj.units = val.labelSuffix || '';
|
|
|
tmpObj.value = (val.value-0) === (val.value-0) ? val.value:'';
|
|
|
tmpObj.otherValue = (val.value-0) === (val.value-0) ?'':val.value;
|