解析结果

src/components/AnalysisResult/index.jsx

@@ -170,17 +170,17 @@ class AnalysisResult extends Component {
 				  <th>值</th>
 				  <th>单位</th>
 				</tr>
+				{(lisOrder||[]).map((item)=>{
+				  return <tr>
+					<td>是</td>
+					<td>{item.name}</td>
+					<td>{item.detailName}</td>
+					<td>{item.uniqueName}</td>
+					<td>{item.value||item.otherValue}</td>
+					<td>{item.unit}</td>
+				  </tr>;
+				})}
                   {(lis||[]).map((item)=>{
-                      return <tr>
-                          <td>是</td>
-                          <td>{item.name}</td>
-                          <td>{item.detailName}</td>
-                          <td>{item.uniqueName}</td>
-                          <td>{item.value||item.otherValue}</td>
-                          <td>{item.unit}</td>
-                      </tr>;
-                  })}
-                  {(lisOrder||[]).map((item)=>{
                       return <tr>
                           <td>否</td>
                           <td>{item.name}</td>
@@ -200,14 +200,14 @@ class AnalysisResult extends Component {
 				  <th>原词</th>
 				  <th>转化为标准词</th>
 				</tr>
+				{(pacsOrder||[]).map((item)=>{
+				  return <tr>
+					<td>是</td>
+					<td>{item.name}</td>
+					<td>{item.uniqueName}</td>
+				  </tr>;
+				})}
                   {(pacs||[]).map((item)=>{
-                      return <tr>
-                          <td>是</td>
-                          <td>{item.name}</td>
-                          <td>{item.uniqueName}</td>
-                      </tr>;
-                  })}
-                  {(pacsOrder||[]).map((item)=>{
                       return <tr>
                           <td>否</td>
                           <td>{item.name}</td>
@@ -258,6 +258,20 @@ class AnalysisResult extends Component {
 				  <th>原词</th>
 				  <th>转化为标准词</th>
 				</tr>
+				{(operationOrder||[]).map((item)=>{
+				  return <tr>
+					<td>是</td>
+					<td>{item.name}</td>
+					<td>{item.uniqueName}</td>
+				  </tr>;
+				})}
+				{(operation||[]).map((item)=>{
+				  return <tr>
+					<td>否</td>
+					<td>{item.name}</td>
+					<td>{item.uniqueName}</td>
+				  </tr>;
+				})}
 			  </table>
 			</div>
 			<div className="tableItem">
@@ -268,6 +282,20 @@ class AnalysisResult extends Component {
 				  <th>原词</th>
 				  <th>转化为标准词</th>
 				</tr>
+				{(transfusionOrder||[]).map((item)=>{
+				  return <tr>
+					<td>是</td>
+					<td>{item.name}</td>
+					<td>{item.uniqueName}</td>
+				  </tr>;
+				})}
+				{(transfusion||[]).map((item)=>{
+				  return <tr>
+					<td>否</td>
+					<td>{item.name}</td>
+					<td>{item.uniqueName}</td>
+				  </tr>;
+				})}
 			  </table>
 			</div>
 			<div className="tableItem">
@@ -279,6 +307,22 @@ class AnalysisResult extends Component {
 				  <th>转化为标准词</th>
 				  <th>剂型</th>
 				</tr>
+				{(drugOrder||[]).map((item)=>{
+				  return <tr>
+					<td>是</td>
+					<td>{item.name}</td>
+					<td>{item.uniqueName}</td>
+					<td>{item.form}</td>
+				  </tr>;
+				})}
+				{(drug||[]).map((item)=>{
+				  return <tr>
+					<td>否</td>
+					<td>{item.name}</td>
+					<td>{item.uniqueName}</td>
+					<td>{item.form}</td>
+				  </tr>;
+				})}
 			  </table>
 			</div>
 			</div>

src/components/AnalysisResult/index.less

@@ -42,9 +42,10 @@
   }
   th{
 	border:1px solid #CCD2D9;
-	background: #CCD2D9;
+	background: #d8d8d9;
 	height: 25px;
 	line-height: 25px;
+	white-space: nowrap;
   }
   td{
 	border:1px solid #CCD2D9;

src/components/InfoTitle/index.jsx

@@ -5,7 +5,7 @@ import style from "./index.less";
 import { connect } from 'react-redux';
 import AnalysisResult from '@components/AnalysisResult';
 import historyCase from '@common/images/history.png';
-import sysResult from '@common/images/history.png';
+import sysResult from '@common/images/result.png';
 import store from '@store';
 import { getEMRParams } from '@utils/tools';
 import { showHistory } from '@store/actions/historyTemplates';