Revert "Revert "病历质控（未完成）""

This reverts commit 1bb7ab45a894fe7422c84a1463547ad9b6398f37.

src/store/actions/pushMessage.js

@@ -412,3 +412,9 @@ export const delFollowUp = (state, action) => {
 	return res;
 }
 
+export const setMRAnalyse = (state, action) =>{ 
+	const res = Object.assign({}, state);
+	res.MRAnalyseResult = action.MRAnalyseResult;
+	return res;
+}   
+

src/store/async-actions/pushMessage.js

@@ -1,8 +1,9 @@
 import { get, post, json } from "@utils/ajax";
-import { BILLING_ADVICE, SET_TIPS, SET_TIPS_DETAILS ,SET_CHRONIC_TABLELIST,SET_SCALE_INFO,SET_CHRONIC_PUSHS,SHOW_TABLE_LIST, SHOW_TIPS_DETAILS,TOGGLE_CHRONIC_INFO} from '@store/types/pushMessage';
+import { BILLING_ADVICE, SET_TIPS, SET_TIPS_DETAILS ,SET_CHRONIC_TABLELIST,SET_SCALE_INFO,
+  SET_CHRONIC_PUSHS,SHOW_TABLE_LIST, SHOW_TIPS_DETAILS,TOGGLE_CHRONIC_INFO, SET_MR_ANALYSE} from '@store/types/pushMessage';
 import { SET_DRUG_INFO, SHOW_DRUG_INFO } from '@store/types/treat';
 import { SET_CLICK_DIAG } from '../types/diagnosticList';
-import {storageLocal,getEMRParams} from '@utils/tools';
+import {storageLocal,getEMRParams, getMRInfo} from '@utils/tools';
 import {getBigPush} from '@utils/utils';
 import {SET_IMPORT_CHECKBODY_LABEL,PRESET} from "../types/checkBody";
 import dataLis from '@components/EmergencyProcedure/emergency';
@@ -16,6 +17,7 @@ const api={
   getMRAnalyse: '/mrqc/analyse' //病历质控
 }
 
+
 //获取右侧推送信息
 export const billing = (mdata,boxMark) => {
  return (dispatch, getState) =>{
@@ -291,10 +293,26 @@ export const getScaleInfo = (it)=>{
     }
 }
 
-
-//病历质控
+// 病历质控
 export const getMRAnalyse = () => {
   return (dispatch, getState) => {
-
+    const MRInfoStr = getMRInfo()
+    const param = {
+      "cid": 0,
+      "medrec": [
+        {
+          "content": MRInfoStr,
+          "label": [],
+          "title": ""
+        }
+      ],
+      "token": ""
+    }
+    console.log('getMRAnalyse')
+    json(api.getMRAnalyse, param)
+    .then((res) =>{
+        console.log('getMRAnalyse',res)
+    })
   }
-}
+}
+

src/store/reducers/pushMessage.js

