Merge branch 'dev' into test

src/components/DiagManager/addDiag.js

@@ -6,8 +6,12 @@ import apiObj from '@api/index';
 import { getCookie,setCookie } from '@utils/index';
 import './index.less'
 import {Modal} from "antd/lib/index";
+import {
+  LinkOutlined
+} from '@ant-design/icons';
 const { post, api } = apiObj;
 
+
 function AddDiag({formData,matchChange,visible,cancel,onOk,title,termSType,termType,flag}) {
   const [form] = Form.useForm();
   const { Option } = Select;
@@ -116,6 +120,7 @@ function AddDiag({formData,matchChange,visible,cancel,onOk,title,termSType,termT
 		  onCancel={saveCancel}
 		  forceRender={true}
 		  initialValues={formData}
+		  maskClosable={false}
 	  >
 	  <Form
 		  labelCol={{ span: 7 }}
@@ -142,6 +147,10 @@ function AddDiag({formData,matchChange,visible,cancel,onOk,title,termSType,termT
 			  </Form.Item>
 			</div>
 		</div>
+		<div className="info-p">
+		<LinkOutlined />
+		<p>相互关联</p>
+		</div>
 		<div className="lt-info info-box">
 		  <p className='title'>标准术语</p>
 		  <div className="item-box">

src/components/DiagManager/index.less

@@ -1,13 +1,13 @@
 @import "@common/common.less";
 
 .info-box{
-  width: 48%;
+  width: 46%;
   float: left;
   .title{
 	font-weight: bold;
   }
   &:first-child{
-	margin-right: 4%;
+	// margin-right: 4%;
   }
   .item-box{
 	border:1px #ccc solid;
@@ -19,4 +19,10 @@
 .linked-term{
   clear: both;
   white-space: nowrap;
+}
+.info-p{
+	width: 8%;
+	float: left;
+	text-align: center;
+	margin-top: 80px;
 }

src/components/FieldProblem/index.js

@@ -33,7 +33,7 @@ function FieldProblem() {
         current: 1,
         size: 15,
         asc:['isSolved'],
-        desc: ['solveTime'],
+        desc: ['solveTime','behospitalCode'],
         behospitalStartDate: getCurrentDataFront().split('/').join('-') + ' 00:00:00',
         behospitalEndDate: getCurrentData().split('/').join('-') + ' 23:23:59'
     });
@@ -43,7 +43,7 @@ function FieldProblem() {
         current: 1,
         size: size,
         asc:['isSolved'],
-        desc: ['solveTime'],
+        desc: ['solveTime','behospitalCode'],
         behospitalStartDate: getCurrentDataFront().split('/').join('-') + ' 00:00:00',
         behospitalEndDate: getCurrentData().split('/').join('-') + ' 23:23:59'
     }