8811

src/components/PreviewBody/index.jsx

@@ -82,7 +82,7 @@ class PreviewBody extends Component {
     }
   }
   render() {
-    const { show, preInfo, dataJson, dataStr, baseObj, flg ,come,showAssessBtn,showHistoryCases} = this.props;console.log(3,dataStr)
+    const { show, preInfo, dataJson, dataStr, baseObj, flg ,come,showAssessBtn,showHistoryCases} = this.props;//console.log(3,dataStr)
     let other_data={},lis_data={},pas_data={},other_yjs='',access='',adviceData={};
     let isShowSex = baseObj.sex !== 2 ? false : true
     const contStyle = {

src/store/reducers/assistCheck.js

@@ -171,9 +171,13 @@ export default (state = initSearchList, action) => {
   }
   if (action.type == REASSISTCHECKDATA) {
     const newState = Object.assign({}, state);
-    newState.assistLabel = action.params[9].contentValue;
-    newState.totalOrder = action.params[9].contentValue;
-    newState.dataArr = action.params[9].contentValue;
+    const data = action.params[9].contentValue;
+    const arr = data.filter((it)=>{
+      return it.check;
+    });
+    newState.assistLabel = data;
+    newState.totalOrder = arr;
+    newState.dataArr = data;
     newState.dataString = action.params[9].content;
     return newState;
   }

src/store/reducers/inspect.js

@@ -293,9 +293,13 @@ export default (state = initSearchList, action) => {
     }
     if (action.type == REINSPECTDATA) {
       const newState = Object.assign({}, state);
-        newState.labelListBig = action.params[8].content.labelListBig
+      const data = action.params[8].content.labelListBig;
+        const arr = data.filter((it)=>{
+            return it.check;
+        });
+        newState.labelListBig = data
         newState.labelListSmall = action.params[8].content.labelListSmall;       
-        newState.totalOrder = action.params[8].content.labelListBig;       
+        newState.totalOrder = arr;
       return newState;
 
     }

src/store/reducers/newAdvice.js

@@ -418,10 +418,18 @@ export default (state = initSearchList, action) => {
     }
     if (action.type == RENEWADVICEDATA) {
       const newState = Object.assign({}, state);
-      newState.labelListBig = action.params[11].content.labelListBig;
-      newState.labelListSmall = action.params[11].content.labelListSmall;
-      newState.drugOrder = action.params[11].content.labelListBig;
-      newState.operationOrder = action.params[11].content.labelListSmall;
+      const data = action.params[11].content.labelListBig;
+      const drugArr = data.filter((it)=>{
+          return it.check;
+      });
+      const data1 = action.params[11].content.labelListSmall;
+      const operationArr =data1.filter((it)=>{
+          return it.check;
+      });
+      newState.labelListBig = data;
+      newState.labelListSmall = data1;
+      newState.drugOrder = drugArr;
+      newState.operationOrder = operationArr;
       newState.labelListBlood = action.params[11].content.labelListBlood;
       newState.transfusionOrder = action.params[11].content.transfusionOrder;
       newState.operationName = action.params[11].content.operationName;