Merge branch 'dev5.3.4' into dev/new1

src/common/components/Textarea/index.jsx

@@ -4,7 +4,7 @@ import Notify from '../Notify';
 import config from '@config/index';
 import {isIE} from '@utils/tools.js';
 import {getFeature} from '@store/async-actions/fetchModules';
-import {getAllDataList,getAllDataStringList,ifOtherClear} from "@utils/tools.js";
+import {getAllDataList,getAllDataStringList,ifOtherClear,setFontColorSize} from "@utils/tools.js";
 import store from '@store';
 import $ from "jquery";
 
@@ -167,9 +167,9 @@ class Textarea extends Component {
     const { title,boxMark } = this.props;
     return (
       <div className={style["box"]}>
-        <div className={style["title"]}>{title}</div>
+        <div className={`${style["title"]} ${setFontColorSize(2,4)}`}>{title}</div>
         {/*{isRead?<div className={style["content"]+" "+'11'} contentEditable={true} onFocus={this.handleFocus}>{value}</div>:''}*/}
-        <div className={style["content"]}
+        <div className={`${style["content"]} ${setFontColorSize(2,5)}`}
              onFocus={this.handleFocus}
              ref={this.$dom}
              contentEditable={true}

src/components/DiagnosticList/index.less

@@ -126,7 +126,7 @@
 }
 .assess{
     .treat;
-    right: 106px;
+    right: 116px;
 }
 .diag-del {
     position: absolute;

src/components/Information/index.jsx

@@ -22,16 +22,20 @@ class Information extends Component {
         <div ref={this.$content} className={style['title']}>{preInfo.hospitalName}</div>
         <table className={style['patInfo']}>
           <tr>
-            <td>卡号：{baseObj ? baseObj.patientIdNo : noData ? '' : preInfo.patientIdNo}</td>
             <td>姓名：{baseObj ? baseObj.patientName : noData ? '' : preInfo.patientName}</td>
+            <td>门诊号：{baseObj ? baseObj.inquiryCode : (noData ? '' : preInfo.recordId)}</td>
+          </tr>
+          <tr>
             <td>年龄：{baseObj ? baseObj.patientAge : noData ? '' : preInfo.patientAge}</td>
+            <td>医生：{baseObj ? baseObj.doctorName : (noData ? '' : preInfo.doctorName)}</td>
+          </tr>
+          <tr>
             <td>性别：{baseObj ? baseObj.patientSex : noData ? '' : preInfo.patientSex}</td>
+            <td>科室：{baseObj ? baseObj.hospitalDeptName : (noData ? '' : preInfo.hospitalDeptName)}</td>
           </tr>
           <tr>
+            <td>卡号：{baseObj ? baseObj.patientIdNo : noData ? '' : preInfo.patientIdNo}</td>
             <td>就诊时间：{baseObj ? baseObj.inquiryDate : (noData ? '' : preInfo.systemTime.split(' ')[0])}</td>
-            <td>科室：{baseObj ? baseObj.hospitalDeptName : (noData ? '' : preInfo.hospitalDeptName)}</td>
-            <td>医生：{baseObj ? baseObj.doctorName : (noData ? '' : preInfo.doctorName)}</td>
-            <td>门诊号：{baseObj ? baseObj.inquiryCode : (noData ? '' : preInfo.recordId)}</td>
           </tr>
         </table>
       </div>

src/components/Information/index.less

@@ -13,7 +13,7 @@
     font-size: 14px;
   }
   tr td:first-child{
-    width: 35%;
+    width: 50%;
   }
 }
 @media print{