Merge branch 'dev/new1' into optimize

src/components/AssessResult/index.jsx

@@ -168,11 +168,14 @@ class AssessResult extends Component {
     }
   }
   render() {
-    const {disName} =this.props;
+    const {disName,chronicMagItemName} =this.props;
     const data = this.props.data&&this.props.data[disName];
     return <div className={style['assess-cont']} id="AssistResult">
-      <div className={style['printShow']}>
+      <div className={style['printShow']} style={{borderBottom: (chronicMagItemName == disName)?'1px solid #ccc':''}}>
         <Information></Information>
+        {
+          chronicMagItemName == disName?<p>诊断：{chronicMagItemName}复诊评估</p>:null
+        }
       </div>
       {!data?<p className={style['loading']}><img src={loadingIcon} alt='loading...'/></p>:''}
       {data&&data.length==0?<p className={style['no-data']}>暂无数据！</p>:''}

src/components/AssessResult/index.less

@@ -126,6 +126,9 @@
 }
 .printShow {
   display: none;
+  p {
+    margin-bottom: 15px;
+  }
 }
 .footer{
   .print{

src/components/DiagnosticList/index.jsx

@@ -237,7 +237,7 @@ class DiagnosticList extends Component {
     }
     render(){
         const { list, treatment, showReferRecord, showHistoryCase ,chronicMagItem,loading} = this.props;
-      const {visible, treatTitle, showAssess, isAssessConfirm, assessId, disName, hasOndel, hasOnIndex} = this.state;
+        const {visible, treatTitle, showAssess, isAssessConfirm, assessId, disName, hasOndel, hasOnIndex} = this.state;
         const chronicList = JSON.parse(localStorage.getItem('chronic')||null);
         let isChronic = false;      //是否要显示管理评估
         const footer = <Footer print={true}
@@ -278,6 +278,7 @@ class DiagnosticList extends Component {
                        <AssessResult closeAssess={this.showAssessFn.bind(this)}
                                      disId={assessId}
                                      disName={disName}
+                                     chronicMagItemName={list[0].name}
                                      isAssessConfirm={isAssessConfirm}
                                      ></AssessResult>
                       </ComplexModal>:''}

src/components/EmergencyProcedure/EmergencyModal/index.jsx

@@ -2,11 +2,11 @@ import styles from './index.less'
 import small from '../img/small.png'
 import EmergencyPart from '../EmergencyPart'
 import pic from '../img/pic.png'
-import pic1 from '../img/pic1.jpg'
-import pic2 from '../img/pic2.jpg'
-import pic3 from '../img/pic3.jpg'
+import pic1 from '../img/pic1.png'
+import pic2 from '../img/pic2.png'
+import pic3 from '../img/pic3.png'
 import pic4 from '../img/pic4.png'
-import pic5 from '../img/pic5.jpg'
+import pic5 from '../img/pic5.png'
 import $ from 'jquery'
 
 class EmergencyModal extends React.Component{

src/components/EmergencyProcedure/EmergencyModal/index.less

@@ -92,7 +92,6 @@
     width: 1000px;
     margin-left: -500px;
     transform: translateY(-50%);
-
     // margin-top: -420px;
     // height: 840px;
     // transform: translateX(-50%);
@@ -101,6 +100,8 @@
     img{
       width: 100%;
       height: 100%;
+      float: left;
+      top: 0;
     }
   }
 }

src/components/Preview/index.jsx

@@ -18,7 +18,6 @@ class Preview extends Component {
     let baseList = store.getState();
     const dataJson = getAllDataList(baseList);
     const dataStr = getAllDataStringList(baseList);
-
     return <div className={style['container']}>
       <div className={style['shade']} onClick={onClose}></div>
       <div className={style['modal']} id="previewWrapper">

src/components/PreviewBody/index.less

@@ -91,6 +91,10 @@ table{
 }
 .assistTableTdSec {
   width: 16%;
+  position: relative;
+  img {
+    top: 6px !important;
+  }
 }
 .assistTableTdTrd {
   width: 24%;

src/utils/tools.js

@@ -219,7 +219,7 @@ const getAllDataStringList =(baseList) =>{           //获取所有模块文本
       'diag' : baseList.diagnosticList.diagnosticStr,
       'advice' : baseList.pushMessage.AdviceStr
     }
-    //console.log(jsonDataString,'文本模式数据获取')
+    // console.log(JSON.stringify(chiefData),chiefData,'文本模式数据获取')
     return jsonDataString;
 }
 /**
@@ -819,7 +819,7 @@ function inspectAndAssist(){
       name: '',
       questionId: '',
       showType: 1,
-      time:getCurrentDate(),
+      time:getCurrentDate(1),
       value:''
     }
     tmpObj.questionId = tmpAssist[i].id