Merge remote-tracking branch 'origin/referMaster' into referMaster

# Conflicts:
#	src/api/config.js

package-lock.json

@@ -4836,7 +4836,8 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -4857,12 +4858,14 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -4877,17 +4880,20 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -5004,7 +5010,8 @@
         "inherits": {
           "version": "2.0.4",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -5016,6 +5023,7 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -5030,6 +5038,7 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -5037,12 +5046,14 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.9.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -5061,6 +5072,7 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -5150,7 +5162,8 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -5162,6 +5175,7 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -5247,7 +5261,8 @@
         "safe-buffer": {
           "version": "5.1.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -5283,6 +5298,7 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -5302,6 +5318,7 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -5345,12 +5362,14 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "yallist": {
           "version": "3.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },

src/api/config.js

@@ -291,25 +291,25 @@ export default {
     'getFieldDetail': '/api/mrman/qc/qcQuestionInfo/getById',//获取标签详情
     'addFieldMatch': "/api/mrman/qc/qcQuestionInfo/saveOrUpdate",    //添加字段映射
     'getQcTypes': testUrl + "/api/mrman/qc/dictionaryInfo/getList",    //添加字段映射
-    'delFieldMatch': "/api/mrman/qc/qcQuestionInfo/delete",    //删除字段映射
+    'delFieldMatch': "/api/mrman/qc/qcQuestionInfo/delete",    //删除字段映射  
     'getQCTemplist': testUrl + '/api/mrman/qc/qcModuleInfo/page', // 获取模板列表
     'saveOrUpdateQCTemp': '/api/mrman/qc/qcModuleInfo/saveOrUpdateModuleInfo', //新增或修改模板
     'delQCTemp': '/api/mrman/qc/qcModuleInfo/delete', //删除模板
-    'getQCTempDetail': testUrl + '/api/mrman/qc/qcModuleInfo/getById', //获取模板详情
+    'getQCTempDetail':testUrl +  '/api/mrman/qc/qcModuleInfo/getById', //获取模板详情
     'getQCName': '/api/mrman/qc/qcQuestionInfo/index', //获取字段名称
     'getQcFlawList': '/api/mrman/qcCasesEntry/indexCaseEntry',   //获取缺陷列表
     'getModuleTypeList': '/api/mrman/qc/qcModuleInfo/index', //获取模块类型列表
     'getRecordInpList': '/api/mrman/qcInputcases/getAllInputcases',//获取全部病历录入
     'removeRecordInpById': '/api/mrman/qcInputcases/cancelById',//删除病历录入
-    'addRecordInp': '/api/mrman/qcInputcases/saveOrUpdata', //保存和修改全部病历录入
+    'addRecordInp': '/api/mrman/qcInputcases/saveOrUpdata', //保存和修改全部病历录入 
     'getRecordInpModule': '/api/mrman/qcCases/getAll', //获取全部模块及条目
     'getRecordInpModuleByHospital': '/api/mrman/qcCases/getAllByHospital', //获取全部模块及条目根据医院名称
-    'getRecordHopitalList': '/api/mrman/qcHospitalInfo/getHospitalInfoAll',//获取医院信息
+    'getRecordHopitalList': '/api/mrman/qcHospitalInfo/getHospitalInfoAll',//获取医院信息 
     'getRecordCases': testUrl + '/api/mrman/qcCases/getCases', //获取全部模块
     'getRecordIremList': testUrl + '/api/mrman/qcCasesEntry/getAll', //获取病例条目列表
     'addRecordItem': '/api/mrman/casesEntryHospital/insertByHospital', //添加病例条目
-    'getRecordByHospital': '/api/mrman/casesEntryHospital/getAllByHospital', //获取指定医院的病例条目
-    'updateRecordByHospital': '/api/mrman/casesEntryHospital/updateByHospital', //更新指定医院的病例条目
+    'getRecordByHospital': '/api/mrman/casesEntryHospital/getAllByHospital', //获取指定医院的病例条目 
+    'updateRecordByHospital': '/api/mrman/casesEntryHospital/updateByHospital', //更新指定医院的病例条目 
     'delRecordItem': '/api/mrman/qcCasesEntry/deleteQcCasesEntry', //删除病例条目
     'getRecordItemDetail': '/api/mrman/qcCasesEntry/getUpdateInfo', //获取病例详情
     'getInputcasesDetial': '/api/mrman/qcInputcases/getInputcasesDetial', //获取标注病例详情
@@ -323,8 +323,8 @@ export default {
     'getQcEntryTypeDetail': testUrl + '/api/mrman/qc/qcEntryType/getById', //质控条目与质控类型关系--根据entryId和医院id返回内容
     'getQcEntryTypeByHospital': testUrl + '/api/mrman/qc/qcEntryType/getTypeByHospital', //质控条目与质控类型关系--根据医院获取质控类型列表
     'getQcEntryTypeIndex': testUrl + '/api/mrman/qc/qcEntryType/index', //质控条目与质控类型关系--根据医院和条目检索未被选择的质控类型
-    'ifNeedUnbind': testUrl + '/api/mrman/qc/qcType/getOrCancel',   //判断质控类型是否已被绑定、解除绑定
-    'qcTypeList': testUrl + '/api/mrman/qc/qcType/indexData',    //其他质控类型列表
+    'ifNeedUnbind':testUrl + '/api/mrman/qc/qcType/getOrCancel',   //判断质控类型是否已被绑定、解除绑定
+    'qcTypeList':testUrl + '/api/mrman/qc/qcType/indexData',    //其他质控类型列表
     'saveQcEntryType': '/api/mrman/qc/qcEntryType/saveOrUpdate', //质控条目与质控类型关系--保存
     'getStdList': '/api/mrman/stdBehospitalInfo/getSthospitalInfoPage',//标准病例列表
     'delStdRecord': '/api/mrman/stdBehospitalInfo/clearSthospitalInfo',//删除标准病例
@@ -369,9 +369,9 @@ export default {
     'deleteDiseaseRecordCDSS': '/api/cdssman/tran/diseaseConfig/deleteRecord',   //诊断-删除映射关系
     'exportDiseaseRecordCDSS': '/api/cdssman/tran/diseaseConfig/exportExcel',   //诊断-数据导出
     'importDiseaseRecordCDSS': '/api/cdssman/tran/diseaseConfig/importExcel',   //诊断-数据导入
-    'exportDiseaseModuleCDSS': '/api/cdssman/tran/diseaseConfig/exportExcelModule',
-    'precDiseaseDataMatch': '/api/cdssman/tran/diseaseConfig/precDataMatch',
-    'dataDiseaseVerify': '/api/cdssman/tran/diseaseConfig/dataVerify',
+    'exportDiseaseModuleCDSS': '/api/cdssman/tran/diseaseConfig/exportExcelModule',   
+    'precDiseaseDataMatch': '/api/cdssman/tran/diseaseConfig/precDataMatch',   
+    'dataDiseaseVerify': '/api/cdssman/tran/diseaseConfig/dataVerify',   
 
     'getLisPageCDSS': '/api/cdssman/tran/lisConfig/getPage',   //检验列表
     'lisIsExistRecordCDSS': '/api/cdssman/tran/lisConfig/isExistRecord',   //检验-映射关系是否已存在
@@ -379,9 +379,9 @@ export default {
     'deleteLisRecordCDSS': '/api/cdssman/tran/lisConfig/deleteRecord',   //检验-删除映射关系
     'exportLisRecordCDSS': '/api/cdssman/tran/lisConfig/exportExcel',   //检验-数据导出
     'importLisRecordCDSS': '/api/cdssman/tran/lisConfig/importExcel',   //检验-数据导入
-    'exportLisModuleCDSS': '/api/cdssman/tran/lisConfig/exportExcelModule',
-    'precLisDataMatch': '/api/cdssman/tran/lisConfig/precDataMatch',
-    'dataLisVerify': '/api/cdssman/tran/lisConfig/dataVerify',
+    'exportLisModuleCDSS': '/api/cdssman/tran/lisConfig/exportExcelModule',   
+    'precLisDataMatch': '/api/cdssman/tran/lisConfig/precDataMatch',   
+    'dataLisVerify': '/api/cdssman/tran/lisConfig/dataVerify',   
 
     'getpacsPageCDSS': '/api/cdssman/tran/pacsConfig/getPage',   //检查列表
     'pacsIsExistRecordCDSS': '/api/cdssman/tran/pacsConfig/isExistRecord',   //检查-映射关系是否已存在
@@ -389,9 +389,9 @@ export default {
     'deletePacsRecordCDSS': '/api/cdssman/tran/pacsConfig/deleteRecord',   //检查-删除映射关系
     'exportPacsRecordCDSS': '/api/cdssman/tran/pacsConfig/exportExcel',   //检查-数据导出
     'importPacsRecordCDSS': '/api/cdssman/tran/pacsConfig/importExcel',   //检查-数据导入
-    'exportPacsModuleCDSS': '/api/cdssman/tran/pacsConfig/exportExcelModule',
-    'precPacsDataMatch': '/api/cdssman/tran/pacsConfig/precDataMatch',
-    'dataPacsVerify': '/api/cdssman/tran/pacsConfig/dataVerify',
+    'exportPacsModuleCDSS': '/api/cdssman/tran/pacsConfig/exportExcelModule', 
+    'precPacsDataMatch': '/api/cdssman/tran/pacsConfig/precDataMatch', 
+    'dataPacsVerify': '/api/cdssman/tran/pacsConfig/dataVerify', 
 
     'getDrugPageCDSS': '/api/cdssman/tran/drugConfig/getPage',   //药品列表
     'drugIsExistRecordCDSS': '/api/cdssman/tran/drugConfig/isExistRecord',   //药品-映射关系是否已存在
@@ -399,9 +399,9 @@ export default {
     'deleteDrugRecordCDSS': '/api/cdssman/tran/drugConfig/deleteRecord',   //药品-删除映射关系
     'exportDrugRecordCDSS': '/api/cdssman/tran/drugConfig/exportExcel',   //药品-数据导出
     'importDrugRecordCDSS': '/api/cdssman/tran/drugConfig/importExcel',   //药品-数据导入
-    'exportDrugModuleCDSS': '/api/cdssman/tran/drugConfig/exportExcelModule',
-    'precDrugDataMatch': '/api/cdssman/tran/drugConfig/precDataMatch',
-    'dataDrugVerify': '/api/cdssman/tran/drugConfig/dataVerify',
+    'exportDrugModuleCDSS': '/api/cdssman/tran/drugConfig/exportExcelModule',   
+    'precDrugDataMatch': '/api/cdssman/tran/drugConfig/precDataMatch',  
+    'dataDrugVerify': '/api/cdssman/tran/drugConfig/dataVerify',  
 
     'getOperationPageCDSS': '/api/cdssman/tran/operationConfig/getPage',   //手术/操作列表
     'operationIsExistRecordCDSS': '/api/cdssman/tran/operationConfig/isExistRecord',   //手术/操作-映射关系是否已存在
@@ -409,9 +409,9 @@ export default {
     'deleteOperationRecordCDSS': '/api/cdssman/tran/operationConfig/deleteRecord',   //手术/操作-删除映射关系
     'exportOperationRecordCDSS': '/api/cdssman/tran/operationConfig/exportExcel',   //手术/操作-数据导出
     'importOperationRecordCDSS': '/api/cdssman/tran/operationConfig/importExcel',   //手术/操作-数据导入
-    'exportOperationModuleCDSS': '/api/cdssman/tran/operationConfig/exportExcelModule',
-    'precOperationDataMatch': '/api/cdssman/tran/operationConfig/precDataMatch',
-    'dataOperationVerify': '/api/cdssman/tran/operationConfig/dataVerify',
+    'exportOperationModuleCDSS': '/api/cdssman/tran/operationConfig/exportExcelModule', 
+    'precOperationDataMatch': '/api/cdssman/tran/operationConfig/precDataMatch', 
+    'dataOperationVerify': '/api/cdssman/tran/operationConfig/dataVerify', 
 
     'getFusionPageCDSS': '/api/cdssman/tran/transfusionConfig/getPage',   //输血列表
     'fusionIsExistRecordCDSS': '/api/cdssman/tran/transfusionConfig/isExistRecord',   //输血-映射关系是否已存在
@@ -419,9 +419,9 @@ export default {
     'deleteFusionRecordCDSS': '/api/cdssman/tran/transfusionConfig/deleteRecord',   //输血-删除映射关系
     'exportFusionRecordCDSS': '/api/cdssman/tran/transfusionConfig/exportExcel',   //输血-数据导出
     'importFusionRecordCDSS': '/api/cdssman/tran/transfusionConfig/importExcel',   //输血-数据导入
-    'exportFusionModuleCDSS': '/api/cdssman/tran/transfusionConfig/exportExcelModule',
-    'precFusionDataMatch': '/api/cdssman/tran/transfusionConfig/precDataMatch',
-    'dataFusionVerify': '/api/cdssman/tran/transfusionConfig/dataVerify',
+    'exportFusionModuleCDSS': '/api/cdssman/tran/transfusionConfig/exportExcelModule',  
+    'precFusionDataMatch': '/api/cdssman/tran/transfusionConfig/precDataMatch',  
+    'dataFusionVerify': '/api/cdssman/tran/transfusionConfig/dataVerify',  
 
     'getDeptPageCDSS': '/api/cdssman/tran/deptConfig/getPage',   //科室列表
     'deptIsExistRecordCDSS': '/api/cdssman/tran/deptConfig/isExistRecord',   //科室-映射关系是否已存在
@@ -430,12 +430,12 @@ export default {
     'exportDeptRecordCDSS': '/api/cdssman/tran/deptConfig/exportExcel',   //科室-数据导出
     'importDeptRecordCDSS': '/api/cdssman/tran/deptConfig/importExcel',   //科室-数据导入
     'exportDeptModuleCDSS': '/api/cdssman/tran/deptConfig/exportExcelModule',   //科室-数据导入模板导出
-    'precDeptDataMatch': '/api/cdssman/tran/deptConfig/precDataMatch',
-    'dataDeptVerify': '/api/cdssman/tran/deptConfig/dataVerify',
-
+    'precDeptDataMatch': '/api/cdssman/tran/deptConfig/precDataMatch',   
+    'dataDeptVerify': '/api/cdssman/tran/deptConfig/dataVerify',   
+   
     // 'saveHospitalInfoRecordCDSS': '/api/cdssman/tran/hospitalInfo/saveRecord',   //医院信息——修改医院信息
 
-    'modifyConnectStatusCDSS': '/api/cdssman/hospitalInfo/modifyConnectStatus',   //医院信息——修改医院信息
+    'modifyConnectStatusCDSS': '/api/cdssman/hospitalInfo/modifyConnectStatus',   //医院信息——修改医院信息 
     'changeStatusCDSS': '/api/cdssman/hospitalInfo/changeStatus',   //医院信息——启用禁用
     'getHospitalPageCDSS': '/api/cdssman/hospitalInfo/getPage',   //医院信息——分页查询
     'saveOrUpdateHosRecordCDSS': '/api/cdssman/hospitalInfo/saveOrUpdateRecord',   //医院信息——保存或修改映射关系