Merge remote-tracking branch 'origin/innterfaceUpdate' into dev/new1

src/common/less/base.less

@@ -50,7 +50,7 @@ button + button {
 html,body {
     font-size: @font-size-base; 
     // color: @B800;
-    background: @body-bg;
+    /*background: @body-bg;*/
 }
 :global(#root) {
     overflow: auto;

src/components/EMRContainer/index.jsx

@@ -48,7 +48,7 @@ class EMRContainer extends Component {
         const contStyle={
                           opacity:'0.4',
                           top:'1px',
-                          right:'460px',
+                          right:'458px',
                           zIndex:'15',
                           width:'14px',
                           background:'#f1f1f1'};

src/components/InfoTitle/index.less

@@ -9,7 +9,7 @@
   position: fixed;
   left: 10px;
   top: 50px;
-  right: 470px;
+  right: 468px;
   min-width: 548px;
   padding-right: 122px;
   .activeWrap {

src/components/Operation/index.less

@@ -6,9 +6,9 @@
     position: fixed;
     bottom: 0;
     left: 10px;
-    right: 470px;
+    right: 468px;
     // min-width: 720px;
-    min-width: 548px;
+    min-width: 547px;
     background-color: #fff;
     // z-index: 240;
     padding-bottom: 10px;

src/store/reducers/assistCheck.js

@@ -12,7 +12,7 @@ const initSearchList = {
   list: [], //点击的结果
   assistLabel: [], //搜索的结果
   dataString: '', //结果拼接
-  dataArr: '', //结果拼接
+  dataArr: [], //结果拼接
   assistVal: '',
 
   hospitalPac: [], //医院检索到的

src/utils/tools.js

@@ -707,10 +707,10 @@ function getEMRParams(){
     "drugString": "",
     "lis": inspect.pushItem,
     "pacs": assistCheck.dataArr||[],
-    "diag": diag,
+    "diag": [],
     "lisOrder": [],
     "pacsOrder": [],
-    "diagOrder": [],
+    "diagOrder": diag,
     "drugOrder": [],
     "operationOrder": [],
     "otherOrder": [],
@@ -1382,8 +1382,8 @@ function getAllString(checkedListImport,assistLabel,flg){
       "dateValue": tempArr[i].time,
       "name": "",
       "uniqueName": tempArr[i].name,
-      "desc": tempArr[i].imagingDiagnose,
-      "result": tempArr[i].imagingDiagnose,
+      "desc": tempArr[i].value,
+      "result": tempArr[i].value,
     }
     tmpArr.push(obj)
     tmpString += (tempArr[i].name + (tmpVal ? (':' + tmpVal) + ', ' : ': ') + (tempArr[i].time ? '报告日期:' + tempArr[i].time : '') + '^;')
@@ -1533,6 +1533,8 @@ const setFontColorSize = (flg,pacs) => {
           classStr = `largeFontSize titleWidth`
         }else if(pacs == 5){
           classStr = `largeFontSize specialSize`
+        }else if(pacs == 6){
+          classStr = `simpleColor largeFontSize`
         }else if(pacs == 7){
           classStr = `largeFontSize fontWeight`
         }else{
@@ -1547,6 +1549,8 @@ const setFontColorSize = (flg,pacs) => {
       if(flg == 2){
         if(pacs == 7){
           classStr = `simpleFontSize fontWeight`
+        }else if(pacs == 6){
+          classStr = `simpleFontSize`
         }else{
           classStr = `simpleFontSize`
         }