crf解析新增量表

src/components/AnalysisResult/index.jsx

@@ -9,7 +9,7 @@ class AnalysisResult extends Component {
 	}
 	render() {
 		const { show, onClose, data } = this.props;
-		const { chiefLabel, presentLabel, pastLabel, vitalLabel, lis, lisOrder, pacs, pacsOrder, pacsLabel,scale,
+		const { chiefLabel, presentLabel, pastLabel, vitalLabel, lis, lisOrder, pacs, pacsOrder, pacsLabel, scale,
 			diag, operation, operationOrder, transfusion, transfusionOrder, drug, drugOrder } = data;
 		const chiefClinicals = (chiefLabel || {}).clinicals || [];
 		const chiefDiags = (chiefLabel || {}).diags || [];
@@ -231,42 +231,43 @@ class AnalysisResult extends Component {
 									})}
 								</table>
 							</div> : ''}
-						{(scale || []).length > 0 ?
+
+
+
+						{[...(res || []), ...(pacsNumList || [])].length > 0 ?
 							<div className="tableItem">
-								<p className={styles.title}>量表项目</p>
+								<p className={styles.title}>检查结果</p>
 								<table>
 									<tr>
-										<th>是否开单</th>
 										<th>原词</th>
 										<th>转化为标准词</th>
+										<th>值</th>
+										<th>单位</th>
 									</tr>
-									{(scale || []).map((item) => {
+									{[...(res || []), ...(pacsNumList || [])].map((item) => {
 										return <tr>
-											<td>否</td>
 											<td>{item.name}</td>
-											<td>{item.uniqueName}</td>
+											<td>{item.standName || item.uniqueName}</td>
+											<td>{(item.pd || {}).value}</td>
+											<td>{(item.pd || {}).unit}</td>
 										</tr>;
 									})}
 								</table>
 							</div> : ''}
-
-
-						{[...(res || []), ...(pacsNumList || [])].length > 0 ?
+						{(scale || []).length > 0 ?
 							<div className="tableItem">
-								<p className={styles.title}>检查结果</p>
+								<p className={styles.title}>量表</p>
 								<table>
 									<tr>
+										<th>是否开单</th>
 										<th>原词</th>
 										<th>转化为标准词</th>
-										<th>值</th>
-										<th>单位</th>
 									</tr>
-									{[...(res || []), ...(pacsNumList || [])].map((item) => {
+									{(scale || []).map((item) => {
 										return <tr>
+											<td>否</td>
 											<td>{item.name}</td>
-											<td>{item.standName || item.uniqueName}</td>
-											<td>{(item.pd || {}).value}</td>
-											<td>{(item.pd || {}).unit}</td>
+											<td>{item.uniqueName}</td>
 										</tr>;
 									})}
 								</table>