@@ -2,10 +2,11 @@ import {CHANGE_ASSAY, CHANGE_CHECK, BILLING_ADVICE, ADD_SCHEME, SET_TIPS,  SET_T
         SET_CHANGE_ADVICE_TREATMENT, SET_CHANGE_ADVICE_ASSAY, SET_CHANGE_ADVICE_CHECK, ADD_BILLING,
         CLEAR_ALL_PUSH_MESSAGE,SHOW_TIPS_DETAILS, HIDE_TIPS_DETAILS, SET_COMMONTREATMENT,
         SET_ADVICE_INPUT ,SET_CHRONIC_TABLELIST,SHOW_TABLE_LIST,SET_SCALE_INFO,SET_CHRONIC_PUSHS,
-        SAVE_TABLE_RESULT, SAVE_FOLLOW_UP, DEL_FOLLOW_UP,TOGGLE_CHRONIC_INFO,SET_PUSH_EMERGENCY_IDX} from '../types/pushMessage';
+        SAVE_TABLE_RESULT, SAVE_FOLLOW_UP, DEL_FOLLOW_UP,TOGGLE_CHRONIC_INFO,SET_PUSH_EMERGENCY_IDX,
+        SET_MR_ANALYSE } from '../types/pushMessage';
 import {changeAssay, changeCheck, setAdvice, addScheme, setTips, setTipsDetails, setChangeAdviceTreatment, 
         setChangeAdviceAssay, setChangeAdviceCheck, addBilling, clearAllPushMessage, showTipsDetails, hideTipsDetails, 
-        setCommontreatment, setAdviceInput, saveFollowUp, delFollowUp } from '../actions/pushMessage';
+        setCommontreatment, setAdviceInput, saveFollowUp, delFollowUp, setMRAnalyse } from '../actions/pushMessage';
 
 const initState = {
   vigilant: [],
@@ -83,6 +84,8 @@ export default function(state = initState, action) {
     case SET_PUSH_EMERGENCY_IDX:
       res.setPushEmergencyIdx = action.idx;
       return res;
+    case SET_MR_ANALYSE:
+      return setMRAnalyse(state, action)
     default:
       return state;
   }

src/store/types/pushMessage.js

@@ -24,5 +24,6 @@ export const SAVE_FOLLOW_UP = 'SAVE_FOLLOW_UP';  //保存回访时间
 export const DEL_FOLLOW_UP = 'DEL_FOLLOW_UP';  //删除回访时间
 export const TOGGLE_CHRONIC_INFO = 'TOGGLE_CHRONIC_INFO';   //收起展开指标推送模块
 export const SET_PUSH_EMERGENCY_IDX = 'SET_PUSH_EMERGENCY_IDX';   //急诊设置idx
+export const SET_MR_ANALYSE = 'SET_MR_ANALYSE' //设置病历分析
 
 

src/utils/config.js

@@ -1,8 +1,8 @@
 // const host='http://192.168.3.1:5050';//赵
 // const host='http://192.168.3.100:5050';//王峰
 // const host='http://192.168.2.121:5050';//后端接口访问地址
-// const host='http://192.168.2.236:5050';//后端接口访问地址
-const host='http://192.168.2.241:5050';//后端接口访问地址
+const host='http://192.168.2.236:5050';//后端接口访问地址
+// const host='http://192.168.2.241:5050';//后端接口访问地址
 // const host='http://192.168.3.11:5050';//王宇
 //const host='http://192.168.2.164:8080';
 // const host='http://192.168.3.117:5050'; //周铁刚

src/utils/tools.js

@@ -558,6 +558,7 @@ function filterArr(arr){
 
 function filterDataArr(arrTmp){   //数据处理
     let tmpArr = [];
+   
     tmpArr = arrTmp.map((it,i)=>{     //连续的标点符号保留第一个
       if(!it)return '';
       if(!it.match(config.punctuationReg)&&!arrTmp[i-1]){        //只有标点符号或者前一个标签无值是（说明本标点灰显，不显示在预览中）
@@ -725,9 +726,9 @@ function getMRInfo() {
   const {message} = state.patInfo;
   const {mainSuit,currentIll,otherHistory,checkBody,inspect,assistCheck,diagnosticList} = state;
   let str = ""
-  str += `姓名: ${message.patientName}性别：${message.patientSex}年龄：${message.patientAge}主诉：${filterDataArr(mainSuit.saveText)}
-          现病史：${filterDataArr(currentIll.saveText)}其他史：${filterDataArr(otherHistory.saveText)}查体：${filterDataArr(checkBody.saveText)}
-          化验：${inspect.inspectStrPlus}辅检：${assistCheck.dataString}诊断：${diagnosticList.diagnosticStr}医师签名：${message.doctorName}`
+//   str += `姓名: ${message.patientName}性别：${message.patientSex}年龄：${message.patientAge}主诉：${filterDataArr(mainSuit.saveText)}
+//           现病史：${filterDataArr(currentIll.saveText)}其他史：${filterDataArr(otherHistory.saveText)}查体：${filterDataArr(checkBody.saveText)}
+//           化验：${inspect.inspectStrPlus}辅检：${assistCheck.dataString}诊断：${diagnosticList.diagnosticStr}医师签名：${message.doctorName}`
 }
 
 function didPushParamChange(){