merge

src/utils/patients/patientsapi.js

@@ -16,7 +16,6 @@ export const getDiseasesList = (params) => {
   })
 };
 
-<<<<<<< HEAD
 export const getLabelList = (params) => {
   return fetch({
     headers,
@@ -27,7 +26,6 @@ export const getLabelList = (params) => {
   })
 }
 
-=======
 // 获取七牛上传token
 export const getQiniuToken = (params) => {
   return fetch({
@@ -78,7 +76,6 @@ export const getNotCompleteCount = (params) => {
     description: '获取未完善居民人数',
   })
 };
->>>>>>> af68b014cd5aedf8045697cb98d80de083884ad5
 
 export const getPatientDetail = (patientId) => {
   return fetch({