Merge branch 'innterfaceUpdate' of http://192.168.2.236:10080/zhouna/newICSS into innterfaceUpdate

src/store/async-actions/fetchModules.js

@@ -266,22 +266,17 @@ export function getAssessData(disId,disName){
   //return ()=>{
     const emrData = getEMRParams();
     const param = {
-      diseaseId:disId,
+      ruleType:config.ruleTypeMap['11'],
       disType:1,
-      diag:disName,
-      diseaseName:disName,
       featureType:'11',
-      ruleType:config.ruleTypeMap['11'],
-      lis:emrData.lis,
-      other: emrData.other,
-      pasts: emrData.other,
-      sex:emrData.sex,
-      age:emrData.age,
-      pacs:emrData.pacs,
-      vital:emrData.vital,
-      symptom:emrData.current + emrData.main
+      diseaseId:disId,
+      diseaseName:{
+        "dateValue": "",
+        "name": disName,
+        "uniqueName": disName
+      }
     };
-    return json(api.getAssess,param);
+    return json(api.getAssess,Object.assign({},param,emrData));
   //}
 }
 

src/store/async-actions/pushMessage.js

@@ -260,20 +260,11 @@ export const getScaleInfo = (it)=>{
     return (dispatch,getState)=>{
         const emrData = getEMRParams();
           const params = {
-            age: emrData.age,
-            sex: emrData.sex,
             featureType: "21",
-            diag: emrData.dis,
-            lis: emrData.lis,
             scaleId:it.conceptId,
-            scaleName:it.name,
-            other: emrData.other,
-            pacs: emrData.pacs,
-            vital:emrData.vital,
-            symptom: emrData.current + emrData.main,
-            // indications:'' //指标结果
+            scaleName:it.name
           };
-        json(api.getTableInfo, params)
+        json(api.getTableInfo, Object.assign({},params,emrData))
         .then((res)=>{
             const result = res.data;
             // if(result.code==0 && result.data.scale && result.data.scale.length>0){

src/store/async-actions/treat.js

@@ -47,7 +47,7 @@ export const getTreatResult = (item) =>{
                             params.disType = 1
                         }
                     }
-                    getTreatment(item, dispatch, state, url,params, isChronic)
+                    getTreatment(item, dispatch, state, url,Object.assign({},params,emrData), isChronic)
 
                 });
             } else {
@@ -56,10 +56,10 @@ export const getTreatResult = (item) =>{
                         params.disType = 1
                     }
                 }
-                getTreatment(item, dispatch, state,url,params, isChronic)
+                getTreatment(item, dispatch, state,url,Object.assign({},params,emrData), isChronic)
             }
         } else {
-            getTreatment(item, dispatch, state,url,params, isChronic)
+            getTreatment(item, dispatch, state,url,Object.assign({},params,emrData), isChronic)
         }
         
     }

src/utils/tools.js

@@ -680,15 +680,12 @@ function getEMRParams(){
   const state = store.getState();
   const {message} = state.patInfo;
   const {mainSuit,currentIll,otherHistory,checkBody,inspect,assistCheck,diagnosticList} = state;
-  //console.log('message', message)
-  
   const diag = []
   for(let i = 0; i < diagnosticList.diagnosticList.length; i++) {
     diag.push({"dateValue": "","name": "","uniqueName": diagnosticList.diagnosticList[i].name})
   }
-  let obj = {
+  const obj = {
     "hosCode": message.hospitalCode,
-    "ruleType": "string",
     "age": message.patientAge,
     "sex": message.sex,
     "chief": filterDataArr(mainSuit.saveText)||'',

src/utils/utils.js

@@ -235,6 +235,7 @@ export async function getBigPush(type,symData,save){
   const params = {
     "ruleType":config.ruleTypeMap[type],
     "featureType": type,  //类型1：症状，4：查体，5：化验，6：辅检，7：诊断
+    // "chief": filterDataArr(mainSuit.saveText)||'',
   };
   if(save){
     let savePm = Object.assign({},params);