匹配接口替换

src/api/index.js

@@ -47,6 +47,7 @@ function interceptors(){
         const tokenStr = localStorage.getItem('token');
         const sysId = getCookie('systemId');
         const hisId = getCookie('hospitalId');
+        const isOverTime = localStorage.getItem("overTime");
         if (tokenStr) {
             (req.headers.Authorization = `Bearer ${tokenStr}`);
             sysId&&(req.headers.softwareId=sysId);
@@ -60,18 +61,20 @@ function interceptors(){
     });
     //拦截响应
     axios.interceptors.response.use(function (res) {
-        const code = res.data.code;
-        if (code===401) {   //401/403返回登录
+        const code = (res.data||{}).code;
+        if (code===401||code===403) {   //401/403返回登录
             localStorage.removeItem("token");
             localStorage.removeItem("systemId");
             localStorage.removeItem("hospitalId");
-            localStorage.removeItem("software")
-            setCookie();
+            localStorage.removeItem("software");
+		    setCookie();
+            //标记登录失效被退出，后面的请求不发送/不显示相应消息
+            localStorage.setItem("overTime",1);
             //localStorage.removeItem("hospitalId");
             message.error("登录信息失效，请重新登录");
             window.location = '/';
         }else{
-            return res;
+            return res||{data:null};
         }
     }, function (error) {
         return Promise.reject(error);

src/api/request.js

@@ -79,6 +79,7 @@ const request = {
     websocketUrl:'ws://192.168.2.237:15675/ws', //通知socket地址
 
     //渠道管理
+    getConceptLibraryPage:'/daqe-center/currencyManage/getConceptLibraryPage',//待匹配术语列表
     getOfficialCapacityPage:"/daqe-center/officialCapacityManage/getOfficialCapacityPage",    //职务变更记录列表
     delOfficialCapacityPage:"/daqe-center/officialCapacityManage/delOfficialCapacityPage",      //删除职务变更
     getRecordTemplateManage:"/daqe-center/recordTemplateManage/getRecordTemplateManage",        //查看文书模板
@@ -90,7 +91,6 @@ const request = {
 	delDiseaseById:'/daqe-center/diseaseManage/delDiseaseById',//通过id删除诊断
 	matchingDisease:'/daqe-center/diseaseManage/matchingDisease',//匹配诊断
 	upDiseaseById:'/daqe-center/diseaseManage/upDiseaseById',//修改诊断
-    getMatchingDiseasePage:'/daqe-center/diseaseManage/getMatchingDiseasePage',//待匹配诊断列表
     importDisease:'/daqe-center/diseaseManage/importDisease',//诊断信息导入
     getDiseaseInfoById:"/daqe-center/diseaseManage/getDiseaseInfoById",   //已匹配诊断信息查看
 	
@@ -101,7 +101,6 @@ const request = {
 	matchingDrug:'/daqe-center/drugManage/matchingDrug',//匹配药品信息
 	upDrugById:'/daqe-center/drugManage/upDrugById',//通过id修改药品
     getDrugById:'/daqe-center/drugManage/getDrugById',  //已匹配药品
-    getMatchingDrugPage:'/daqe-center/drugManage/getMatchingDrugPage',  //待匹配药品列表
     importDrug:'/daqe-center/drugManage/importDrug',//导入药品
 	
 	//手术管理
@@ -111,7 +110,6 @@ const request = {
 	matchingOperation:'/daqe-center/operationManage/matchingOperation',//匹配手术信息
 	upOperationById:'/daqe-center/operationManage/upOperationById',//通过id修改手术
     importOperation:'/daqe-center/operationManage/importOperation',  //手术导入
-    getMatchingOperationPage:'/daqe-center/operationManage/getMatchingOperationPage',   //待匹配列表
     getOperationById:'/daqe-center/operationManage/getOperationById',   //已匹配标准手术获取
 	
 

src/components/DiagManager/MatchDiag.js

@@ -79,15 +79,16 @@ function MatchDiag(props) {
  }
  function getPage(param) {
    //已匹配的获取已被匹配的那条数据即可
-   const url = isMapping?api.getDiseaseInfoById:api.getMatchingDiseasePage;
-   post(url, param||params).then((res) => {
+   const url = isMapping?api.getDiseaseInfoById:api.getConceptLibraryPage;
+   const pm = param||params;
+   const paramData = isMapping?pm:{...pm,type:1};  //type：1:诊断，2:手术，3:药品
+   post(url, paramData).then((res) => {
 	 if (res.data.code === 200) {
 	   const data = res.data.data;
 	   const list = isMapping?[data]:data.records;
-	   console.log(222,data.id)
 	   setselectedRowKeys(isMapping?[data.id]:[]);
 	   setDiagList(list);
-	   setTotal(data.total||1)
+	   setTotal(data.total||0)
 	 }
    })
  }
@@ -104,7 +105,7 @@ function MatchDiag(props) {
         columns={columns}
         scroll={{ y: 'calc(100vh - 320px)' }}
         dataSource={DiagList}
-        rowKey={record => record.icd10}
+        rowKey={record => record.standard}
         pagination={{
           current: current,
           pageSize: size,

src/components/DrugManager/MatchDrug.js

@@ -79,15 +79,16 @@ function MatchDrug(props) {
  }
  function getPage(param) {
    //已匹配的获取已被匹配的那条数据即可
-   const url = isMapping?api.getDrugById:api.getMatchingDrugPage;
-   post(url, param||params).then((res) => {
+   const url = isMapping?api.getDrugById:api.getConceptLibraryPage;
+   const pm = param||params;
+   const paramData = isMapping?pm:{...pm,type:3};  //type：1:诊断，2:手术，3:药品
+   post(url, paramData).then((res) => {
 	 if (res.data.code === 200) {
 	   const data = res.data.data;
 	   const list = isMapping?[data]:data.records;
-	   console.log(222,data.id)
 	   setselectedRowKeys(isMapping?[data.id]:[]);
 	   setDrugList(list);
-	   setTotal(data.total||1)
+	   setTotal(data.total||0)
 	 }
    })
  }
@@ -104,7 +105,7 @@ function MatchDrug(props) {
         columns={columns}
         scroll={{ y: 'calc(100vh - 320px)' }}
         dataSource={DrugList}
-        rowKey={record => record.icd10}
+        rowKey={record => record.standard}
         pagination={{
           current: current,
           pageSize: size,

src/components/MyMessage/index.js

@@ -78,6 +78,7 @@ function MyMessage() {
                 setMsgDetail(data);
                 //更新未读消息数量
                 getNotNoticeCount();
+			    getTableData(params);//刷新列表
             } else {
                 message.warning(res.data.message || '获取详情失败')
             }

src/components/SurgeryManager/MatchSurg.js

@@ -79,14 +79,16 @@ function MatchSurg(props) {
   }
   function getPage(param) {
 	//已匹配的获取已被匹配的那条数据即可
-	const url = isMapping?api.getOperationById:api.getMatchingOperationPage;
-	post(url, param||params).then((res) => {
+	const url = isMapping?api.getOperationById:api.getConceptLibraryPage;
+	const pm = param||params;
+	const paramData = isMapping?pm:{...pm,type:2};  //type：1:诊断，2:手术，3:药品
+	post(url, paramData).then((res) => {
 	  if (res.data.code === 200) {
 		const data = res.data.data;
 		const list = isMapping?[data]:data.records;
 		setselectedRowKeys(isMapping?[data.id]:[]);
 		setDiagList(list);
-		setTotal(data.total||1)
+		setTotal(data.total||0)
 	  }
 	})
   }
@@ -103,7 +105,7 @@ function MatchSurg(props) {
 			columns={columns}
 			scroll={{ y: 'calc(100vh - 320px)' }}
 			dataSource={DiagList}
-			rowKey={record => record.code}
+			rowKey={record => record.standard}
 			pagination={{
 			  current: current,
 			  pageSize: size,

src/components/SurgeryManager/index.js

@@ -223,6 +223,7 @@ function SurgManager() {
 	  setvisible2(false);
 	  if (res.data.code === 200) {
 		message.success("匹配成功");
+		getOperationPage();
 	  }else{
 		message.warning(res.data.message||"匹配失败，请重试");
 	  }