Merge branch 'addTime0817' into testNew

src/components/PreviewBody/Inspect/index.jsx

@@ -18,8 +18,8 @@ const PreviewInspect = (props) => {
             // console.log(item, item,'=====');
             return (
               <tr className={style.assistTableTrSec}>
-                <td className={style.assistTableTdFst}>{item.detailName}</td>
-                <td className={style.assistTableTdSec}>
+                <td className={style.assistTableTdFst} title={item.detailName}>{item.detailName}</td>
+                <td className={style.assistTableTdSec} title={item.units}>
                   {/* {getStatusImg(value.type, value.value, 1)}
                       {value.unit} */}
                   {getStatusImg(0, item.value, 1)}
@@ -28,14 +28,21 @@ const PreviewInspect = (props) => {
                       {'mmol/L'} */}
                 </td>
                 {/* {showDetails(item)} */}
-                <td className={style.assistTableTdTrd}>
+                <td className={style.assistTableTdTrd} title={normalVal(item.minValue, item.maxValue)}>
                   {normalVal(item.minValue, item.maxValue)}
                   {/* {normalVal(3.9, 6.1)} */}
                 </td>
                 {/* <td className={style.assistTableTdFor}>{item.time == '' ? ('导入时间：' + dateTime) : '检验时间：' + toTime(item.time) */}
                 {/* <td className={style.assistTableTdFor}>{item.time == '' ?   dateTime  :  item.time}</td> */}
                 <td className={style.assistTableTdFor}><img className={style.imgCheck} src={billing} title={'开单时间'} />{item.time}</td>
-                <td className={style.assistTableTdFor}><img className={style.imgCheck} src={report} title={'报告时间'} />{item.finishDateValue}</td>
+                <td className={style.assistTableTdFor}>
+                  {
+                    item.finishDateValue || item.finishDateValue != '' ? (
+                      <img className={style.imgCheck} src={report} title={'报告时间'} />
+                    ) : null
+                  }
+                  {item.finishDateValue}
+                </td>
               </tr>
               // </table>
             )
@@ -47,7 +54,7 @@ const PreviewInspect = (props) => {
             return (
               // <table style={style.assistTable}>
               <tr className={style.assistTableTrSec}>
-                <td className={style.assistTableTdFst}>{item.name}</td>
+                <td className={style.assistTableTdFst} title={item.name}>{item.name}</td>
                 <td className={style.assistTableTdSec}></td>
                 <td className={style.assistTableTdTrd}></td>
                 {/* <td className={style.assistTableTdFor}>{item.time == '' ? ('导入时间：' + dateTime) : '检验时间：' + toTime(item.time) */}
@@ -59,7 +66,8 @@ const PreviewInspect = (props) => {
                       <img className={style.imgCheck} src={report} title={'报告时间'} />
                     ) : null
                   }
-                  {item.finishDateValue}</td>
+                  {item.finishDateValue}
+                </td>
               </tr>
               // </table>
             )

src/components/PreviewBody/index.less

@@ -83,6 +83,7 @@ table{
   .assistTableTrSec {
     line-height: 22px;
     max-width: 650px;
+    display: flex;
     td {
       font-size: 12px;
       span {
@@ -113,14 +114,23 @@ table{
   }
 }
 .assistTableTdFst {
-  width: 18%;
+  width: 90px;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  display: block;
+  margin-right: 10px;
 }
 .adviceTableTdFst {
   width: 28%;
 }
 .assistTableTdSec {
-  width: 12%;
+  width: 70px;
   position: relative;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  margin-right: 15px;
   img {
     top: 6px !important;
   }
@@ -129,10 +139,15 @@ table{
 //   width:3%;
 // }
 .assistTableTdTrd {
-  width:15%;
+  width: 90px;
+  position: relative;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  margin-right: 15px;
 }
 .assistTableTdFor {
-  width: 22%;
+  width: 25%;
 }
 .assistTableTrSecExcel {
   line-height: 1.5;
@@ -155,6 +170,7 @@ table{
   font-size: 14px;
   word-break: break-all;
   display: flex;
+  flex-flow: column
 }
 .font14 {
   font-size: 14px;

src/store/reducers/assistCheck.js

@@ -77,7 +77,6 @@ export default (state = initSearchList, action) => {
     // }
     newState.assistLabel = [...tempArr]
     let tmpObj = getAllString(newState.checkedListImport,newState.assistLabel)
-    console.log(tmpObj)
     newState.dataArr = tmpObj.arr
     newState.dataString = tmpObj.str
     

src/utils/tools.js

@@ -119,7 +119,6 @@ const getAllDataList =(baseList) =>{           //获取所有模块结构化的
     jsonData.menstruationHistory = baseList.menstruationHistory.saveText && baseList.menstruationHistory.saveText[0];   //月经史
     jsonData.checkBody = baseList.checkBody.saveText && baseList.checkBody.saveText[0];   //查体
 
-
     jsonData.lis.labelList = baseList.inspect.labelListSmall &&  baseList.inspect.labelListSmall;      //化验
     jsonData.pacs = baseList.assistCheck.assistLabel;     //辅检
     jsonData.diag = baseList.diagnosticList.diagnosticList;      //诊断
@@ -963,6 +962,9 @@ function getEMRParams(){
       }
       return item
     }
+    if (item.check){
+      item.finishDateValue = ""
+    }
   })
   let tempLisOrder = JSON.parse(JSON.stringify(inspect.totalOrder)) 
   tempLisOrder = tempLisOrder.filter((item)=>{
@@ -983,6 +985,9 @@ function getEMRParams(){
       }
       return item
     }
+    if (item.check) {
+      item.finishDateValue = ""
+    }
   })
   let tempPacOrder = JSON.parse(JSON.stringify(assistCheck.totalOrder)) 
   tempPacOrder = tempPacOrder.filter((item)=>{
@@ -1003,6 +1008,9 @@ function getEMRParams(){
       }
       return item
     }
+    if (item.check) {
+      item.finishDateValue = ""
+    }
   })
   let tempdrugorder = newAdvice.drugOrder
   tempdrugorder = tempdrugorder.filter((item)=>{
@@ -1022,6 +1030,9 @@ function getEMRParams(){
       }
       return item
     }
+    if (item.check) {
+      item.finishDateValue = ""
+    }
   })
   let tempOperationOrder = newAdvice.operationOrder
   tempOperationOrder = tempOperationOrder.filter((item)=>{
@@ -1042,6 +1053,9 @@ function getEMRParams(){
       }
       return item
     }
+    if (item.check) {
+      item.finishDateValue = ""
+    }
   })  
   let tempTransfusionOrder = newAdvice.transfusionOrder||[]
   tempTransfusionOrder = tempTransfusionOrder.filter((item)=>{
@@ -1914,9 +1928,19 @@ function getAllString(checkedListImport,assistLabel,flg){
     tmpArr.push(obj)
     console.log(tempArr)
     // tmpString += (tempArr[i].name + (tmpVal ? ('：' + tmpVal) + ', ' : '：') + (tempArr[i].time ? '报告日期：' + tempArr[i].time : '') + '^;')
-    tmpString += (tempArr[i].name + (tmpVal ? ('：' + tmpVal) + ', ' : '：') + `<img style='margin:0 5px' title="开单时间" src='/src/common/images/billing_time.png' alt=""/>` + (tempArr[i].time ? tempArr[i].time : '') + (tempArr[i].check || tempArr[i].finishDateValue == '' ? '' : `<img style="margin:0 5px" title="报告时间" src='/src/common/images/report_time.png' alt=""/>`) + (tempArr[i].check ? '' : tempArr[i].finishDateValue))
+    tmpString += 
+    `<div>` 
+      + `<div style="display:flex;justify-content: space-between;">`
+        + `<span>`+tempArr[i].name + `</span>`
+        + `<div><img style='margin:0 5px' title="开单时间" src='/src/common/images/billing_time.png' alt=""/>` 
+        + (tempArr[i].time ? tempArr[i].time : '') + (tempArr[i].check || tempArr[i].finishDateValue == '' ? '' : `<img style="margin:0 5px" title="报告时间" src='/src/common/images/report_time.png' alt=""/>`) 
+        + (tempArr[i].check ? '' : tempArr[i].finishDateValue)
+      + '</div>'
+    + `</div>` 
+    + `<span>` + (tmpVal ? tmpVal : '')+`</span>`
+    +`</div>`
   }
-
+  //  
   return tmpObj = {
     arr:tmpArr,
     str:tmpString