Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/api/patient.js

@@ -1403,4 +1403,49 @@ export function getPatientRescueRecordList(id,patient_id,params){
     method:"get",
     params:params
   })
+}
+
+export function getMonitorSearchList(params){
+
+  return request({
+    url:"/api/patient/getmonitorsearchlist",
+    method:"get",
+    params:params,
+  })
+}
+
+export function getSummarySearchList(params){
+
+  return request({
+    url:"/api/patient/getsummarysearchlist",
+    method:"get",
+    params:params
+  })
+}
+
+export function getPatientDryWeightList(params){
+
+  return request({
+    url:"/api/patient/getpatientdryweightlist",
+    method:"Get",
+    params:params
+  })
+}
+
+export function getDilaysisSystemList(params){
+   
+  return request({
+    url:"/api/patient/getdialysissystemlist",
+    method:"Get",
+    params:params,
+  })
+}
+
+export function getPatientAdviceList(params){
+
+  return request({
+    url:"/api/patient/getpatientadvicelist",
+    method:"Get",
+    params:params,
+  })
 }

src/xt_pages/user/components/PatientForm.vue

@@ -1707,14 +1707,15 @@ export default {
         },
         handleGallerySuccess(res, file) {
             var data = {type:1, url: this.qiniuDomain + res.url};
-            // this.fileList.push(data.url)
-            // if(this.fileList!=null){
-            //   for(let i=0;i<this.fileList.length;i++){
-            //      this.form.org_logo += this.fileList[i].url+","
-            //   }
-            // }
-           console.log("hahahahhwoowowo",this.form.org_logo)
-           this.form.org_logo += data.url+","
+            this.fileList.push(data)
+            console.log("fileLit==============",this.fileList)
+            if(this.fileList!=null){
+              for(let i=0;i<this.fileList.length;i++){
+                 this.form.org_logo += this.fileList[i].url+","
+              }
+            }
+          //  console.log("hahahahhwoowowo",this.form.org_logo)
+          //  this.form.org_logo += data.url+","
 
             this.guploading = false;
         },
@@ -2071,7 +2072,7 @@ export default {
             if(arrNew!=null){
               for(let i=0;i<arrNew.length;i++){
                 if(arrNew[i]!=""){
-                  var image = { name:i+1, url:arrNew[i]+'?vframe/jpg/offset/0/w/100/h/100'};
+                  var image = { name:i+1, url:arrNew[i]};
                   this.fileList.push(image)
                 }
               }

src/xt_pages/user/components/PatientSidebar.vue

@@ -179,10 +179,10 @@ export default {
             //   name: '3-3',
             //   label: '体格检查新'
             // },
-             {
-              name: '3-5',
-              label: '病程记录新'
-             },
+            //  {
+            //   name: '3-5',
+            //   label: '病程记录新'
+            //  },
             {
               name: '1-11',
               label: '首次病程记录'