优化

src/api/zhu-yuan-yi-sheng/jian-yan-jian-cha-shen-qing.js → src/api/zhu-yuan-yi-sheng/jian-yan-jian-cha-shen-qing.ts

@@ -1,26 +1,17 @@
-import request from "@/utils/request";
-import requestV2 from "@/utils/request-v2";
+import requestV2 from "../../utils/request-v2";
 
 let url = '/jianYanJianChaShenQing/'
 
 export function huoQuJianChaShenQing(data) {
-    return request({
+    return requestV2({
         url: url + 'huoQuJianChaShenQing',
         method: 'post',
         data
     })
 }
 
-export function huoQuJianYanJianChaMing(name, patNo, times, bedNo, reqType) {
-    return request({
-        url: url + 'huoQuJianYanJianChaMing',
-        method: 'get',
-        params: {name, patNo, times, bedNo, reqType}
-    })
-}
-
 export function huoQuShengQingXiangQing(reqNo) {
-    return request({
+    return requestV2({
         url: url + 'huoQuShengQingXiangQing',
         method: 'get',
         params: {reqNo}
@@ -28,7 +19,7 @@ export function huoQuShengQingXiangQing(reqNo) {
 }
 
 export function queryCheckTextResults(patNo, reqNo) {
-    return request({
+    return requestV2({
         url: url + 'queryCheckTextResults',
         method: 'get',
         params: {patNo, reqNo}
@@ -36,7 +27,7 @@ export function queryCheckTextResults(patNo, reqNo) {
 }
 
 export function huoMuShuoMingMuBan(name, fenLei, total, currentPage) {
-    return request({
+    return requestV2({
         url: url + 'huoMuShuoMingMuBan',
         method: 'get',
         params: {name, fenLei, total, currentPage}
@@ -44,7 +35,7 @@ export function huoMuShuoMingMuBan(name, fenLei, total, currentPage) {
 }
 
 export function shouMingMuBanChaoZuo(data) {
-    return request({
+    return requestV2({
         url: url + 'shouMingMuBanChaoZuo',
         method: 'post',
         data
@@ -52,7 +43,7 @@ export function shouMingMuBanChaoZuo(data) {
 }
 
 export function diagnosisInOurHospital(name) {
-    return request({
+    return requestV2({
         url: url + 'diagnosisInOurHospital',
         method: 'get',
         params: {name}
@@ -60,7 +51,7 @@ export function diagnosisInOurHospital(name) {
 }
 
 export function getTemplate(itemType, templateType) {
-    return request({
+    return requestV2({
         url: url + 'getTemplate',
         method: 'get',
         params: {itemType, templateType}
@@ -68,7 +59,7 @@ export function getTemplate(itemType, templateType) {
 }
 
 export function getTemplateGrouping(itemType, templateType) {
-    return request({
+    return requestV2({
         url: url + 'getTemplateGrouping',
         method: 'get',
         params: {itemType, templateType}
@@ -76,7 +67,7 @@ export function getTemplateGrouping(itemType, templateType) {
 }
 
 export function getTemplateByCodeAndType(code, type) {
-    return request({
+    return requestV2({
         url: url + 'getTemplateByCodeAndType',
         method: 'get',
         params: {code, type}
@@ -85,7 +76,7 @@ export function getTemplateByCodeAndType(code, type) {
 
 
 export function shanShuJianChaMuBan(code, deptCode) {
-    return request({
+    return requestV2({
         url: url + 'shanShuJianChaMuBan',
         method: 'get',
         params: {code, deptCode}
@@ -93,7 +84,7 @@ export function shanShuJianChaMuBan(code, deptCode) {
 }
 
 export function jianChaJianYanMuBanMing(name, reqType) {
-    return request({
+    return requestV2({
         url: url + 'jianChaJianYanMuBanMing',
         method: 'get',
         params: {name, reqType}
@@ -101,7 +92,7 @@ export function jianChaJianYanMuBanMing(name, reqType) {
 }
 
 export function baoCunJianChaJianYanMuBan(data) {
-    return request({
+    return requestV2({
         url: url + 'baoCunJianChaJianYanMuBan',
         method: 'post',
         data
@@ -109,7 +100,7 @@ export function baoCunJianChaJianYanMuBan(data) {
 }
 
 export function baoCunJianYanJianCha(data) {
-    return request({
+    return requestV2({
         url: url + 'baoCunJianYanJianCha',
         method: 'post',
         data
@@ -119,7 +110,7 @@ export function baoCunJianYanJianCha(data) {
 /* ------------------------- 下面是检验的逻辑 --------------*/
 
 export function huoQuJianYan(data) {
-    return request({
+    return requestV2({
         url: url + 'huoQuJianYan',
         method: 'post',
         data
@@ -127,7 +118,7 @@ export function huoQuJianYan(data) {
 }
 
 export function biaoBenApi(name) {
-    return request({
+    return requestV2({
         url: url + 'biaoBenShuJu',
         method: 'get',
         params: {name}
@@ -136,7 +127,7 @@ export function biaoBenApi(name) {
 
 
 export function viewInspectionItemDetails(orderCode) {
-    return request({
+    return requestV2({
         url: url + 'viewInspectionItemDetails',
         method: 'get',
         params: {orderCode}
@@ -144,7 +135,7 @@ export function viewInspectionItemDetails(orderCode) {
 }
 
 export function shanChuJianChaJianYan(reqNo, patNo, times) {
-    return request({
+    return requestV2({
         url: url + 'shanChuJianChaJianYan',
         method: 'get',
         params: {reqNo, patNo, times}
@@ -153,14 +144,14 @@ export function shanChuJianChaJianYan(reqNo, patNo, times) {
 
 // 获取检验检查树状图
 export function getJyJcZdTree() {
-    return request({
+    return requestV2({
         url: url + 'getJyJcZdTree',
         method: 'get',
     })
 }
 
 export function getJcItem(code) {
-    return request({
+    return requestV2({
         url: url + 'getJcItem',
         method: 'get',
         params: {code}
@@ -168,7 +159,7 @@ export function getJcItem(code) {
 }
 
 export function getJyItem(code) {
-    return request({
+    return requestV2({
         url: url + 'getJyItem',
         method: 'get',
         params: {code}
@@ -194,7 +185,7 @@ export function applicationOpRecord(data) {
 
 
 export function getJcIdByPatNo(patNo) {
-    return request({
+    return requestV2({
         url: url + 'getJcIdByPatNo',
         method: 'get',
         params: {patNo}
@@ -202,7 +193,7 @@ export function getJcIdByPatNo(patNo) {
 }
 
 export function getExamineDetail(jcId) {
-    return request({
+    return requestV2({
         url: url + 'getExamineDetail',
         method: 'get',
         params: {jcId}
@@ -219,7 +210,7 @@ export function getExamineDetail(jcId) {
  * }>}
  */
 export function getExamineIllustrate(orderCode, isCheck) {
-    return request({
+    return requestV2({
         url: url + 'getExamineIllustrate',
         method: 'get',
         params: {orderCode, isCheck}

src/views/hospitalization/zhu-yuan-yi-sheng/jian-cha-jian-yan-shen-qing/components/public/JianChaJianYanTable.vue

@@ -111,10 +111,9 @@ declare type  ExamineIllustrate = {
 
 const examineIllustrate = new Map<string, ExamineIllustrate>();
 
-
-function explanationClick(value : {orderCode : string}) {
+function explanationClick(value: { orderCode: string }) {
   function messageBox(data: ExamineIllustrate) {
-    const message = `注意事项：${data.note}<br/><br/>采集说明：${data.collectionInfo}。`;
+    const message = `注意事项：${data.note || ''}<br/><br/>采集说明：${data.collectionInfo || ''}。`;
     CyMessageBox.confirm({
       type: 'info',
       title: '说明',
@@ -131,7 +130,6 @@ function explanationClick(value : {orderCode : string}) {
       messageBox(res)
     })
   }
-
 }