改bug

src/components/AddAssistCheck/index.jsx

@@ -147,7 +147,7 @@ class AddAssistCheck extends React.Component {
     this.setState({ date: false })
   }
   getAssistLabel() {
-    const { assistLabel, handleChangeAssistValue, handleChangeDate, isRead, handlePush, winWidth,getInfomation } = this.props;
+    const { assistLabel, handleChangeAssistValue, handleChangeDate, isRead, handlePush, winWidth,getInfomation,assistList } = this.props;
     const { visible,activeName,id,date } = this.state;
     return <ul className={styles.labelWrap} id="datePick">
       {
@@ -194,7 +194,7 @@ class AddAssistCheck extends React.Component {
     </ul>
   }
   render() {
-    const { handleChangeValue, list,assistVal,windowHeight } = this.props;
+    const { handleChangeValue, list,assistVal,windowHeight,assistList } = this.props;
     const { visible,pageTop } = this.state;
     return (
       <div className={styles.wrapper}>
@@ -204,7 +204,7 @@ class AddAssistCheck extends React.Component {
           {this.state.show ? <SearchOption windowHeight={windowHeight} pageTop={pageTop} height={280} handleChangeValue={handleChangeValue} visible={true}>
             {list && list.length>0?this.getSearchList(list):(assistVal == ''?'':<p style={{padding:'5px 30px',color:'#bfbfbf'}}>暂无筛选项</p>)}
             {
-              list && list.length>0 || (assistVal != '')?'':<div>
+              (list && list.length>0) || (assistVal != '') || (assistList&&assistList.length==0)?'':<div>
                 <p style={{padding:'5px 30px',color:'#bfbfbf'}}>常用辅检项</p>
                 {
                   this.getCommonList()

src/components/AddInspect/SlideExcel/index.jsx

@@ -52,7 +52,7 @@ class SlideExcel extends Component {
                       </td>
                       <td style={{width:'20%'}}>
                         {
-                          getStatusImg(value.type,value.value,0)
+                          getStatusImg(value.type,value.value,1)
                         }
                         {value.unit}</td>
                       <td style={{width:'25%'}}>

src/components/AddInspect/index.jsx

@@ -317,7 +317,7 @@ class Inspect extends React.Component {
     }
   }
   render() {
-    const { getInfomation, handleChangeValue, inspectVal, list, labelList, windowHeight, delPartItem, handleLabelSub, handleClear, handleConfirm, fillActive, getExcelDataList, handleCloseExcel, handlePush } = this.props;
+    const { getInfomation, handleChangeValue,inspectList, inspectVal, list, labelList, windowHeight, delPartItem, handleLabelSub, handleClear, handleConfirm, fillActive, getExcelDataList, handleCloseExcel, handlePush } = this.props;
     const { tmpId, tmpIdx, id, pageTop, impId } = this.state;
 
     return (
@@ -386,7 +386,7 @@ class Inspect extends React.Component {
           {this.state.show ? <SearchOption windowHeight={windowHeight} height={280} pageTop={pageTop} handleChangeValue={handleChangeValue} visible={true}>
             {list && list.length > 0 ? this.getSearchList(list) : (inspectVal == '' ? '' : <p style={{ padding: '5px 30px', color: '#bfbfbf' }}>暂无筛选项</p>)}
             {
-              list && list.length > 0 || (inspectVal != '') ? '' : <div>
+              (list && list.length > 0) || (inspectVal != '') || (inspectList&&inspectList.length==0) ? '' : <div>
                 <p style={{ padding: '5px 30px', color: '#bfbfbf' }}>常用化验项</p>
                 {
                   this.getCommonList()

src/components/EmergencyProcedure/EmergencyPart/PartTrd/index.jsx

@@ -263,11 +263,11 @@ class PartTrd extends React.Component {
               </div>
               <div className={`${styles.hold}`}>
                 <span className={styles.holdLeft}>阴性</span>
-                <span className={styles.holdRight}>请相关科室会寻找病因</span>
+                <span className={styles.holdRight}>请相关科室会诊寻找病因</span>
               </div>
             </React.Fragment> : <React.Fragment>
                 <h4>建议ACLS（高级心脏生命支持）</h4>
-                <h4>请相关科室会寻找病因</h4>
+                <h4>请相关科室会诊寻找病因</h4>
               </React.Fragment>
           }
         </React.Fragment>
@@ -286,11 +286,11 @@ class PartTrd extends React.Component {
               </div>
               <div className={`${styles.hold}`}>
                 <span className={styles.holdLeft}>阴性</span>
-                <span className={styles.holdRight}>请相关科室会寻找病因</span>
+                <span className={styles.holdRight}>请相关科室会诊寻找病因</span>
               </div>
             </React.Fragment> : <React.Fragment>
                 <span className={styles.emergencyBtnS}>排除肺栓塞</span>
-                <h4>请相关科室会寻找病因</h4>
+                <h4>请相关科室会诊寻找病因</h4>
               </React.Fragment>
           }
         </React.Fragment>

src/components/EmergencyProcedure/emergency.js

@@ -264,7 +264,7 @@ let data = [
                   },
                   {
                     message:'阴性',
-                    result:'请相关科室会寻找病因',
+                    result:'请相关科室会诊寻找病因',
                     text:'',
                     link:''
                   }
@@ -275,7 +275,7 @@ let data = [
                 links:[
                   {
                     message:'建议ACLS（高级心脏生命支持）',
-                    text:'请相关科室会寻找病因',
+                    text:'请相关科室会诊寻找病因',
                     diagnose:'',
                     result:'',
                     link:''
@@ -303,7 +303,7 @@ let data = [
                   },
                   {
                     message:'阴性',
-                    result:'请相关科室会寻找病因',
+                    result:'请相关科室会诊寻找病因',
                     text:'',
                     link:''
                   }
@@ -314,7 +314,7 @@ let data = [
                 links:[
                   {
                     message:'排除肺栓塞',
-                    text:'请相关科室会寻找病因'
+                    text:'请相关科室会诊寻找病因'
                   }
                 ]
               },

src/components/PreviewBody/Inspect/index.jsx

@@ -1,5 +1,5 @@
 import style from "../index.less";
-import { normalVal } from '@utils/tools';
+import { normalVal,getStatusImg } from '@utils/tools';
 
 const PreviewInspect = (props) => {
   const { dataJson, toTime ,dateTime,showDetails  } = props;
@@ -15,7 +15,10 @@ const PreviewInspect = (props) => {
                   item.lisExcelItem && item.lisExcelItem.map((value) => {
                     return <tr className={style.assistTableTrSec}>
                       <td className={style.assistTableTdFst}>{value.itemName}</td>
-                      <td className={style.assistTableTdSec}><span style={{ color: value.type == 1 ? "red" : null }}>{value.value}</span> {value.unit}</td>
+                      <td className={style.assistTableTdSec}>
+                        {getStatusImg(value.type,value.value,1)}
+                        {value.unit}
+                      </td>
                       <td className={style.assistTableTdTrd}>
                         {normalVal(value.min, value.max)}
                       </td>

src/components/PreviewBody/index.jsx

@@ -1,6 +1,6 @@
 import React, { Component } from "react";
 import style from "./index.less";
-import { normalVal, filterDataArr, filterOtherDataArr,timestampToTime } from '@utils/tools';
+import { getStatusImg, filterDataArr, filterOtherDataArr,timestampToTime } from '@utils/tools';
 import Notify from '@commonComp/Notify';
 import Information from '../Information';
 import PreviewInspect from './Inspect';
@@ -51,6 +51,32 @@ class PreviewBody extends Component {
     this.setState({ dateTime: date })
   }
   showDetails(val) {
+    let min = val.minValue, max = val.maxValue, value = val.value, dom = '';
+    if (!isNaN(min) && !isNaN(max)) {//有最大值最小值
+      if (isNaN(value)) {//输入的不是数据
+        dom = getStatusImg(1, value, 1)
+      } else if (value <= min) {//下降
+        dom = getStatusImg(3, value, 1)
+      } else if (value >= max) {//上升
+        dom = getStatusImg(2, value, 1)
+      } else {//正常
+        dom = getStatusImg(0, value, 1)
+      }
+    } else if (isNaN(min) && !isNaN(max)) {//有最大值无最小值
+      if (value >= max) {//上升
+        dom = getStatusImg(2, value, 1)
+      } else {//正常
+        dom = getStatusImg(0, value, 1)
+      }
+    } else if (!isNaN(min) && isNaN(max)) {//有最小值无最大值
+      if (value <= min) {//下降
+        dom = getStatusImg(3, value, 1)
+      } else {//正常
+        dom = getStatusImg(0, value, 1)
+      }
+    } else {//无最大最小值
+      dom = getStatusImg(1, value, 1)
+    }
     if (val.questionDetailList.length > 0) {
       return val.questionDetailList.map((item) => {
         if (val.value == item.name) {
@@ -58,7 +84,7 @@ class PreviewBody extends Component {
         }
       })
     } else {
-      return <td className={style.assistTableTdSec}><span style={{ color: (val.value - 0).toString() == 'NaN' ? "red" : (val.maxValue || val.minValue) ? (val.value > val.maxValue || val.value < val.minValue ? "red" : null) : null }}>{val.value}</span> {val.labelSuffix}</td>
+      return <td className={style.assistTableTdSec}>{dom} {val.labelSuffix}</td>
     }
   }
 

src/components/WrapModalBody/index.less

@@ -50,6 +50,7 @@
         font-size: 12px;
       }
       input {
+        background-color: #faf8f8;
         font-size: 12px;
         height: 26px;
         line-height: 26px;
@@ -89,6 +90,10 @@
         width: 126px;
         text-align: center;
       }
+      input {
+        cursor: pointer;
+        background-color: #fff;
+      }
     }
   }    
   .modalRightT{

src/components/WrapModalBodyPac/WrapModalRight/index.jsx

@@ -16,7 +16,7 @@ const WrapModalRight = (props) =>{
             <ul className={style.partLis}>
               {part.pacsResultDTO&&part.pacsResultDTO.map((item)=>{
                 return <li>
-                  <p className={style.itemName}>{item.checkItem}</p>
+                  {/* <p className={style.itemName}>{item.checkItem}</p> */}
                   <p>
                     影像诊断 : <span style={{color: '#5D5D5D'}}>{item.imagingResults}</span>
                   </p>

src/components/WrapModalBodyPac/index.less

@@ -50,12 +50,12 @@
         font-size: 12px;
       }
       input {
+        background-color: #faf8f8;
         font-size: 12px;
         height: 26px;
         line-height: 26px;
         padding: 0 3px;
         box-sizing: border-box;
-        cursor: pointer;
       }
     }
     .code{
@@ -89,6 +89,10 @@
         width: 126px;
         text-align: center;
       }
+      input {
+        cursor: pointer;
+        background-color: #fff;
+      }
     }
   }    
   .modalRightT{