luolei hace 4 años
padre
commit
3860752f0c
Se han modificado 1 ficheros con 12 adiciones y 11 borrados
  1. 12 11
      src/utils/tools.js

+ 12 - 11
src/utils/tools.js

@@ -902,9 +902,10 @@ function handleEnter(event){
 // };
 function getEMRParams(){
   const state = store.getState();
+  console.log(state,676766767)
   const {id} =  state.historyTemplates && state.historyTemplates.HospitalInfo 
   const {message} = state.patInfo;
-  const {mainSuit,currentIll,otherHistory,checkBody,inspect,assistCheck,diagnosticList} = state;
+  const {mainSuit,currentIll,otherHistory,checkBody,newAdvice,inspect,assistCheck,diagnosticList} = state;
   const diag = [];
   for(let i = 0; i < diagnosticList.diagnosticList.length; i++) {
     diag.push({"dateValue": "","name": "","uniqueName": diagnosticList.diagnosticList[i].name})
@@ -919,7 +920,7 @@ function getEMRParams(){
     "vital": filterDataArr(checkBody.saveText)||'',
     "pasts": filterDataArr(otherHistory.saveText)||'',
     "infectious": "",
-    "operation": "",
+    "operation": newAdvice.labelListSmall,
     "allergy": "",
     "vaccination": "",
     "personal": "",
@@ -931,17 +932,17 @@ function getEMRParams(){
     "pacsString": "",
     "diagString": "",
     "drugString": "",
-    "lis": inspect.pushItem,
-    "pacs": assistCheck.dataArr||[],
-    "diag": [],
-    "lisOrder": [],
-    "pacsOrder": [],
-    "diagOrder": diag,
-    "drugOrder": [],
-    "operationOrder": [],
+    "lis": (inspect.labelListSmall).concat(inspect.labelListBig),
+    "pacs": assistCheck.assistLabel||[],
+    "diag": diag,
+    "lisOrder": inspect.totalOrder,
+    "pacsOrder": assistCheck.totalOrder,
+    "diagOrder": [],
+    "drugOrder": newAdvice.drugOrder,
+    "operationOrder": newAdvice.operationOrder,
     "otherOrder": [],
     "patientId": message.patientId,
-    "drug": [],
+    "drug": newAdvice.labelListBig,
     "marriage": "",
     "hospitalId": id || ''
   }