Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

package-lock.json

@@ -4745,8 +4745,7 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -4769,15 +4768,13 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
           "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
           "dev": true,
-          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -4793,22 +4790,19 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "concat-map": {
           "version": "0.0.1",
           "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
           "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
           "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -4938,8 +4932,7 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "ini": {
           "version": "1.3.5",
@@ -4953,7 +4946,6 @@
           "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
           "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
           "dev": true,
-          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -4970,7 +4962,6 @@
           "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
           "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
           "dev": true,
-          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -4978,15 +4969,13 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "minipass": {
           "version": "2.3.5",
           "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz",
           "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==",
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -5007,7 +4996,6 @@
           "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
           "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
           "dev": true,
-          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -5095,8 +5083,7 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -5110,7 +5097,6 @@
           "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
           "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
           "dev": true,
-          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -5205,8 +5191,7 @@
         "safe-buffer": {
           "version": "5.1.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -5248,7 +5233,6 @@
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
           "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
           "dev": true,
-          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -5270,7 +5254,6 @@
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
           "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
           "dev": true,
-          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -5318,15 +5301,13 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "yallist": {
           "version": "3.0.3",
           "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
           "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==",
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },

src/api/advice.js

@@ -498,7 +498,7 @@ export function GetLastOrNextDoctorAdvice(params) {
 }
 
 export function getSchedualDoctors (params) {
-  console.log("params-----",params)
+  
   return request({
     url: '/api/schedule/advices',
     method: 'get',
@@ -506,6 +506,15 @@ export function getSchedualDoctors (params) {
   })
 }
 
+export function getDoctorAdviceCount(params){
+  
+  return request({
+    url:"/api/schedule/getdoctoradvicecount",
+    method:"get",
+    params:params
+  })
+}
+
 
 
 

src/api/dialysis.js

@@ -290,5 +290,3 @@ export function GetDialysisGoodStatistics(params) {
 
   })
 }
-
-

src/api/his/his.js

@@ -279,9 +279,48 @@ export function getCallHisPrescription (params) {
 
 
 
+export function getDayOrMonthHisPrescription (params) {
+  return request({
+    url: '/api/dayprescription/get',
+    method: 'get',
+    params:params,
+  })
+}
+
+
+
 
 
 
+export function editHisPrescription(data, params) {
+  return request({
+    url: "/api/hisprescription/edit",
+    method: "post",
+    data:data,
+    params:params,
+  });
+}
+
+
+
+export function getChargeHisPatientList (params) {
+  return request({
+    url: '/api/charge/list',
+    method: 'get',
+    params:params,
+  })
+}
+
+
+
+export function getChargeHisPatientInfo (params) {
+  return request({
+    url: '/api/charge/info',
+    method: 'get',
+    params:params,
+  })
+}
+
 
 
 

src/api/project/project.js

@@ -3,516 +3,524 @@ import url from "postcss-url";
 
 export function saveProject(params){
 
-    return request({
-        url:"/api/his/saveproject",
-        methods:"get",
-        params:params,
-    })
+  return request({
+    url:"/api/his/saveproject",
+    methods:"get",
+    params:params,
+  })
 }
 
 
 export function getProjectList(params){
-   
-    return request({
-       url:"/api/his/getprojectlist",
-       methods:"get",
-       params:params
-    })
+
+  return request({
+    url:"/api/his/getprojectlist",
+    methods:"get",
+    params:params
+  })
 }
 
 export function getProjectDetail(id,params){
-  
-    return request({
-       url:"/api/his/getprojectdetail?id="+id,
-       methods:"get",
-       params:params
-    })
+
+  return request({
+    url:"/api/his/getprojectdetail?id="+id,
+    methods:"get",
+    params:params
+  })
 }
 
 export function updatedProject(params){
-   
-   return request({
-      url:"/api/his/updatedproject",
-      methods:"get",
-      params:params
-   })
+
+  return request({
+    url:"/api/his/updatedproject",
+    methods:"get",
+    params:params
+  })
 }
 
 export function deleteHisProject(id,params){
-   
-    return request({
-      url:"/api/his/deletehisproject?id="+id,
-      methods:"get",
-      params:params
-    })
+
+  return request({
+    url:"/api/his/deletehisproject?id="+id,
+    methods:"get",
+    params:params
+  })
 }
 
 export function saveProjectTeam(params){
-  
-   return request({
-     url:"/api/his/saveprojectteam",
-     methods:"Get",
-     params:params
-   })
+
+  return request({
+    url:"/api/his/saveprojectteam",
+    methods:"Get",
+    params:params
+  })
 }
 
 export function getProjectTeamList(params){
-  
-    return request({
-       url:"/api/his/getprojectteamlist",
-       methods:"get",
-       params:params
-    })
+
+  return request({
+    url:"/api/his/getprojectteamlist",
+    methods:"get",
+    params:params
+  })
 }
 
 export function getProjectTeamDetail(id,params){
-   
-    return request({
-       url:"/api/his/getprojectteamdetail?id="+id,
-       methods:"get",
-       params:params
-    })
+
+  return request({
+    url:"/api/his/getprojectteamdetail?id="+id,
+    methods:"get",
+    params:params
+  })
 }
 
 export function updatedProjectTeam(params){
-  
-    return request({
-       url:"/api/his/updateprojectteam",
-       methods:"get",
-       params:params
-    })
+
+  return request({
+    url:"/api/his/updateprojectteam",
+    methods:"get",
+    params:params
+  })
 }
 
 export function DeleteProjectTeam(id,params){
-   
+
   return request({
-      url:"/api/his/deleteprojectteam?id="+id,
-      methods:"get",
-      params:params
+    url:"/api/his/deleteprojectteam?id="+id,
+    methods:"get",
+    params:params
   })
 }
 
 export function SaveDepartment(params){
-  
-    return request({
-       url:"/api/his/savedepartment",
-       methods:"get",
-       params:params
-    })
+
+  return request({
+    url:"/api/his/savedepartment",
+    methods:"get",
+    params:params
+  })
 }
 
 export function getDePartmentList(params){
-  
-    return request({
-       url:"/api/his/getdepartmentlist",
-       methods:"Get",
-       params:params
-    })
+
+  return request({
+    url:"/api/his/getdepartmentlist",
+    methods:"Get",
+    params:params
+  })
 }
 
 export function getDepartMentDetail(id,params){
-  
-    return request({
-        url:"/api/his/getdepartmentdetail?id="+id,
-        methods:"get",
-        params:params
-    })
+
+  return request({
+    url:"/api/his/getdepartmentdetail?id="+id,
+    methods:"get",
+    params:params
+  })
 }
 
 export function UpdatedDepartment(params){
-   
-    return request({
-        url:"/api/his/updagtedepartment",
-        methods:"get",
-        params:params
-    })
+
+  return request({
+    url:"/api/his/updagtedepartment",
+    methods:"get",
+    params:params
+  })
 }
 
 export function DeleteDepartment(id,params){
-    return request({
-       url:"/api/his/deletedeparment?id="+id,
-       methods:"get",
-       params:params
-    })
+  return request({
+    url:"/api/his/deletedeparment?id="+id,
+    methods:"get",
+    params:params
+  })
 }
 
 
 export function getPatientList(params){
-   return request({
-       url:"/api/his/getbloodpatient",
-       methods:"get",
-       params:params
-   })
+  return request({
+    url:"/api/his/getbloodpatient",
+    methods:"get",
+    params:params
+  })
 }
 
 export function getHisPrescription(id,params){
-   
-    return request({
-       url:"/api/his/gethisprescription?id="+id,
-       methods:"get",
-       params:params
-    })
+
+  return request({
+    url:"/api/his/gethisprescription?id="+id,
+    methods:"get",
+    params:params
+  })
 }
 
 export function saveCharges(data){
-    
-    return request({
-       url:"/api/his/additionalcharge",
-       method:"post",
-       data:data
-    })
+
+  return request({
+    url:"/api/his/additionalcharge",
+    method:"post",
+    data:data
+  })
 }
 
 
 export function getAllProjectList(params){
-    return request({
-       url:"/api/his/getallprojectlist",
-       methods:"get",
-       params:params
-    })
+  return request({
+    url:"/api/his/getallprojectlist",
+    methods:"get",
+    params:params
+  })
 }
 
 export function addProjectList(params){
-  
-    return request({
-       url:"/api/his/addprojectlist",
-       methods:"get",
-       params:params
-    })
+
+  return request({
+    url:"/api/his/addprojectlist",
+    methods:"get",
+    params:params
+  })
 }
 
 export function getPatientInformation(id,params){
-   
-   return request({
-     url:"/api/his/getpatientinformation?id="+id,
-     methods:"Get",
-     params:params
-   })
+
+  return request({
+    url:"/api/his/getpatientinformation?id="+id,
+    methods:"Get",
+    params:params
+  })
 }
 
 export function DeleteProject(id,params){
-   
-    return request({
-       url:"/api/his/deleteproject?id="+id,
-       methods:"Get",
-       params:params
-    })
+
+  return request({
+    url:"/api/his/deleteproject?id="+id,
+    methods:"Get",
+    params:params
+  })
 }
 
 
 export function getHisProject(params){
-  
-    return request({
-       url:"/api/his/gethisproject",
-       methods:"get",
-       params:params
-    })
+
+  return request({
+    url:"/api/his/gethisproject",
+    methods:"get",
+    params:params
+  })
 }
 
 export function addProjectTeam(params){
-   
+
   return request({
-      url:"/api/his/getprojectteam",
-      methods:"Get",
-      params:params
+    url:"/api/his/getprojectteam",
+    methods:"Get",
+    params:params
   })
 }
 
 export function getAllDoctorList(params){
-   
+
   return request({
-      url:"/api/his/getalldoctorlist",
-      methods:"Get",
-      params:params
+    url:"/api/his/getalldoctorlist",
+    methods:"Get",
+    params:params
   })
-} 
+}
 
 export function saveHisPatient(params){
-   
-    return request({
-        url:"/api/his/savehispatient",
-        methods:"get",
-        params:params
-    })
+
+  return request({
+    url:"/api/his/savehispatient",
+    methods:"get",
+    params:params
+  })
 }
 
 export function getAllProjectTeam(params){
-  
+
   return request({
-     url:"/api/hist/getallprojecteam",
-     methods:"get",
-     params:params
+    url:"/api/hist/getallprojecteam",
+    methods:"get",
+    params:params
   })
 }
 
 export function getPojectListById(params){
-  
+
   return request({
     url:"/api/his/getprojectlistbyid",
     methods:"get",
-    params:params 
+    params:params
   })
 }
 
 export function getHisPatientHistory(params){
-  
-    return request({
-        url:"/api/his/gethispatienthistory",
-        methods:"get",
-        params:params
-    })
+
+  return request({
+    url:"/api/his/gethispatienthistory",
+    methods:"get",
+    params:params
+  })
 }
 
 
 export function changePatient(id,params){
-   
-    return request({
-      url:"/api/patient/changepatient?id="+id,
-      method:"get",
-      params:params
-    })
-  }
-
-
-  export function getPatientCaseHistory(params){
-     
-    return request({
-        url:"/api/patient/getpatientcasehistory",
-        method:"get",
-        params:params
-    })
-  }
-
-  export function SaveHisPatientCaseHistoryTemplate(params){
-      
-    return request({
-       url:"/api/doctorworkstation/casehistorytemplate/create",
-       method:"get",
-       params:params
-    })
-  }
-
-  export function getHistoryTemplate(params){
-   
-    return request({
-      url:"/api/doctorworkstation/casehistorytemplate/get",
-      method:"get",
-      params:params
-    })
-  }
-
-  export function getTemplateDetail(id,params){
-     
-     return request({
-        url:"/api/doctorworkstation/gettemplatedetail?id="+id,
-        method:"get",
-        params:params
-     })
-  }
-
-  export function updateRecordTemplate(params){
-    
-    return request({
-        url:"/api/doctorworkstation/updaterecordtemplate",
-        method:"get",
-        params:params  
-    })
-  } 
-
-  export function getHisPatient(params){
-    
-    return request({
-      url:"/api/hispatient/gehispatient",
-      method:"get",
-      params:params
-    })
-  }
-
-  export function postPrintHisTemplate(params){
-    
-    return request({
-      url:"/api/hispatient/postprinthistemplate",
-      method:"get",
-      params:params
-    })
-  }
-
-  export function getHisPrintTemplate(params){
-    
-    return request({
-      url:"/api/gethisprinttemplate",
-      method:"get",
-      params:params
-    })
-  } 
-
-  export function postPrescriptionPrintTemplate(params){
-    
-    return request({
-      url:"/api/hispatient/postprescriptiontemplate",
-      method:"Get",
-      params:params
-    })
-  }
-
-  export function getPrescriptionTemplate(params){
-   
-    return request({
-      url:"/api/hispatient/getprescriptiontemplate",
-      method:"Get",
-      params:params
-    })
-  }
-
-  export function postTreatPrintTemplate(params){
-   
-    return request({
-      url:"/api/hispatient/posttreatprinttemplate",
-      method:"get",
-      params:params
-    })
-  }
-
-  export function getTreatPrintTemplate(params){
-   
-    return request({
-      url:"/api/hispatient/gettreatprinttemplate",
-      method:"Get",
-      params:params
-    })
-  }
-
-  export function postChargePrintTemplate(params){
-    
-    return request({
-      url:"/api/hispatient/postchargeprinttemplate",
-      method:"get",
-      params:params
-    })
-  }
-
-  export function getChargePrintTemplate(params){
-     
-    return request({
-       url:"/api/hispatient/getchargeprinttemplate",
-       method:"get",
-       params:params
-    })
-  }
-
-  export function getAllHisPatientList(params){
-    
-    return request({
-      url:"/api/hispatient/getallhispatient",
-      method:"get",
-      params:params
-    })
-  }
-
-  export function getPrescriptionPrint(params){
-    
-    return request({
-      url:"/api/hispatient/getprescriptionprint",
-      method:"get",
-      params:params
-    })
-  }
-
-  export function getChargePrint(params){
-     
-    return request({
-      url:"/api/hispatient/getchargeprint",
-      method:"get",
-      params:params
-    })
-  }
-
-  export function getTodaySchedulePatient(params){
-     
-    return request({
-      url:"/api/hispatient/gettodayschedulepatient",
-      method:"get",
-      params:params
-    })
-  }
-
-  export function getHisPatientDetail(params){
-    console.log("params99999",params)
-    return request({
-      url:"/api/hispatient/gethispatientdetail",
-      method:"Get",
-      params:params
-    })
-  }
-
-  export function getAllDePartmentList(params){
-   
-    return request({
-      url:"/api/hispatient/getalldepartmentlist",
-      method:"Get",
-      params:params
-    })
-  } 
-
-  export function getPrescriptionList(id,params){
-     
-    return request({
-      url:"/api/hispatient/getprescription?patient_id="+id,
-      method:"Get",
-      params:params
-    })
-  }
-
-  export function getPatientDetail(id,params){
-    
-     return request({
-       url:"/api/histpatient/getpatientdetail?id="+id,
-       method:"Get",
-       params:params
-     })
-  }
-
-  export function saveMainTemplate(params){
-    
-    return request({
-      url:"/api/hispatient/savemaintemplate",
-      method:"Get",
-      params:params
-    })
-  }
-
-  export function getMedicalTemplateList(params){
-    
-    return request({
-      url:"/api/hispatient/getmedicaltemplatelist",
-      method:"Get",
-      params:params
-    })
-  }
-
-  export function getMainTemplateById(id,params){
-    
-    return request({
-      url:"/api/hispatient/getmaintemplatebyid?id="+id,
-      method:"get",
-      params:params
-    })
-  }
-
-  export function UpdateMainTemplate(params){
-   
-    return request({
-      url:"/api/hispatient/updatemaintemplate",
-      method:"get",
-      params:params
-    })
-  }
-
-  export function deleteMainTemplate(id,params){
-  
-     return request({
-       url:"/api/hispatient/deletemaintemplate?id="+id,
-       method:"Get",
-       params:params
-     })
-  }
+
+  return request({
+    url:"/api/patient/changepatient?id="+id,
+    method:"get",
+    params:params
+  })
+}
+
+
+export function getPatientCaseHistory(params){
+
+  return request({
+    url:"/api/patient/getpatientcasehistory",
+    method:"get",
+    params:params
+  })
+}
+
+export function SaveHisPatientCaseHistoryTemplate(params){
+
+  return request({
+    url:"/api/doctorworkstation/casehistorytemplate/create",
+    method:"get",
+    params:params
+  })
+}
+
+export function getHistoryTemplate(params){
+
+  return request({
+    url:"/api/doctorworkstation/casehistorytemplate/get",
+    method:"get",
+    params:params
+  })
+}
+
+export function getTemplateDetail(id,params){
+
+  return request({
+    url:"/api/doctorworkstation/gettemplatedetail?id="+id,
+    method:"get",
+    params:params
+  })
+}
+
+export function updateRecordTemplate(params){
+
+  return request({
+    url:"/api/doctorworkstation/updaterecordtemplate",
+    method:"get",
+    params:params
+  })
+}
+
+export function getHisPatient(params){
+
+  return request({
+    url:"/api/hispatient/gehispatient",
+    method:"get",
+    params:params
+  })
+}
+
+export function postPrintHisTemplate(params){
+
+  return request({
+    url:"/api/hispatient/postprinthistemplate",
+    method:"get",
+    params:params
+  })
+}
+
+export function getHisPrintTemplate(params){
+
+  return request({
+    url:"/api/gethisprinttemplate",
+    method:"get",
+    params:params
+  })
+}
+
+export function postPrescriptionPrintTemplate(params){
+
+  return request({
+    url:"/api/hispatient/postprescriptiontemplate",
+    method:"Get",
+    params:params
+  })
+}
+
+export function getPrescriptionTemplate(params){
+
+  return request({
+    url:"/api/hispatient/getprescriptiontemplate",
+    method:"Get",
+    params:params
+  })
+}
+
+export function postTreatPrintTemplate(params){
+
+  return request({
+    url:"/api/hispatient/posttreatprinttemplate",
+    method:"get",
+    params:params
+  })
+}
+
+export function getTreatPrintTemplate(params){
+
+  return request({
+    url:"/api/hispatient/gettreatprinttemplate",
+    method:"Get",
+    params:params
+  })
+}
+
+export function postChargePrintTemplate(params){
+
+  return request({
+    url:"/api/hispatient/postchargeprinttemplate",
+    method:"get",
+    params:params
+  })
+}
+
+export function getChargePrintTemplate(params){
+
+  return request({
+    url:"/api/hispatient/getchargeprinttemplate",
+    method:"get",
+    params:params
+  })
+}
+
+export function getAllHisPatientList(params){
+
+  return request({
+    url:"/api/hispatient/getallhispatient",
+    method:"get",
+    params:params
+  })
+}
+
+export function getPrescriptionPrint(params){
+
+  return request({
+    url:"/api/hispatient/getprescriptionprint",
+    method:"get",
+    params:params
+  })
+}
+
+export function getChargePrint(params){
+
+  return request({
+    url:"/api/hispatient/getchargeprint",
+    method:"get",
+    params:params
+  })
+}
+
+export function getTodaySchedulePatient(params){
+
+  return request({
+    url:"/api/hispatient/gettodayschedulepatient",
+    method:"get",
+    params:params
+  })
+}
+
+export function getHisPatientDetail(params){
+  console.log("params99999",params)
+  return request({
+    url:"/api/hispatient/gethispatientdetail",
+    method:"Get",
+    params:params
+  })
+}
+
+export function getAllDePartmentList(params){
+
+  return request({
+    url:"/api/hispatient/getalldepartmentlist",
+    method:"Get",
+    params:params
+  })
+}
+
+export function getPrescriptionList(id,params){
+
+  return request({
+    url:"/api/hispatient/getprescription?patient_id="+id,
+    method:"Get",
+    params:params
+  })
+}
+
+export function getPatientDetail(id,params){
+
+  return request({
+    url:"/api/histpatient/getpatientdetail?id="+id,
+    method:"Get",
+    params:params
+  })
+}
+
+export function saveMainTemplate(params){
+
+  return request({
+    url:"/api/hispatient/savemaintemplate",
+    method:"Get",
+    params:params
+  })
+}
+
+export function getMedicalTemplateList(params){
+
+  return request({
+    url:"/api/hispatient/getmedicaltemplatelist",
+    method:"Get",
+    params:params
+  })
+}
+
+export function getMainTemplateById(id,params){
+
+  return request({
+    url:"/api/hispatient/getmaintemplatebyid?id="+id,
+    method:"get",
+    params:params
+  })
+}
+
+export function UpdateMainTemplate(params){
+
+  return request({
+    url:"/api/hispatient/updatemaintemplate",
+    method:"get",
+    params:params
+  })
+}
+
+export function deleteMainTemplate(id,params){
+
+  return request({
+    url:"/api/hispatient/deletemaintemplate?id="+id,
+    method:"Get",
+    params:params
+  })
+}
+
+export function getUnRegisterHisPatientList (params) {
+  return request({
+    url: '/api/unregister/list',
+    method: 'get',
+    params:params,
+  })
+}

src/api/schedule.js

@@ -1,16 +1,18 @@
 import request from '@/utils/request'
 
-export function getWeekPanels(t) {
+export function getWeekPanels(t,patitionId) {
+  console.log("params33333",t,patitionId)
   return request({
-    url: '/api/schedule/weekpanel?data=' + t,
+    url: '/api/schedule/weekpanel?data=' + t+"&patitionid="+patitionId,
     method: 'get'
   })
 }
 
-export function getSchedules(week) {
+export function getSchedules(params) {
   return request({
-    url: '/api/schedule/schedules?weekTime=' + week,
-    method: 'get'
+    url: '/api/schedule/schedules',
+    method: 'get',
+    params:params,
   })
 }
 

src/store/modules/globalConfig.js

@@ -1796,7 +1796,32 @@ const global_config = {
     {
       id: 21,
       name: '人份'
-    }
+    },
+    {
+      id: 22,
+      name: 'kg'
+    },
+    {
+      id: 23,
+      name: 'g'
+    },
+    {
+      id: 24,
+      name: 'mg'
+    },
+    {
+      id: 25,
+      name: 'u'
+    },
+    {
+      id: 26,
+      name: 'ml'
+    },
+    {
+      id: 27,
+      name: '万u'
+    },
+   
     ],
     body_fluid: [{
       id: 1,

src/utils/tools.js

@@ -153,11 +153,7 @@ export function uParseTime(time, cFormat) {
 }
 
 export function calculateAnticoagulantZL(type, shouji, shichang, weichi) {
-  console.log('类型',type)
-  console.log('首剂', shouji)
-  console.log('时长', shichang)
-  console.log('维持', weichi)
-
+ 
   var t = 0.5
   if (type == 1) {
     t = 0.5

src/xt_pages/dialysis/components/allSummary.vue

@@ -438,7 +438,7 @@ export default {
 
               }
               }
-              console.log("list22222",this.list)
+              // console.log("list22222",this.list)
              }
           })
         },

src/xt_pages/dialysis/components/dialysisDrugs.vue

@@ -36,34 +36,273 @@
           </ul>
           </div>
         </div>
+
+        
         <div>
             <!-- <el-button size="small" icon="el-icon-printer" type="primary">打印</el-button> -->
             <el-button size="small" type="primary" @click="statistics">统计表</el-button>
         </div>
+      </div>
+        <div class="cell clearfix" style="justify-content: space-between;">
+        <div class="cell clearfix">
+          <label class="title"> <span class="name">给药途径</span> : </label>
+          <div class="time">
+            <ul class>
+              <li
+                :class="item.id == delivery_way ? 'active' : ''"
+                @click="selectDeliveryWay(item.id)"
+                v-for="item in deliveryWay"
+                :key="item.id"
+              >
+                {{ item.name }}
+              </li>
+            </ul>
+          </div>
+        </div>
       </div>
       <div>
-          <el-table
-            :data="tableData"
-            height="350"
-            border
-            style="width: 100%">
-            <el-table-column
-            align="center"
-            type="selection"
-            width="55">
-            </el-table-column>
-            <el-table-column
-            align="center"
-            prop="name"
-            label="姓名"
-            width="180">
-            </el-table-column>
-            <el-table-column
-            align="center"
-            prop="address"
-            label="地址">
-            </el-table-column>
-        </el-table>
+        <el-table :data="scheduleMap" border :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" 
+        @selection-change="handleSelectionChange"
+        :row-class-name="tableRowClassName"
+        :span-method="objectSpanMethod"
+        :cell-class-name="adviceNameShow"
+        :modal-append-to-body="false"
+        v-show="show">
+        <el-table-column type="selection" width="55" align="center"></el-table-column>
+        <el-table-column prop="date" label="姓名" align="center" min-width="26px">
+          <template slot-scope="scope">
+            <span>{{ scope.row.name }}</span>
+            <br>
+            ({{ scope.row.parent_id == 0 ? scope.row.dialysis_no : ""}})
+            <br>
+            <span v-if="scope.row.mode_id == 1">(HD)</span>
+            <span v-if="scope.row.mode_id == 2">(HDF)</span>
+            <span v-if="scope.row.mode_id == 3">(HD+HP)</span>
+            <span v-if="scope.row.mode_id == 4">(HP)</span>
+            <span v-if="scope.row.mode_id == 5">(HF)</span>
+            <span v-if="scope.row.mode_id == 6">(SCUF)</span>
+            <span v-if="scope.row.mode_id == 7">(IUF)</span>
+            <span v-if="scope.row.mode_id == 8">(HFHD)</span>
+            <span v-if="scope.row.mode_id == 9">(HFHD+HP)</span>
+            <span v-if="scope.row.mode_id == 10">(PHF)</span>
+            <span v-if="scope.row.mode_id == 11">(HFR)</span>
+            <span v-if="scope.row.mode_id == 12">(HDF+HP)</span>
+            <span v-if="scope.row.mode_id == 13">(CRRT)</span>
+            <span v-if="scope.row.mode_id == 14">(腹水回输)</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="date" label="透析器" align="center" min-width="26px">
+          <template slot-scope="scope">
+            <span>{{ scope.row.dialyzer_perfusion_apparatus }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="start_time" label="开始时间" align="center" min-width="35px">
+          <template slot-scope="scope">
+            <span>
+              {{scope.row.start_time | parseTime('{m}-{d} {h}:{i}')}}
+            </span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="advice_name" min-width="50px" label="医嘱内容" align="center">
+          <template slot-scope="scope">
+            <el-dropdown trigger="click" v-if="scope.row.parent_id == 0">
+              <span class="el-dropdown-link" v-if="scope.row.parent_id == 0">
+                {{ getAdviceContent(scope.row, 1)}}
+              </span>
+            </el-dropdown>
+
+            <el-dropdown trigger="click" v-if="scope.row.parent_id > 0">
+              <span class="el-dropdown-link">
+                &emsp;{{ getAdviceContent(scope.row, 2)}}
+              </span>
+            </el-dropdown>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="start_time"
+          align="center"
+          min-width="30px"
+          label="执行时间"
+          sortable
+        >
+          <template slot-scope="scope">
+            <span v-if="scope.row.execution_time != 0">
+              {{scope.row.start_time | parseTime('{m}-{d} {h}:{i}')}}
+            </span>
+            <span v-else></span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="execution_staff" align="center" min-width="30px" label="执行护士">
+          <template slot-scope="scope">
+            <span v-if="scope.row.parent_id == 0">
+              {{getXuserName(scope.row.execution_staff)}}
+            </span>
+            <span v-else></span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="checker" align="center" min-width="30px" label="校对护士">
+          <template slot-scope="scope">
+            <span v-if="scope.row.parent_id == 0">
+              {{getXuserName(scope.row.checker)}}
+            </span>
+            <span v-else></span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="check_time"
+          align="center"
+          min-width="30px"
+          label="校对时间"
+          sortable
+        >
+          <template slot-scope="scope">
+            <span v-if="scope.row.check_time != 0">
+              {{scope.row.check_time | parseTime('{m}-{d} {h}:{i}')}}
+            </span>
+            <span v-else></span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="date" label="开嘱医生" align="center" min-width="26px">
+          <template slot-scope="scope">
+            <span>{{ getXuserName(scope.row.advice_doctor) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="created_time"
+          align="center"
+          min-width="30px"
+          label="校对时间"
+          sortable
+        >
+          <template slot-scope="scope">
+            <span v-if="scope.row.created_time != 0">
+              {{scope.row.created_time | parseTime('{m}-{d} {h}:{i}')}}
+            </span>
+            <span v-else></span>
+          </template>
+        </el-table-column>
+      </el-table>
+         <el-table :data="scheduleMap" border :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" 
+        @selection-change="handleSelectionChange"
+        :row-class-name="tableRowClassName"
+        :span-method="objectSpanMethod"
+        :cell-class-name="adviceNameShow"
+        :modal-append-to-body="false"
+        v-show="showOne">
+        <el-table-column type="selection" width="55" align="center"></el-table-column>
+        <el-table-column prop="date" label="姓名" align="center" min-width="26px">
+          <template slot-scope="scope">
+            <span>{{ scope.row.name }}</span>
+            <br>
+            ({{ scope.row.parent_id == 0 ? scope.row.dialysis_no : ""}})
+            <br>
+            <span v-if="scope.row.mode_id == 1">(HD)</span>
+            <span v-if="scope.row.mode_id == 2">(HDF)</span>
+            <span v-if="scope.row.mode_id == 3">(HD+HP)</span>
+            <span v-if="scope.row.mode_id == 4">(HP)</span>
+            <span v-if="scope.row.mode_id == 5">(HF)</span>
+            <span v-if="scope.row.mode_id == 6">(SCUF)</span>
+            <span v-if="scope.row.mode_id == 7">(IUF)</span>
+            <span v-if="scope.row.mode_id == 8">(HFHD)</span>
+            <span v-if="scope.row.mode_id == 9">(HFHD+HP)</span>
+            <span v-if="scope.row.mode_id == 10">(PHF)</span>
+            <span v-if="scope.row.mode_id == 11">(HFR)</span>
+            <span v-if="scope.row.mode_id == 12">(HDF+HP)</span>
+            <span v-if="scope.row.mode_id == 13">(CRRT)</span>
+            <span v-if="scope.row.mode_id == 14">(腹水回输)</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="date" label="透析器" align="center" min-width="26px">
+          <template slot-scope="scope">
+            <span>{{ scope.row.dialyzer_perfusion_apparatus }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="start_time" label="开始时间" align="center" min-width="35px">
+          <template slot-scope="scope">
+            <span>
+              {{scope.row.start_time | parseTime('{m}-{d} {h}:{i}')}}
+            </span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="advice_name" min-width="50px" label="医嘱内容" align="center">
+          <template slot-scope="scope">
+            <el-dropdown trigger="click" v-if="scope.row.parent_id == 0">
+              <span class="el-dropdown-link" v-if="scope.row.parent_id == 0">
+                {{ getAdviceContent(scope.row, 1)}}
+              </span>
+            </el-dropdown>
+
+            <el-dropdown trigger="click" v-if="scope.row.parent_id > 0">
+              <span class="el-dropdown-link">
+                &emsp;{{ getAdviceContent(scope.row, 2)}}
+              </span>
+            </el-dropdown>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="start_time"
+          align="center"
+          min-width="30px"
+          label="执行时间"
+          sortable
+        >
+          <template slot-scope="scope">
+            <span v-if="scope.row.execution_time != 0">
+              {{scope.row.start_time | parseTime('{m}-{d} {h}:{i}')}}
+            </span>
+            <span v-else></span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="execution_staff" align="center" min-width="30px" label="执行护士">
+          <template slot-scope="scope">
+            <span v-if="scope.row.parent_id == 0">
+              {{getXuserName(scope.row.execution_staff)}}
+            </span>
+            <span v-else></span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="checker" align="center" min-width="30px" label="校对护士">
+          <template slot-scope="scope">
+            <span v-if="scope.row.parent_id == 0">
+              {{getXuserName(scope.row.checker)}}
+            </span>
+            <span v-else></span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="check_time"
+          align="center"
+          min-width="30px"
+          label="校对时间"
+          sortable
+        >
+          <template slot-scope="scope">
+            <span v-if="scope.row.check_time != 0">
+              {{scope.row.check_time | parseTime('{m}-{d} {h}:{i}')}}
+            </span>
+            <span v-else></span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="date" label="开嘱医生" align="center" min-width="26px">
+          <template slot-scope="scope">
+            <span>{{ getXuserName(scope.row.advice_doctor) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="created_time"
+          align="center"
+          min-width="30px"
+          label="校对时间"
+          sortable
+        >
+          <template slot-scope="scope">
+            <span v-if="scope.row.created_time != 0">
+              {{scope.row.created_time | parseTime('{m}-{d} {h}:{i}')}}
+            </span>
+            <span v-else></span>
+          </template>
+        </el-table-column>
+      </el-table>
       </div>
 
       <dialysis-drugs-dialog ref="dialysisDrugs"></dialysis-drugs-dialog>
@@ -72,7 +311,9 @@
 
 
 <script>
+const moment = require('moment')
 import { GetAllZone } from "@/api/dialysis";
+import { getSchedualDoctors } from '@/api/advice'
 import dialysisDrugsDialog from './dialysisDrugsDialog'
 export default {
     components:{
@@ -90,19 +331,34 @@ export default {
             selected_date:new Date(),
             partitionArr:[],
             partitionType: 0,
-            tableData: []
+            tableData: [],
+            deliveryWay:[],
+            deliver_way:0,
+            search_input:"",
+            show:true,
+            showOne:false,
+            deliveryWay:[],
+            delivery_way:0,
+            scheduleMap:[],
+            selecting_schs: [],
         }
     },
     created(){
         this.getAllZone()
-        
+        this.getlist()
     },
     methods:{
         selectSchedulType(scheduleType) {
-            this.schedulType = scheduleType;
+           this.schedulType = scheduleType;
+           this.getlist()
         },
         selectPartitionType(partitionType) {
-            this.partitionType = partitionType;
+          this.partitionType = partitionType;
+          this.getlist()
+        },
+        selectDeliveryWay(val){
+         this.delivery_way = val
+         this.getlist()
         },
         getAllZone: function() {
             GetAllZone().then(response => {
@@ -112,13 +368,298 @@ export default {
                 } else {
                 this.partitionArr = response.data.data.zone;
                 this.partitionArr.unshift({ id: 0, name: "全部" });
+                var dics  =  response.data.data.dics
+                var obj = {id:0,name:"全部"}
+                this.deliveryWay.push(obj)
+                this.deliveryWay.push(...dics)
                 }
             });
         },
         statistics(){
             this.$refs.dialysisDrugs.show();
+        },
+        getlist(){
+          var name = ""
+         for(let i=0;i<this.deliveryWay.length;i++){
+              if(this.delivery_way == this.deliveryWay[i].id){
+                name = this.deliveryWay[i].name
+              }
         }
-    }
+        if(name == '全部'){
+          name = ""
+        }
+
+        let newTime =  moment(this.selected_date).format('YYYY-MM-DD')
+        getSchedualDoctors({ date: newTime,patient_type: 0,advice_type: 2,delivery_way:name}).then(rs => {
+        var resp = rs.data
+        if (resp.state == 1) {
+            this.admin_users = resp.data.adminUser
+            var schedules = resp.data.scheduals
+            console.log("数据多少2223333333",schedules)
+            var config = resp.data.config
+           if(config.is_open == 0){
+            this.show = true
+            this.showOne = false
+            let arr = []
+            let newArr = []
+            let newSchedules = []
+            schedules.map(item => {
+             item.doctor_advice.map(it =>{
+                it.name = item.patient.name
+                    if(item.prescription != null){
+                       it.dialyzer_perfusion_apparatus = item.prescription.dialyzer_perfusion_apparatus
+                    }
+                    it.schedule_type = item.schedule_type
+                    it.zoneId = item.device_number.zone.id
+                    it.dialysis_no = item.patient.dialysis_no
+                    it.mode_id = item.mode_id
+                    arr.push(it)
+                })
+            })
+            if(this.schedulType == 0){
+                newSchedules = arr
+            }else{
+                arr.map(item => {
+                    if (item.schedule_type == this.schedulType) {
+                        newSchedules.push(item)
+                    }
+                })
+            }
+            
+            
+            if(this.partitionType == 0){
+                this.scheduleMap = newSchedules
+            }else {
+                let a = []
+                arr.map(item => {
+                    if(this.partitionType == item.zoneId){
+                        a.push(item)
+                    }
+                })
+                this.scheduleMap = a
+            }
+            this.scheduleMap.map(ele => {
+                let firstIndex = this.scheduleMap.findIndex(item => {
+                  return item.patient_id === ele.patient_id   // 当category相同的时候，返回第一个相同的Index 赋值给 firstIndex
+                })
+                if (this.scheduleMap.findIndex(item => { return item.patient_id === firstIndex}) === -1) {
+                    newArr.push({
+                    length: this.scheduleMap.filter(item => {
+                        return item.patient_id === ele.patient_id    //利用数组的filter方法，过滤出相同category的数组的长度。数组长度-即为跨多少行
+                    }).length,
+                    firstIndex: firstIndex    // firstIndex 返回的是第一个catergory就满足的第一个Index,即为rowIndex开始于第几行。
+                    })
+                }
+            })
+            this.indexInfoList = newArr
+           }
+           if(config.is_open == 1 || config.is_open == 2){
+             this.show = false
+             this.showOne  = true
+            var schedules =  resp.data.hisAdvices
+          
+            let arr = []
+            let newArr = []
+            let newSchedules = []
+            schedules.map(item => {
+             item.doctor_advice.map(it =>{
+                it.name = item.patient.name
+                    if(item.prescription != null){
+                       it.dialyzer_perfusion_apparatus = item.prescription.dialyzer_perfusion_apparatus
+                    }
+                    it.schedule_type = item.schedule_type
+                    it.zoneId = item.device_number.zone.id
+                    it.dialysis_no = item.patient.dialysis_no
+                    it.mode_id = item.mode_id
+                    arr.push(it)
+                })
+            })
+            if(this.schedulType == 0){
+                newSchedules = arr
+            }else{
+                arr.map(item => {
+                    if (item.schedule_type == this.schedulType) {
+                        newSchedules.push(item)
+                    }
+                })
+            }
+            
+            
+            if(this.partitionType == 0){
+                this.scheduleMap = newSchedules
+            }else {
+                let a = []
+                arr.map(item => {
+                    if(this.partitionType == item.zoneId){
+                        a.push(item)
+                    }
+                })
+                this.scheduleMap = a
+            }
+            this.scheduleMap.map(ele => {
+                let firstIndex = this.scheduleMap.findIndex(item => {
+                  return item.patient_id === ele.patient_id   // 当category相同的时候，返回第一个相同的Index 赋值给 firstIndex
+                })
+                if (this.scheduleMap.findIndex(item => { return item.patient_id === firstIndex}) === -1) {
+                    newArr.push({
+                    length: this.scheduleMap.filter(item => {
+                        return item.patient_id === ele.patient_id    //利用数组的filter方法，过滤出相同category的数组的长度。数组长度-即为跨多少行
+                    }).length,
+                    firstIndex: firstIndex    // firstIndex 返回的是第一个catergory就满足的第一个Index,即为rowIndex开始于第几行。
+                    })
+                }
+            })
+            this.indexInfoList = newArr
+            console.log("过年9999999999",this.scheduleMap)
+           }
+         
+  
+         }
+         })
+      },
+      searchAction(){
+
+      },
+      handleScheduleDateChange(){
+        
+      },
+     handleSelectionChange(val) {
+      this.selecting_schs = val;
+     },
+      adviceNameShow({ row, column, rowIndex, columnIndex }) {
+          if (columnIndex == 2) {
+            return 'dialysisadvicenamedisplay'
+          } else {
+            return ''
+          }
+      },
+      tableRowClassName({ row, rowIndex }) {
+     
+     },
+     objectSpanMethod({ row, column, rowIndex, columnIndex }) {
+        if (columnIndex === 0) {
+            let index = this.indexInfoList.findIndex(item => {  //遍历数组
+                return item.firstIndex === rowIndex
+            })
+            if (index > -1) {
+                return {
+                    rowspan: this.indexInfoList[index].length,
+                    colspan: 1
+                }
+            } else {
+                return {
+                    rowspan: 0,
+                    colspan: 0
+                }
+            }
+        }
+        
+        if (columnIndex === 1) {
+            let index = this.indexInfoList.findIndex(item => {  //遍历数组
+                return item.firstIndex === rowIndex
+            })
+            if (index > -1) {
+                return {
+                    rowspan: this.indexInfoList[index].length,
+                    colspan: 1
+                }
+            } else {
+                return {
+                    rowspan: 0,
+                    colspan: 0
+                }
+            }
+        }
+        if (columnIndex === 2) {
+            let index = this.indexInfoList.findIndex(item => {  //遍历数组
+                return item.firstIndex === rowIndex
+            })
+            if (index > -1) {
+                return {
+                    rowspan: this.indexInfoList[index].length,
+                    colspan: 1
+                }
+            } else {
+                return {
+                    rowspan: 0,
+                    colspan: 0
+                }
+            }
+        }
+     },
+     getAdviceContent(row, isChild) {
+        let tempSingleDoseDesc = ''
+        let tempDrugSpecDesc = ''
+        let tempPrescribingNumberDesc = ''
+
+        if (row.prescribing_number) {
+          tempPrescribingNumberDesc =
+            row.prescribing_number + '' + row.prescribing_number_unit
+        }
+
+        if (row.single_dose) {
+          if (this.template_id != 6) {
+            tempSingleDoseDesc =
+              ' 单次用量 ' + '  ' + row.single_dose + '' + row.single_dose_unit
+          } else {
+            tempSingleDoseDesc = row.single_dose + '' + row.single_dose_unit
+          }
+        }
+
+        if (row.advice_desc) {
+          tempDrugSpecDesc = '(' + row.advice_desc + row.drug_spec_unit + ')'
+        }
+
+        if (isChild == 1) {
+          // 不是子药
+
+          return (
+            row.advice_name +
+            tempDrugSpecDesc +
+            ' ' +
+            tempPrescribingNumberDesc +
+            tempSingleDoseDesc +
+            ' ' +
+            row.delivery_way +
+            ' ' +
+            row.execution_frequency
+          )
+        } else {
+          // 是子药
+          return (
+            row.advice_name +
+            tempDrugSpecDesc +
+            ' ' +
+            tempPrescribingNumberDesc +
+            tempSingleDoseDesc
+          )
+        }
+      },
+      getXuserName(id) {
+        if (id <= 0) {
+          return ''
+        }
+        var name = ''
+        if (
+          this.admin_users == null ||
+          typeof this.admin_users.length === 'undefined'
+        ) {
+          return name
+        }
+        var leng = this.admin_users.length
+        if (leng == 0) {
+          return name
+        }
+        for (let index = 0; index < leng; index++) {
+          if (this.admin_users[index].id == id) {
+            name = this.admin_users[index].name
+            break
+          }
+        }
+        return name
+      },
+    },
+   
 }
 </script>
 

src/xt_pages/dialysis/components/dialysisDrugsDialog.vue

@@ -10,65 +10,61 @@
         style="width:140px;margin-right:10px"
         v-model="startTime"
         type="date"
-        placeholder="选择日期">
+        placeholder="选择日期"
+        @change="changeStartTime">
         </el-date-picker>
         <el-date-picker
         style="width:140px;margin-right:10px"
         v-model="endTime"
         type="date"
-        placeholder="选择日期">
+        placeholder="选择日期"
+        @change="changeEndTime">
         </el-date-picker>
-        <el-select style="width:140px;margin-right:10px" v-model="schedulType" placeholder="请选择">
+        <el-select style="width:140px;margin-right:10px" v-model="delive_way" placeholder="请选择">
             <el-option
-            v-for="item in schedulArr"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value">
-            </el-option>
-        </el-select>
-        <el-select style="width:140px;margin-right:10px" v-model="partitionType" placeholder="请选择">
-            <el-option
-            v-for="item in partitionArr"
+            v-for="item in deliveryWay"
             :key="item.id"
             :label="item.name"
             :value="item.id">
             </el-option>
         </el-select>
-        <el-button icon="el-icon-printer" type="primary" @click="toPrint">打印</el-button>
+        <!-- <el-button icon="el-icon-printer" type="primary" @click="toPrint">打印</el-button> -->
         
     </div>
     <div style="margin-top:10px;">
         <el-table :data="tableData" border style="width: 100%" height="300">
-            <el-table-column
-            align="center"
-            prop="address"
-            label="地址">
+            <el-table-column align="center" prop="address" label="药品名称">
+              <template slot-scope="scope">
+                 {{scope.row.advice_name}}
+              </template>
+            </el-table-column>
+             <el-table-column align="center" prop="address" label="药品规格">
+               <template slot-scope="scope">
+                  {{scope.row.advice_desc}}
+               </template>
             </el-table-column>
-            <el-table-column
-            align="center"
-            prop="name"
-            label="姓名"
-            width="100">
+            <el-table-column align="center" prop="name" label="数量" width="100">
+                <template slot-scope="scope">
+                   {{scope.row.Total}}
+                </template>
             </el-table-column>
         </el-table>
     </div>
-    <!-- <div slot="footer" class="dialog-footer">
-      <el-button @click="hide">取 消</el-button>
-      <el-button type="primary" @click="submitAction()">保 存</el-button>
-    </div> -->
   </el-dialog>
 </template>
 
 
 
 <script>
+const moment = require('moment')
 import { GetAllZone } from "@/api/dialysis";
+import { getDoctorAdviceCount } from "@/api/advice"
 export default {
     data(){
         return{
             visible: false,
-            startTime:'',
-            endTime:'',
+            startTime:new Date(),
+            endTime:new Date(),
             schedulArr: [
                 {value: 0, label: '全部班'},
                 {value: 1, label: '上午'},
@@ -78,27 +74,14 @@ export default {
             schedulType: 0,
             partitionArr:[],
             partitionType: 0,
-            tableData: [{
-                date: '2016-05-02',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1518 弄'
-                }, {
-                date: '2016-05-04',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1517 弄'
-                }, {
-                date: '2016-05-01',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1519 弄'
-                }, {
-                date: '2016-05-03',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1516 弄'
-            }]
+            deliveryWay:[],
+            tableData: [],
+            delive_way:""
         }
     },
     created(){
         this.getAllZone()
+        this.getlist()
     },
     methods:{
         _close: function(done) {
@@ -115,6 +98,10 @@ export default {
                 } else {
                 this.partitionArr = response.data.data.zone;
                 this.partitionArr.unshift({ id: 0, name: "全部分区" });
+                var dics  =  response.data.data.dics
+                var obj = {id:0,name:"全部"}
+                this.deliveryWay.push(obj)
+                this.deliveryWay.push(...dics)
                 }
             });
         },
@@ -123,7 +110,35 @@ export default {
                 path: '/dialysis/dialysisDrugs_print',
                 // query: { date: date }
             })
-        }
+        },
+       getlist(){
+
+           let newTimeStart =  moment(this.startTime).format('YYYY-MM-DD')
+           let newTimeEnd = moment(this.endTime).format('YYYY-MM-DD')
+           var params = {
+              start_time:newTimeStart,
+              end_time:newTimeEnd,
+              delive_way:this.delive_way,
+           }
+         
+         getDoctorAdviceCount(params).then(response=>{
+            if(response.data.state == 1){
+              var list =  response.data.data.list
+              console.log("list",list)
+              this.tableData = list
+            }
+         })  
+       },
+      changeStartTime(val){
+       var start =  moment(val).format('YYYY-MM-DD')
+       this.startTime = start
+       this.getlist()
+      },
+      changeEndTime(val){
+       var end = moment(val).format('YYYY-MM-DD')
+       this.endTime = end
+       this.getlist()
+      }
     }
 }
 </script>

src/xt_pages/dialysis/consumableDrugs.vue

@@ -8,9 +8,9 @@
                 <el-tab-pane label="透析耗材" name="1">
                     <consumables></consumables>
                 </el-tab-pane>
-                <!-- <el-tab-pane label="透析药品" name="second">
+                <el-tab-pane label="透析药品" name="second">
                     <dialysis-drugs></dialysis-drugs>
-                </el-tab-pane> -->
+                </el-tab-pane>
                 <el-tab-pane label="透析参数" name="2">
                     <dialysis-parameters></dialysis-parameters>
                 </el-tab-pane>

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -161,15 +161,15 @@
           }}</span>
         </li>
 
-        <li v-if="isShow('血流量')">
-          <label>血流量 : </label>
-          <span class="content">{{
-            blood_flow_volume != "0" ? blood_flow_volume : ""
-          }}</span>
-          <span class="unit">{{
-            blood_flow_volume != "0" ? "ml/min" : ""
-          }}</span>
-        </li>
+<!--        <li v-if="isShow('血流量')">-->
+<!--          <label>血流量 : </label>-->
+<!--          <span class="content">{{-->
+<!--            blood_flow_volume != "0" ? blood_flow_volume : ""-->
+<!--          }}</span>-->
+<!--          <span class="unit">{{-->
+<!--            blood_flow_volume != "0" ? "ml/min" : ""-->
+<!--          }}</span>-->
+<!--        </li>-->
       </ul>
 
       <ul>

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

@@ -1307,6 +1307,24 @@
         this.InnerDialogProps.visibility = true
         switch (val) {
           case '5': // 透析器/灌流器
+            // var arr = this.dialysisPrescription.dialyzer_perfusion_apparatus
+            // console.log("arr333333",arr)
+            // var newArr =  arr.split(",")
+            // console.log("透析器/灌流器",newArr)
+            // var Arr = []
+            // for(let i=0;i<newArr.length;i++){
+            //   for(let j=0;j<this.dialyzerPerfusionApparatus.length;j++){
+            //      var newarr = newArr[i].toUpperCase()
+
+            //      var dialy = this.dialyzerPerfusionApparatus[j].name.toUpperCase()
+
+            //      if(newarr == dialy){
+            //         Arr.push(this.dialyzerPerfusionApparatus[j].name)
+            //      }
+            //   }
+            // }
+            // var arrtwo = Arr.join(",")
+            // console.log("Arr",arrtwo)
             //  var arr = this.dialysisPrescription.dialyzer_perfusion_apparatus
             //  var newArr =  arr.split(",")
             // console.log("透析器/灌流器",newArr)
@@ -1327,6 +1345,9 @@
             this.InnerDialogProps.values = this.dialyzerPerfusionApparatus
             this.InnerDialogProps.titles = '透析器/灌流器'
             this.InnerDialogProps.type = 'dialyzer_perfusion_apparatus'
+
+
+            this.InnerDialogProps.selected = this.dialysisPrescription.dialyzer_perfusion_apparatus
             this.InnerDialogProps.selected = this.dialysisPrescription.dialyzer_perfusion_apparatus
             this.InnerDialogProps.isShowTextArea = false
             break
@@ -3312,6 +3333,8 @@
         if (isNaN(this.dialysisPrescription.anticoagulant_zongliang)) {
           this.dialysisPrescription.anticoagulant_zongliang = ''
         }
+        console.log("首季",this.dialysisPrescription.anticoagulant_zongliang)
+
 
 
       },

src/xt_pages/dialysis/details/dialog/monitor_dialog.vue

@@ -964,7 +964,10 @@ export default {
       }
 
       getTodayMonitor(params).then(rs => {
+        console.log("机构ID",this.org_id)
+        
         var resp = rs.data.data
+       
         this.form.operate_time = resp.monitor.operate_time ? (resp.monitor.operate_time + 3600) * 1000 : Date.parse(new Date())
         this.form.temperature = '' // this.last_monitor_record.pulse_frequency;
 
@@ -973,11 +976,21 @@ export default {
         this.form.systolic_bp = '' // this.last_monitor_record.systolic_blood_pressure;
         this.form.diastolic_bp = '' // this.last_monitor_record.diastolic_blood_pressure;
         this.form.blood_flow_volume = resp.monitor.blood_flow_volume ? resp.monitor.blood_flow_volume : ''
-        this.form.venous_pressure = '' // this.last_monitor_record.venous_pressure;
+        // 静脉压
+        if(this.org_id == 10060){
+          this.form.venous_pressure = resp.monitor.venous_pressure
+        }else{
+          this.form.venous_pressure = '' // this.last_monitor_record.venous_pressure;
+        }
+        
         this.form.venous_pressure_type = resp.monitor.venous_pressure_type ? resp.monitor.venous_pressure_type : 1
         this.form.arterial_pressure = resp.monitor.arterial_pressure ? resp.monitor.arterial_pressure : '' // this.last_monitor_record.arterial_pressure;
         this.form.arterial_pressure_type = resp.monitor.arterial_pressure_type ? resp.monitor.arterial_pressure_type : 1
-        this.form.transmembrane_pressure = '' // this.last_monitor_record.transmembrane_pressure;
+        if(this.org_id == 10060){
+          this.form.transmembrane_pressure = resp.monitor.transmembrane_pressure;
+        }else{
+          this.form.transmembrane_pressure = '' // this.last_monitor_record.transmembrane_pressure;
+        }
         this.form.transmembrane_pressure_type = resp.monitor.transmembrane_pressure_type ? resp.monitor.transmembrane_pressure_type : 1
         this.form.ultrafiltration_rate = resp.monitor.ultrafiltration_rate ? resp.monitor.ultrafiltration_rate : ''
         this.form.ultrafiltration_volume = resp.monitor.ultrafiltration_volume ? resp.monitor.ultrafiltration_volume : ''
@@ -1103,6 +1116,7 @@ export default {
     },
 
     submitAction: function() {
+      
       // TODO loading
       var is_new = this.form.id
       this.form.operate_time = parseInt(this.form.operate_time / 1000)

src/xt_pages/dialysis/dialysisDoctorAdvice.vue

@@ -425,7 +425,7 @@ export default {
     },
 
     selectSchedulType(scheduleType) {
-      // alert(scheduleType);/
+     
       this.schedulType = scheduleType;
       this.listQuery.schedul_type = scheduleType;
       this.requestSchedualDoctors(this.time);

src/xt_pages/dialysis/template/DialysisPrintOrderThirtyFour.vue

@@ -284,6 +284,7 @@
                         <td width="60" style="height:20px;line-height:20px">超滤量<br />ml</td>
                         <td width="60" style="height:20px;line-height:20px">透析液温度</td>
                         <td width="60" style="height:20px;line-height:20px">电导度<br />ms/cm</td>
+                        <td width="60" style="height:20px;line-height:20px">体温<br />C°</td>
                         <td width="">病情变化及处理</td>
                         <td width="60" style="height:20px;line-height:20px">签名</td>
                     </tr>
@@ -303,6 +304,7 @@
                         <td>&nbsp;{{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "" }}</td>
                         <td>&nbsp;{{monitor.dialysate_temperature ? monitor.dialysate_temperature : ''}}</td>
                         <td>&nbsp;{{ monitor.conductivity ? monitor.conductivity : "" }}</td>
+                        <td>&nbsp;{{ monitor.temperature ? monitor.temperature : "" }}</td>
                         <td style="text-align:left;padding-left:10px;">
                             <div style="line-height:20px;text-align: left;display: inline-block;">
                                 &nbsp;{{ monitor.symptom }}{{ monitor.dispose }}{{ monitor.result }}
@@ -422,10 +424,10 @@
         <div class="row" style="padding: 2px 0;line-height:30px; display:flex;">
             <div class="inline_block">
                 医生签字
-                <div class="under_line" style="width: 70px;text-align: center">
+                <!-- <div class="under_line" style="width: 70px;text-align: center">
                     <span v-if="setAdminUserES(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:'')) == ''"> {{ getAdminUser(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:'')) }} </span>
                     <img style="height:30px;" :src="setAdminUserES(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:''))" alt="" srcset="" v-else />
-                </div>
+                </div> -->
             </div>
         </div>
       </div>

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyFour.vue

@@ -597,7 +597,7 @@
                         <tr>
                             <td width='70'>抗凝方式</td>
                             <td width='100'>
-                                <label-box :isChecked="prescription.anticoagulant == 6 ? true:false" showValue="低分子肝素"></label-box>
+                                <label-box :isChecked="prescription.anticoagulant == 3 ? true : prescription.anticoagulant == 6 ? true : prescription.anticoagulant == 7 ? true : false" showValue="低分子肝素"></label-box>
                             </td>
                             <td width='100'>
                                 <div class="under-line">
@@ -608,14 +608,14 @@
                             <td width='40'>首剂</td>
                             <td width='50'>
                                 <div class="under-line">
-                                    &nbsp;<span v-if="prescription.anticoagulant == 6">{{ prescription.anticoagulant_shouji }}</span>
+                                    &nbsp;<span v-if="prescription.anticoagulant == 3 || prescription.anticoagulant == 6 || prescription.anticoagulant == 7">{{ prescription.anticoagulant_shouji }}</span>
                                 </div>
                             </td>
                             <td width='10'>IU</td>
                             <td width='40'>追加</td>
                             <td width='50'>
                                 <div class="under-line">
-                                    &nbsp;<span v-if="prescription.anticoagulant == 6">{{ prescription.anticoagulant_weichi }}</span>
+                                    &nbsp;<span v-if="prescription.anticoagulant == 3 || prescription.anticoagulant == 6 || prescription.anticoagulant == 7">{{ prescription.anticoagulant_weichi }}</span>
                                 </div>
                             </td>
                             <td width='20'>IU/h</td>
@@ -626,7 +626,7 @@
                             <td width='40'>其他</td>
                             <td width='100'>
                                 <div class="under-line">&nbsp;
-                                    <span v-if="prescription.anticoagulant != 1 && prescription.anticoagulant != 2 && prescription.anticoagulant != 3 && prescription.anticoagulant != 6">
+                                    <span v-if="prescription.anticoagulant != 1 && prescription.anticoagulant != 2 && prescription.anticoagulant != 3 && prescription.anticoagulant != 6 && prescription.anticoagulant != 7">
                                         {{ prescription.anticoagulant_name }}
                                     </span>
                                 </div>
@@ -906,7 +906,7 @@
             <td>
               &nbsp;{{ monitor.transmembrane_pressure ? monitor.transmembrane_pressure : "" }}
             </td>
-            <td>&nbsp;{{ monitor.ultrafiltration_rate ? monitor.ultrafiltration_rate : "" }}</td>
+            <td>&nbsp;<span v-if="getTime(monitor.operate_time, '{h}:{i}')">{{ monitor.ultrafiltration_rate ? monitor.ultrafiltration_rate : "0" }}</span></td>
             <td>&nbsp;{{ monitor.sodium_concentration ? monitor.sodium_concentration : "" }}</td>
             <td>&nbsp;{{ monitor.conductivity ? monitor.conductivity : "" }}</td>
 

src/xt_pages/medicalScheduling/index.vue

@@ -7,7 +7,7 @@
                 <el-button type="primary" @click="DeleteStaffSchedule">清除</el-button>
                 <el-button type="primary" @click="copyStaffSchedule">复制</el-button>
                 <el-button type="primary" icon="el-icon-printer" @click="toPrint">打印</el-button>
-                <!-- <el-button type="primary" icon="el-icon-printer" @click="toPrint">导出</el-button> -->
+                <el-button type="primary" icon="el-icon-printer" @click="exportList">导出</el-button>
             </div>
         </div>
         <div class="app-container">
@@ -319,19 +319,26 @@
         </div>
 
 
-        <el-dialog
+        <!-- <el-dialog
             title="导出排班"
             :visible.sync="exportDialogVisible"
-            width="30%"
-            :before-close="handleClose">
+            width="30%">
             <span>
-
+             <div class="block">
+               <span class="demonstration">月份：</span>
+               <el-date-picker
+                v-model="value1"
+                type="week"
+                format="yyyy 第 WW 周"
+                placeholder="选择周">
+             </el-date-picker>
+             </div>
             </span>
             <span slot="footer" class="dialog-footer">
                 <el-button @click="dialogVisible = false">取 消</el-button>
-                <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+                <el-button type="primary" @click="exportList">确 定</el-button>
             </span>
-        </el-dialog>    
+        </el-dialog>     -->
     </div>
 </template>
 
@@ -402,7 +409,8 @@ export default {
            radio:'1',
            nurseTableData:[],
            doctorTableData:[],
-           exportDialogVisible:false
+           exportDialogVisible:false,
+           month_time:""
         }
     },
     methods:{
@@ -944,9 +952,10 @@ export default {
                     data.push(...newNurse)
                     data.push(...newDoctor)
                     data.push(obj)
+                    
                     this.tableData = data
 
-
+                   console.log("表哥3333333333",this.tableData)
                 }
             })
         },
@@ -1911,7 +1920,48 @@ export default {
               this.getDoctorList()
             }
          })
-       }
+       },
+
+       toExport(){
+         this.exportDialogVisible = true
+
+       },
+
+     getTimestamp(time) { //把时间日期转成时间戳
+          return (new Date(time)).getTime() / 1000
+       },
+       exportList(){
+         import('@/vendor/Export2Excel').then(excel => {
+         for(let i=0;i<this.tableData.length;i++){
+           this.tableData[i].monday  = this.getClass(this.tableData[i].user_name,1)
+           this.tableData[i].tuesday  = this.getClass(this.tableData[i].user_name,2)
+           this.tableData[i].wednesday = this.getClass(this.tableData[i].user_name,3)
+           this.tableData[i].thursday = this.getClass(this.tableData[i].user_name,4)
+           this.tableData[i].friday = this.getClass(this.tableData[i].user_name,5)
+           this.tableData[i].saturday = this.getClass(this.tableData[i].user_name,6)
+           this.tableData[i].weekday = this.getClass(this.tableData[i].user_name,0)
+         }
+         console.log("this.table",this.tableData)
+         const tHeader = ['医护姓名', '周一'+"("+this.weekDayArr[0]+")" ,  '周二'+"("+this.weekDayArr[1]+")", '周三'+"("+this.weekDayArr[2]+")" , '周四'+"("+this.weekDayArr[3]+")" ,  '周五'+"("+this.weekDayArr[4]+")" ,  '周六'+"("+this.weekDayArr[5]+")",'周日'+"("+this.weekDayArr[6]+")"]
+         const filterVal = ['user_name', 'monday', 'tuesday','wednesday','thursday','friday','saturday','weekday'] 
+         
+         const data = this.formatJson(filterVal,this.tableData)
+         console.log("data",data)
+       
+         excel.export_json_to_excel({
+           header: tHeader,
+           data,
+           filename: '医护排班'
+         })
+          this.downloadLoading = false
+    
+        })
+       },
+       formatJson(filterVal, jsonData) {
+        return jsonData.map(v => filterVal.map(j => v[j]))
+       },
+    
+    
     },
     created(){
         //获取医护人员
@@ -1949,8 +1999,8 @@ export default {
         }
       var now = moment().locale('zh-cn').format('YYYY-MM-DD 00:00:00')
       this.timeNow = this.getTimestamp(now)
-
-
+     
+   
     }
 }
 </script>

src/xt_pages/outpatientCharges/components/chargeMonthPrescriptionTable.vue

@@ -0,0 +1,208 @@
+<template>
+  <div class="prescriptionTable">
+    <el-table v-if="prescription.type == 1" :data="prescription.advices" border style="width: 99%;"
+              :row-style="{ color: '#303133' }"
+              :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
+      <el-table-column align="center" type="index" width="40" label="序号"></el-table-column>
+      <el-table-column align="center" prop="name" label="名称">
+        <template slot-scope="scope"><span :title='scope.row.drug_name'>{{ scope.row.drug_name }}</span></template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="name" width="90" label="单次用量">
+        <template slot-scope="scope">
+          <!--<el-input v-model="scope.row.single_dose" readonly style="width:65%;"></el-input>-->
+          <div>{{scope.row.single_dose}}&nbsp;&nbsp;{{scope.row.single_dose_unit}}</div>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" width="100" label="用法">
+        <template slot-scope="scope">
+          <!--<el-input v-model="scope.row.delivery_way" readonly></el-input>-->
+          <div> {{scope.row.delivery_way}}</div>
+
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" width="100" label="频率">
+        <template slot-scope="scope">
+          <div> {{scope.row.execution_frequency}}</div>
+
+          <!--<el-input v-model="scope.row.execution_frequency" readonly></el-input>-->
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="day" width="50" label="天数">
+        <template slot-scope="scope">{{scope.row.day}}天</template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="name" width="100" label="总量">
+        <template slot-scope="scope">
+          <!--<el-input v-model="scope.row.prescribing_number" style="width:60%" readonly placeholder=""></el-input>-->
+          <div>{{scope.row.prescribing_number}}&nbsp;&nbsp;{{scope.row.prescribing_number_unit}}</div>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" width="60" label="单价">
+        <template slot-scope="scope">
+          <div> {{scope.row.retail_price}}元</div>
+
+          <!--<el-input v-model="scope.row.retail_price" placeholder="" readonly></el-input>-->
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" width="50" label="备注">
+        <template slot-scope="scope">
+          <!--<el-input v-model="scope.row.remark" :title="scope.row.remark" placeholder="" readonly></el-input>-->
+          <div> {{scope.row.remark}}</div>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-table v-if="prescription.type == 2" :data="prescription.project" border style="width: 99%;"
+              :row-style="{ color: '#303133' }"
+              :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
+      <el-table-column align="center" type="index" width="40" label="序号"></el-table-column>
+      <el-table-column align="center" prop="project_name" label="名称">
+        <template slot-scope="scope">{{ scope.row.project_name }}</template>
+      </el-table-column>
+      <el-table-column align="center" prop="statistical_classification" width="100" label="组">
+        <template slot-scope="scope">{{getGroup(scope.row.statistical_classification)}}</template>
+      </el-table-column>
+      <el-table-column align="center" prop="single_dose" width="80" label="单次用量">
+        <template slot-scope="scope">{{scope.row.single_dose}}{{scope.row.unit}}</template>
+
+      </el-table-column>
+      <el-table-column align="center" prop="delivery_way" width="80" label="用法">
+        <template slot-scope="scope">
+          <!--<el-input v-model="scope.row.delivery_way" placeholder="" readonly></el-input>-->
+          {{scope.row.delivery_way}}
+
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="execution_frequency" width="80" label="频率">
+        <template slot-scope="scope">
+          <!--<el-input v-model="scope.row.execution_frequency" placeholder="" readonly></el-input>-->
+          {{scope.row.execution_frequency}}
+
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="number_days" width="50" label="天数">
+        <template slot-scope="scope">
+          <!--<el-input v-model="scope.row.number_days" placeholder="" readonly></el-input>-->
+          {{scope.row.number_days}}天
+
+        </template>
+
+      </el-table-column>
+      <el-table-column align="center" prop="total" width="50" label="总量">
+        <template slot-scope="scope">
+          <div style="display:flex;">
+            <!--<el-input v-model="scope.row.total" placeholder="" readonly></el-input>-->
+            {{scope.row.total}}
+
+            <div>{{scope.row.unit}}</div>
+
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" width="50" label="单价">
+        <template slot-scope="scope">
+          <!--<el-input v-model="scope.row.price" placeholder="" readonly></el-input>-->
+          {{scope.row.price}}元
+
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" width="50" label="备注">
+        <template slot-scope="scope">
+          <!--<el-input v-model="scope.row.remark" readonly></el-input>-->
+          {{scope.row.remark}}
+
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <div class="additionalBox">
+      <div class="additionalOne" v-for="(item,index) in prescription.addition" :key="index">
+        <span :title="item.item_name">{{item.item_name}}</span>
+        <el-input v-model="item.price" placeholder="" style="width:50px;" readonly></el-input>
+        共
+        <el-input v-model="item.count" placeholder="" style="width:50px;" readonly></el-input>
+        次
+        <!--<i class="el-icon-delete deleteIcon" @click="delAddition(index,item)"></i>-->
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import { getInitData } from '@/api/his/his'
+  import { getDictionaryDataConfig} from "@/utils/data";
+
+  export default {
+    props: {
+      prescription: Object
+    },
+    data() {
+      return {
+        drugways: [],
+        efs: []
+      }
+    }, mounted() {
+      getInitData().then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg)
+          return false
+        } else {
+          this.drugways = response.data.data.drugways
+          this.efs = response.data.data.efs
+        }
+      })
+    }, methods:  {
+
+
+      getGroup(id){
+        var name = ""
+        var statistics_category =  getDictionaryDataConfig('system','statistics_category')
+        console.log("2235",statistics_category)
+        for(let i=0;i<statistics_category.length;i++){
+          if(id == statistics_category[i].id){
+            name = statistics_category[i].name
+          }
+        }
+        return name
+      },
+
+
+    }
+  }
+</script>
+
+<style lang="scss">
+  .prescriptionTable{
+  .additionalBox{
+    margin-top: 20px;
+    display: flex;
+    flex-wrap: wrap;
+  .additionalOne{
+    margin-right:20px;
+    margin-bottom:10px;
+    display: flex;
+    align-items: center;
+  >span{
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    width:80px;
+    display: inline-block;
+    font-size: 14px;
+  }
+  }
+  .deleteIcon{
+    color:red;
+    margin-left:5px;
+  }
+  }
+  .el-table th .cell, .el-table td .cell{
+    padding: 0 2px;
+    white-space: pre-line;
+  }
+  .el-icon-delete{
+    color:red;
+  }
+  }
+</style>

src/xt_pages/outpatientCharges/components/dayPrescriptionTable.vue

@@ -0,0 +1,425 @@
+<template>
+  <div class="prescriptionTable">
+    <el-table v-if="activeType  == 1" :data="prescription.advices" border style="width: 99%;" :row-style="{ color: '#303133' }"
+              :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
+      <el-table-column align="center" type="index" width="40" label="序号"></el-table-column>
+      <el-table-column align="center" prop="drug_name" label="名称">
+        <template slot-scope="scope"><span :title="scope.row.drug_name">{{ scope.row.drug_name }}</span></template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="single_dose" width="90" label="单次用量">
+        <template slot-scope="scope">
+          <div style="display:flex;align-items:center;">
+            <el-input v-model="scope.row.single_dose" style="width:65%;"></el-input>
+            <div>{{scope.row.single_dose_unit}}</div>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="delivery_way" width="100" label="用法">
+        <template slot-scope="scope">
+          <el-select v-model="scope.row.delivery_way" placeholder="请选择">
+            <el-option
+              v-for="(item,index) in drugways"
+              :key="index"
+              :label="item.name"
+              :value="item.name">
+            </el-option>
+          </el-select>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="execution_frequency" width="100" label="频率">
+        <template slot-scope="scope">
+          <el-select v-model="scope.row.execution_frequency" placehold er="请选择">
+            <el-option
+              v-for="item,index in efs"
+              :key="index"
+              :label="item.name"
+              :value="item.name">
+            </el-option>
+          </el-select>
+        </template>
+      </el-table-column>
+
+
+      <el-table-column align="center" prop="day" width="50" label="天数">
+        <template slot-scope="scope">
+          <el-input v-model="scope.row.day" placeholder=""></el-input>
+          <div>{{'天'}}</div>
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="prescribing_number" width="80" label="总量">
+        <template slot-scope="scope">
+          <div style="display:flex;align-items:center;">
+            <el-input v-model="scope.row.prescribing_number" style="width:60%" placeholder=""></el-input>
+            <div> {{scope.row.prescribing_number_unit}}</div>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="retail_price" width="60" label="单价">
+        <template slot-scope="scope">
+          <el-input v-model="scope.row.retail_price" placeholder="" readonly></el-input>
+          <div>{{'元'}}</div>
+
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="remark" width="50" label="备注">
+        <template slot-scope="scope">
+          <el-input v-model="scope.row.remark" :title="scope.row.remark" placeholder=""></el-input>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" width="40" prop="name" label="操作">
+        <template slot-scope="scope">
+          <i class="el-icon-delete" @click="deleteDrug(scope.$index, scope.row)"></i>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <el-table v-if="activeType == 2" :data="prescription.project" border style="width: 99%;" :row-style="{ color: '#303133' }"
+              :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
+      <el-table-column align="center" type="index" width="40" label="序号"></el-table-column>
+      <el-table-column align="center" prop="project_name" label="名称">
+        <template slot-scope="scope"><span :title="scope.row.project_name">{{ scope.row.project_name }}</span></template>
+      </el-table-column>
+      <el-table-column align="center" prop="statistical_classification" width="100" label="组">
+        <template slot-scope="scope">{{getGroup(scope.row.statistical_classification)}}</template>
+      </el-table-column>
+      <el-table-column align="center" prop="single_dose" width="80" label="单次用量">
+        <template slot-scope="scope">
+          <el-input v-model="scope.row.single_dose" placeholder=""></el-input>
+          <div>{{scope.row.unit}}</div>
+
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="delivery_way" width="80" label="用法">
+        <template slot-scope="scope">
+          <el-autocomplete
+            style="width:100%;"
+            class="inline-input"
+            v-model="scope.row.delivery_way"
+            :fetch-suggestions="querySearch2"
+            placeholder="请输入内容"
+          ></el-autocomplete>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="execution_frequency" width="80" label="频率">
+        <template slot-scope="scope">
+          <el-input v-model="scope.row.execution_frequency" placeholder=""></el-input>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="number_days" width="50" label="天数">
+        <template slot-scope="scope">
+          <el-input v-model="scope.row.number_days" placeholder=""></el-input>
+          <div>{{'天'}}</div>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="total" width="70" label="总量">
+        <template slot-scope="scope">
+          <div style="display:flex;align-items:center;">
+            <el-input v-model="scope.row.total" style="width:60%" placeholder=""></el-input>
+            <div>{{scope.row.unit}}</div>
+
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" width="50" label="单价">
+        <template slot-scope="scope">
+          <el-input v-model="scope.row.price" placeholder="" readonly></el-input>
+          <div>{{'元'}}</div>
+
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" width="50" label="备注">
+        <template slot-scope="scope">
+          <el-input v-model="scope.row.remark" :title="scope.row.remark"></el-input>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" width="40" prop="name" label="操作">
+        <template slot-scope="scope">
+          <i class="el-icon-delete" @click="deleteProject(scope.row,scope.$index)"></i>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <div class="additionalBox">
+      <div class="additionalOne" v-for="(item,index) in prescription.addition" :key="index">
+        <span :title="item.item_name">{{item.item_name}}</span>
+        <el-input v-model="item.price" placeholder="" style="width:50px;"></el-input>
+        共
+        <el-input v-model="item.count" placeholder="" style="width:50px;"></el-input>
+        次
+        <i class="el-icon-delete deleteIcon" @click="delAddition(index,item)"></i>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import { getDictionaryDataConfig} from "@/utils/data";
+  import { getInitData,delHisAdvice,delHisProject,delHisAddition } from '@/api/his/his'
+
+  export default {
+    props: {
+      preDrugs: Array,
+      activeType: Number,
+      addtions_charge:Array,
+      prescription:{
+        type:Object,
+        default: function () {
+          return {
+            name:"",
+            advices:[],
+            project:[],
+            drugways:[],
+            efs:[],
+          };
+        }
+      },
+    },
+    data() {
+      return {
+        advices:[],
+        tableData: [],
+        newoptions: [{
+          value: '1',
+          label: '1'
+        }, {
+          value: '2',
+          label: '2'
+        }, {
+          value: '3',
+          label: '3'
+        }, {
+          value: '4',
+          label: '4'
+        }, {
+          value: '5',
+          label: '5'
+        }],
+        value: '1',
+        input: 1,
+      }
+    },
+    methods:{
+      createFilter(queryString) {
+        return (restaurant) => {
+          return (restaurant.name.toLowerCase().indexOf(queryString.toLowerCase()) === 0)
+        }
+      },
+      querySearch2(queryString, cb) {
+        var restaurants = this.getDictionaryDataConfig("system","project_use")
+        restaurants.map(item => {
+          item.value = item.name
+        })
+        var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants
+        // 调用 callback 返回建议列表的数据
+        cb(results)
+      },
+      delAddition(index, addition){
+        if(this.prescription.order_status == 2){
+          this.$message.error('该处方已经结算，无法删除')
+          return
+        }
+        this.$confirm("附加费删除后不可恢复，是否确认删除", "删除", {
+          confirmButtonText: "确 定",
+          cancelButtonText: "取 消",
+          type: "warning"
+        }).then(() => {
+          this.$nextTick(function(){
+            if(addition.id == 0){
+              this.prescription.addition.splice(index, 1)
+            }else{
+              let params = {
+                'id': addition.id,
+              }
+              delHisAddition(params).then(response => {
+                if (response.data.state == 0) {
+                  this.$message.error(response.data.msg)
+                  return false
+                } else {
+                  var temp2 = this.deepClone(this.prescription.addition)
+                  temp2.splice(index, 1)
+                  this.prescription.addition = temp2
+                  this.$message.success(response.data.data.msg)
+                }
+              })
+            }
+          });
+
+        })
+          .catch(() => {});
+
+      },
+      getInitData(){
+        getInitData().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.drugways = response.data.data.drugways
+            this.efs = response.data.data.efs
+          }
+        })
+
+      },deleteDrug:function(index, row){
+        if(this.prescription.order_status == 2){
+          this.$message.error('该处方已经结算，无法删除')
+          return
+        }
+        this.$confirm("药品删除后不可恢复，是否确认删除", "删除", {
+          confirmButtonText: "确 定",
+          cancelButtonText: "取 消",
+          type: "warning"
+        }).then(() => {
+          this.$nextTick(function(){
+            if(row.advice_id == 0){
+              this.prescription.advices.splice(index, 1)
+            }else{
+              let params = {
+                'id': row.advice_id,
+              }
+              delHisAdvice(params).then(response => {
+                if (response.data.state == 0) {
+                  this.$message.error(response.data.msg)
+                  return false
+                } else {
+                  var temp2 = this.deepClone(this.prescription.advices)
+                  temp2.splice(index, 1)
+                  this.prescription.advices = temp2
+                  this.$message.success(response.data.data.msg)
+                }
+              })
+
+
+            }
+
+          });
+
+
+        })
+          .catch(() => {});
+
+
+
+
+
+      },deepClone(source) {
+        if (!source && typeof source !== 'object') {
+          throw new Error('error arguments', 'shallowClone')
+        }
+        const targetObj = source.constructor === Array ? [] : {}
+        Object.keys(source).forEach((keys) => {
+          if (source[keys] && typeof source[keys] === 'object') {
+            targetObj[keys] = this.deepClone(source[keys])
+          } else {
+            targetObj[keys] = source[keys]
+          }
+        })
+        return targetObj
+      },
+
+      setNewData:function(data){
+        this.prescription = data
+
+        // this.prescription.advices = data.advices
+      },
+      getDictionaryDataConfig(module, filed_name) {
+        return getDictionaryDataConfig(module, filed_name)
+      },
+      getGroup(id){
+        var name = ""
+        var statistics_category =  getDictionaryDataConfig('system','statistics_category')
+        console.log("2235",statistics_category)
+        for(let i=0;i<statistics_category.length;i++){
+          if(id == statistics_category[i].id){
+            name = statistics_category[i].name
+          }
+        }
+        return name
+      },
+      deleteProject(row,i){
+        if(this.prescription.order_status == 2){
+          this.$message.error('该处方已经结算，无法删除')
+          return
+        }
+        this.$confirm("项目删除后不可恢复，是否确认删除", "删除", {
+          confirmButtonText: "确 定",
+          cancelButtonText: "取 消",
+          type: "warning"
+        }).then(() => {
+          if(row.id == 0){
+            this.prescription.project.splice(i, 1)
+
+          }else{
+            let params = {
+              'id': row.id,
+            }
+            delHisProject(params).then(response => {
+              if (response.data.state == 0) {
+                this.$message.error(response.data.msg)
+                return false
+              } else {
+                for (let i = 0; i < this.prescription.project.length; i++){
+                  if(this.prescription.project[i].id == row.id){
+                    this.prescription.project.splice(i, 1)
+                  }
+                }
+                this.$message.success(response.data.data.msg)
+              }
+            })
+          }
+        })
+          .catch(() => {});
+
+      },
+    },mounted(){
+      this.getInitData()
+    },
+  }
+</script>
+
+<style lang="scss">
+  .prescriptionTable {
+
+  .el-input__inner {
+    padding: 0 5px;
+  }
+
+  .additionalBox {
+    margin-top: 20px;
+    display: flex;
+    flex-wrap: wrap;
+
+  .additionalOne {
+    margin-right: 20px;
+    margin-bottom: 10px;
+    display: flex;
+    align-items: center;
+
+  > span {
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    width: 80px;
+    display: inline-block;
+    font-size: 14px;
+  }
+
+  .deleteIcon {
+    color: red;
+    margin-left: 5px;
+  }
+
+  }
+  .el-table th .cell, .el-table td .cell {
+    padding: 0 2px;
+    white-space: pre-line;
+  }
+
+  .el-icon-delete {
+    color: red;
+  }
+
+  }
+  }
+</style>

src/xt_pages/outpatientCharges/components/monthPrescriptionTable.vue

@@ -0,0 +1,297 @@
+<template>
+  <div class="prescriptionTable">
+    <el-table v-if="activeType  == 1" :data="prescription.advices" border style="width: 99%;" :row-style="{ color: '#303133' }"
+              :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
+      <el-table-column align="center" type="index" width="40" label="序号"></el-table-column>
+      <el-table-column align="center" prop="drug_name" label="名称">
+        <template slot-scope="scope"><span :title="scope.row.drug_name">{{ scope.row.drug_name }}</span></template>
+      </el-table-column>
+      <el-table-column align="center" prop="single_dose" width="90" label="单次用量">
+        <template slot-scope="scope">
+          <div style="display:flex;align-items:center;">
+            <el-input v-model="scope.row.single_dose" style="width:65%;"></el-input>
+            <div>{{scope.row.single_dose_unit}}</div>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="delivery_way" width="100" label="用法">
+        <template slot-scope="scope">
+          <el-select v-model="scope.row.delivery_way" placeholder="请选择">
+            <el-option
+              readonly
+              v-for="(item,index) in drugways"
+              :key="index"
+              :label="item.name"
+              :value="item.name">
+            </el-option>
+          </el-select>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="execution_frequency" width="100" label="频率">
+        <template slot-scope="scope">
+          <el-select v-model="scope.row.execution_frequency" placehold er="请选择">
+            <el-option
+              readonly
+              v-for="item,index in efs"
+              :key="index"
+              :label="item.name"
+              :value="item.name">
+            </el-option>
+          </el-select>
+        </template>
+      </el-table-column>
+
+
+      <el-table-column align="center" prop="day" width="50" label="天数">
+        <template slot-scope="scope">
+          <el-input v-model="scope.row.day" placeholder="" readonly></el-input>
+          <div>{{'天'}}</div>
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="prescribing_number" width="80" label="总量">
+        <template slot-scope="scope">
+          <div style="display:flex;align-items:center;">
+            <el-input v-model="scope.row.prescribing_number" style="width:60%" placeholder="" readonly></el-input>
+            <div> {{scope.row.prescribing_number_unit}}</div>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="retail_price" width="60" label="单价">
+        <template slot-scope="scope">
+          <el-input v-model="scope.row.retail_price" placeholder="" readonly></el-input>
+          <div>{{'元'}}</div>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="remark" width="50" label="备注">
+        <template slot-scope="scope">
+          <el-input v-model="scope.row.remark" :title="scope.row.remark" placeholder="" readonly></el-input>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <el-table v-if="activeType == 2" :data="prescription.project" border style="width: 99%;" :row-style="{ color: '#303133' }"
+              :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
+      <el-table-column align="center" type="index" width="40" label="序号"></el-table-column>
+      <el-table-column align="center" prop="project_name" label="名称">
+        <template slot-scope="scope"><span :title="scope.row.project_name">{{ scope.row.project_name }}</span></template>
+      </el-table-column>
+      <el-table-column align="center" prop="statistical_classification" width="100" label="组">
+        <template slot-scope="scope">{{getGroup(scope.row.statistical_classification)}}</template>
+      </el-table-column>
+      <el-table-column align="center" prop="single_dose" width="80" label="单次用量">
+        <template slot-scope="scope">
+          <el-input v-model="scope.row.single_dose" placeholder="" readonly></el-input>
+          <div>{{scope.row.unit}}</div>
+
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="delivery_way" width="80" label="用法">
+        <template slot-scope="scope">
+          <el-autocomplete
+            readonly
+            style="width:100%;"
+            class="inline-input"
+            v-model="scope.row.delivery_way"
+            :fetch-suggestions="querySearch2"
+            placeholder="请输入内容"
+          ></el-autocomplete>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="execution_frequency" width="80" label="频率">
+        <template slot-scope="scope">
+          <el-input v-model="scope.row.execution_frequency" placeholder="" readonly></el-input>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="number_days" width="50" label="天数">
+        <template slot-scope="scope">
+          <el-input v-model="scope.row.number_days" placeholder="" readonly></el-input>
+          <div>{{'天'}}</div>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="total" width="70" label="总量">
+        <template slot-scope="scope">
+          <div style="display:flex;align-items:center;">
+            <el-input v-model="scope.row.total" style="width:60%" placeholder="" readonly></el-input>
+            <div>{{scope.row.unit}}</div>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" width="50" label="单价">
+        <template slot-scope="scope">
+          <el-input v-model="scope.row.price" placeholder="" readonly></el-input>
+          <div>{{'元'}}</div>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" width="50" label="备注">
+        <template slot-scope="scope">
+          <el-input v-model="scope.row.remark" :title="scope.row.remark" readonly></el-input>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="additionalBox">
+      <div class="additionalOne" v-for="(item,index) in prescription.addition" :key="index">
+        <span :title="item.item_name">{{item.item_name}}</span>
+        <el-input v-model="item.price" placeholder="" style="width:50px;"></el-input>
+        共
+        <el-input v-model="item.count" placeholder="" style="width:50px;"></el-input>
+        次
+        <i class="el-icon-delete deleteIcon" @click="delAddition(index,item)"></i>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import { getDictionaryDataConfig} from "@/utils/data";
+  import { getInitData,delHisAdvice,delHisProject,delHisAddition } from '@/api/his/his'
+
+  export default {
+    props: {
+      preDrugs: Array,
+      activeType: Number,
+      addtions_charge:Array,
+      prescription:{
+        type:Object,
+        default: function () {
+          return {
+            name:"",
+            advices:[],
+            project:[],
+            drugways:[],
+            efs:[],
+          };
+        }
+      },
+    },
+    data() {
+      return {
+        advices:[],
+        tableData: [],
+        newoptions: [{
+          value: '1',
+          label: '1'
+        }, {
+          value: '2',
+          label: '2'
+        }, {
+          value: '3',
+          label: '3'
+        }, {
+          value: '4',
+          label: '4'
+        }, {
+          value: '5',
+          label: '5'
+        }],
+        value: '1',
+        input: 1,
+      }
+    },
+    methods:{
+      createFilter(queryString) {
+        return (restaurant) => {
+          return (restaurant.name.toLowerCase().indexOf(queryString.toLowerCase()) === 0)
+        }
+      },
+      querySearch2(queryString, cb) {
+        var restaurants = this.getDictionaryDataConfig("system","project_use")
+        restaurants.map(item => {
+          item.value = item.name
+        })
+        var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants
+        // 调用 callback 返回建议列表的数据
+        cb(results)
+      },
+      getInitData(){
+        getInitData().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.drugways = response.data.data.drugways
+            this.efs = response.data.data.efs
+          }
+        })
+      },
+      deepClone(source) {
+        if (!source && typeof source !== 'object') {
+          throw new Error('error arguments', 'shallowClone')
+        }
+        const targetObj = source.constructor === Array ? [] : {}
+        Object.keys(source).forEach((keys) => {
+          if (source[keys] && typeof source[keys] === 'object') {
+            targetObj[keys] = this.deepClone(source[keys])
+          } else {
+            targetObj[keys] = source[keys]
+          }
+        })
+        return targetObj
+      },
+      setNewData:function(data){
+        this.prescription = data
+      },
+      getDictionaryDataConfig(module, filed_name) {
+        return getDictionaryDataConfig(module, filed_name)
+      },
+      getGroup(id){
+        var name = ""
+        var statistics_category =  getDictionaryDataConfig('system','statistics_category')
+        for(let i=0;i<statistics_category.length;i++){
+          if(id == statistics_category[i].id){
+            name = statistics_category[i].name
+          }
+        }
+        return name
+      },
+    },mounted(){
+      this.getInitData()
+    },
+  }
+</script>
+
+<style lang="scss">
+  .prescriptionTable {
+
+  .el-input__inner {
+    padding: 0 5px;
+  }
+
+  .additionalBox {
+    margin-top: 20px;
+    display: flex;
+    flex-wrap: wrap;
+
+  .additionalOne {
+    margin-right: 20px;
+    margin-bottom: 10px;
+    display: flex;
+    align-items: center;
+
+  > span {
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    width: 80px;
+    display: inline-block;
+    font-size: 14px;
+  }
+
+  .deleteIcon {
+    color: red;
+    margin-left: 5px;
+  }
+
+  }
+  .el-table th .cell, .el-table td .cell {
+    padding: 0 2px;
+    white-space: pre-line;
+  }
+
+  .el-icon-delete {
+    color: red;
+  }
+
+  }
+  }
+</style>

src/xt_pages/outpatientCharges/components/registerDialog.vue

@@ -1,10 +1,25 @@
 <template>
-  <el-dialog width="854px" class="registerDialog" :title="titles" :visible.sync="visibility" :close-on-click-modal="isClose"
+  <el-dialog width="854px" class="registerDialog" :title="titles" :visible.sync="visibility"
+             :close-on-click-modal="isClose"
              :close-on-press-escape="isClose">
 
-    <el-form :model="form"  :rules="rules"  ref="formValue"  label-width="100px">
-      <el-form-item label="患者姓名："  prop="name" :validate-event="is_Name">
-         <el-input  v-model="form.name" :disabled="true"></el-input>
+    <el-form :model="form" :rules="rules" ref="formValue" label-width="100px">
+      <el-form-item label="患者姓名：" prop="name" :validate-event="is_Name">
+        <el-autocomplete
+          class="checkSearch"
+          popper-class="my-autocomplete"
+          v-model="form.name"
+          :fetch-suggestions="querySearchAsync"
+          :trigger-on-focus="false"
+          placeholder="请输入病人名字"
+          @select="handleSelect"
+          style="width:160px;"
+        >
+          <i class="el-icon-search el-input__icon" slot="suffix"></i>
+          <template slot-scope="{ item }">
+            <div class="name">{{ item.name }}</div>
+          </template>
+        </el-autocomplete>
       </el-form-item>
 
       <el-form-item label="性别：" prop="gender" :validate-event="is_Name">
@@ -16,6 +31,8 @@
             :value="item.value">
           </el-option>
         </el-select>
+
+
       </el-form-item>
 
       <el-form-item label="年龄：" prop="age" :validate-event="is_Name">
@@ -24,7 +41,8 @@
 
 
       <el-form-item label="出生日期：" prop="birthday" :validate-event="is_Name">
-        <el-date-picker v-model="form.birthday" type="date" @change="getBirthday" placeholder="选择日期" style="width:100%;"></el-date-picker>
+        <el-date-picker v-model="form.birthday" type="date" format="yyyy-MM-dd"
+                        value-format="yyyy-MM-dd" placeholder="选择日期" style="width:100%;"></el-date-picker>
       </el-form-item>
 
       <el-form-item label="手机号码：" prop="phone">
@@ -44,8 +62,8 @@
       </el-form-item>
 
 
-      <el-form-item label="证件类型：">
-        <el-select v-model="form.certificates" placeholder="请选择"  style="width:100%;">
+      <el-form-item label="证件类型：" prop="certificates" :validate-event="is_Name">
+        <el-select v-model="form.certificates" placeholder="请选择" style="width:100%;">
           <el-option
             v-for="item in certificates"
             :key="item.value"
@@ -55,10 +73,43 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="证件号码：" prop="id_card"  :validate-event="is_Name">
+      <el-form-item label="证件号码：" prop="id_card" :validate-event="is_Name">
         <el-input v-model="form.id_card"></el-input>
       </el-form-item>
 
+      <el-form-item label="处方类型：" prop="p_type" :validate-event="is_Name">
+        <el-select style="margin-right:5px;width:100px;" v-model="form.p_type" placeholder=""
+                   >
+          <el-option
+            v-for="(item,index) in registers"
+            :key="index"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="大病类别：" prop="sick_type" :validate-event="is_Name">
+        <el-select style="margin-right:5px;width:100px;" v-model="form.sick_type" placeholder="">
+          <el-option
+            v-for="(item,index) in sick"
+            :key="index"
+            :label="item.class_name"
+            :value="item.id">
+          </el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="诊断：" prop="diagnosis" :validate-event="is_Name">
+        <el-select style="margin-right:5px;width:100px;" v-model="form.diagnosis" placeholder="">
+          <el-option
+            v-for="(item,index) in diagnoses"
+            :key="index"
+            :label="item.class_name"
+            :value="item.id">
+          </el-option>
+        </el-select>
+      </el-form-item>
+
 
       <el-form-item label="结算类型：">
         <el-select v-model="form.settlement_value" placeholder="请选择" style="width:100%;">
@@ -82,14 +133,30 @@
           </el-option>
         </el-select>
       </el-form-item>
+
+
+      <el-form-item label="读卡类型：" prop="id_card_type" :validate-event="is_Name">
+        <el-select v-model="form.id_card_type" placeholder="请选择">
+          <el-option
+            v-for="item in IDCardTypes"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
+
+
       <el-form-item class="specialFormItem" label="医保卡号：">
         <div style="display:flex;">
           <el-input v-model="form.medical_insurance_card"></el-input>
+          <el-button style="margin-left:10px;" type="primary" @click="reading">读卡</el-button>
+
         </div>
       </el-form-item>
 
-      <el-form-item label="挂号类型："  prop="register_type"  :validate-event="is_Name">
-        <el-select v-model="form.register_type"  placeholder="请选择" style="width:100%;">
+      <el-form-item label="挂号类型：" prop="register" :validate-event="is_Name">
+        <el-select v-model="form.register" placeholder="请选择" style="width:100%;">
           <el-option
             v-for="item in register"
             :key="item.value"
@@ -107,49 +174,79 @@
     </el-form>
 
     <span slot="footer" class="dialog-footer">
-    <el-button  @click="cancel('formValue')">取 消</el-button>
-    <el-button  type="primary" @click="confirm('formValue')">挂 号</el-button>
+    <el-button @click="cancel('formValue')">取 消</el-button>
+    <el-button type="primary" @click="confirm('formValue')">挂 号</el-button>
   </span>
   </el-dialog>
 
 </template>
 
 <script>
-  import { getDictionaryDataConfig } from '@/utils/data'
+  import {uParseTime} from "@/utils/tools";
+  import axios from 'axios'
+  import {PostSearch} from '@/api/patient'
+
+  import {getDictionaryDataConfig} from '@/utils/data'
+
   export default {
+
     name: 'registerDialog',
 
     data() {
 
       return {
-        form:{
+        registers: [
+          {value: 11, label: "普通门诊"},
+          {value: 12, label: '门诊挂号'},
+          {value: 13, label: "急诊"},
+          {value: 14, label: "门诊特殊病"},
+          {value: 15, label: "门诊统筹"},
+          {value: 16, label: "门诊慢性病"},
+          {value: 21, label: "普通住院"},
+
+        ],
+        form: {
+          id: '',
           settlement_value: '',
-          medical_insurance_card:'',
-          name:'',
-          gender:'',
-          certificates:'',
-          medical_care:'',
-          birthday:'',
-          age:'',
-          id_card:'',
-          register:'',
-          doctor:'',
-          department:'',
-          registration_fee:'',
-          medical_expenses:'',
-          cost:'',
-          phone:'',
-          social_type:'',
-        },
+          medical_insurance_card: '',
+          name: '',
+          gender: '',
+          certificates: 1,
+          p_type:'',
+          sick_type:'',
+          diagnosis:'',
+          medical_care: '',
+          birthday: '',
+          age: '',
+          id_card: '',
+          register: '',
+          doctor: '',
+          id_card_type: 1,
+          department: '',
+          registration_fee: '',
+          medical_expenses: '',
+          cost: '',
+          phone: '',
+          social_type: '',
+        }, IDCardTypes: [{
+          value: 1,
+          label: '社保卡'
+        }, {
+          value: 2,
+          label: "身份证"
+        }, {
+          value: 3,
+          label: "电子凭证"
+        },],
         settlement: [
-            {value: 1,label: '医保'},
-            {value: 2,label: '自费'},
-            {value: 3,label:'公费'},
-            {value: 4,label:'农保'},
-            {value: 5,label:'会员'},
-            {value: 6,label:'职工'},
-            {value: 7,label:'合同'}
-          ],
+          {value: 1, label: '医保'},
+          {value: 2, label: '自费'},
+          {value: 3, label: '公费'},
+          {value: 4, label: '农保'},
+          {value: 5, label: '会员'},
+          {value: 6, label: '职工'},
+          {value: 7, label: '合同'}
+        ],
         sex: [{
           value: 1,
           label: '男'
@@ -163,16 +260,16 @@
         }, {
           value: 2,
           label: "社保卡"
-        },{
+        }, {
           value: 3,
           label: "护照"
-        },{
+        }, {
           value: 4,
           label: "军官证"
-        },{
+        }, {
           value: 5,
           label: "台胞证"
-        },{
+        }, {
           value: 6,
           label: "港澳地区身份证"
         }],
@@ -182,16 +279,16 @@
         }, {
           value: 2,
           label: "公务员医疗补助"
-        },{
+        }, {
           value: 3,
           label: "大额医疗费用补助"
-        },{
+        }, {
           value: 4,
           label: "离休人员医疗"
-        },{
+        }, {
           value: 5,
           label: "城乡居民基本医疗保险"
-        },{
+        }, {
           value: 6,
           label: "城乡居民大病医疗保险"
         },
@@ -205,25 +302,32 @@
         }, {
           value: 2,
           label: "主治"
-        },{
+        }, {
           value: 3,
           label: "主任"
-        },{
+        }, {
           value: 4,
           label: "免收诊金"
-        },{
+        }, {
           value: 5,
           label: "专家"
         }],
         rules: {
-          name:[{ required:true,message:"患者姓名不能为空",trigger: 'blur'}],
-          gender:[{ required:true,message:"患者性别不能为空",trigger: 'blur'}],
-          id_card: [{ required: true, message: '证件号码不能为空', trigger: 'blur'  }],
-          register_type: [{ required: true, message: '请选择挂号类型' , trigger: 'blur' }],
-          doctor: [{ required: true, message: '请选择医生' , trigger: 'blur' }],
-          department: [{ required: true, message: '请填写科室', trigger: 'blur' }],
-          age:[{ required:true,message:"患者年龄不能为空",trigger: 'blur'}],
-          birthday:[{required:true,message:"患者出生日期不能为空",trigger:'blur'}]
+          name: [{required: true, message: "患者姓名不能为空", trigger: 'blur'}],
+          gender: [{required: true, message: "患者性别不能为空", trigger: 'blur'}],
+          id_card: [{required: true, message: '证件号码不能为空', trigger: 'blur'}],
+          register: [{required: true, message: '请选择挂号类型', trigger: 'blur'}],
+          doctor: [{required: true, message: '请选择医生', trigger: 'blur'}],
+          department: [{required: true, message: '请填写科室', trigger: 'blur'}],
+          age: [{required: true, message: "患者年龄不能为空", trigger: 'blur'}],
+          birthday: [{required: true, message: "患者出生日期不能为空", trigger: 'blur'}],
+          certificates: [{required: true, message: "证件类型不能为空", trigger: 'change'}],
+          id_card_type: [{required: true, message: "读卡类型不能为空", trigger: 'change'}],
+
+          p_type: [{required: true, message: "处方类型不能为空", trigger: 'change'}],
+          sick_type: [{required: true, message: "大病类别不能为空", trigger: 'change'}],
+          diagnosis: [{required: true, message: "诊断不能为空", trigger: 'change'}],
+
         },
 
         visibility: false,
@@ -232,22 +336,23 @@
 
         resetForm: {
           settlement_value: '',
-          medical_insurance_card:'',
-          name:'',
-          gender:'',
-          certificates:'',
-          medical_care:'',
-          birthday:'',
-          age:'',
-          id_card:'',
-          register:'',
-          doctor:'',
-          department:'',
-          registration_fee:'',
-          medical_expenses:'',
-          cost:'',
-          phone:'',
-          social_type:'',
+          medical_insurance_card: '',
+          name: '',
+          gender: '',
+          certificates: '',
+          id_card_type: '',
+          medical_care: '',
+          birthday: '',
+          age: '',
+          id_card: '',
+          register: '',
+          doctor: '',
+          department: '',
+          registration_fee: '',
+          medical_expenses: '',
+          cost: '',
+          phone: '',
+          social_type: '',
         },
 
       }
@@ -270,34 +375,108 @@
         type: Number,
         default: 1
 
-      }
+      },
+      sick: Array,
+      diagnoses: Array,
     },
     methods: {
+      handleSelect(val) {
+        this.form.id = val.id
+        this.form.name = val.name
+        this.form.gender = val.gender
+        this.form.age = val.age
+        this.form.birthday = uParseTime(val.birthday, '{y}-{m}-{d}')
+        this.form.phone = val.phone
+        this.form.id_card = val.id_card_no
+      },
+      querySearchAsync(keyword, cb) {
+        let key = ''
+        if (keyword != undefined) {
+          key = keyword
+        }
+        let searchArray = []
+        PostSearch(key).then(response => {
+          if (response.data.state == 1) {
+            searchArray = response.data.data.patient
+            cb(searchArray)
+          } else {
+            cb([])
+          }
+        })
+      },
+      reading(medicalInsuranceCard) {
+        var that = this
+        if (this.form.id_card_type.length == 0 || this.form.id_card_type == 0) {
+          this.$message.error("请先选择读卡类型")
+          return
+        }
+        let params = {
+          'id_card_type': this.form.id_card_type,
+        }
+        axios.get('http://127.0.0.1:9532/api/sscard', {
+          params: params
+        })
+          .then(function (response) {
+            if (response.data.state == 0) {
+              that.$message.error(response.data.msg)
+              return false
+            } else {
+              var patient = response.data.data.patient
+
+              if (that.form.id_card_type == 1) {
+                this.form.id = patient.id
+                that.form.name = patient.name
+                that.form.sex = patient.gender
+                that.form.age = patient.age
+                that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}')
+                that.form.phone = patient.phone
+                that.form.idCard = patient.id_card_no
+                that.form.medicalInsuranceCard = response.data.data.number
+
+              } else if (that.form.id_card_type == 2) {
+                this.form.id = patient.id
+                that.form.name = patient.name
+                that.form.sex = patient.gender
+                that.form.age = patient.age
+                that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}')
+                that.form.phone = patient.phone
+                that.form.idCard = patient.id_card_no
+              }
+              that.$message({message: '读卡成功', type: 'success'})
+            }
+          })
+          .catch(function (error) {
+
+          });
+
+
+      },
       getDictionaryDataConfig(module, filed_name) {
         return getDictionaryDataConfig(module, filed_name)
       },
-      show: function(patientInfo) {
-        this.form.name = patientInfo.name
-        this.form.gender = patientInfo.gender
-        this.form.age = patientInfo.age
-        this.form.birthday = patientInfo.birthday
-        this.form.phone = patientInfo.phone
-        this.form.birthday = patientInfo.birthday
-        this.form.id_card = patientInfo.id_card_no
-        this.form.social_type = patientInfo.health_care_type
-        if( this.form.social_type == 0){
-          this.form.social_type = ""
-
-        }
+      show: function () {
+        // this.form.name = patientInfo.name
+        // this.form.gender = patientInfo.gender
+        // this.form.age = patientInfo.age
+        // this.form.birthday = patientInfo.birthday
+        // this.form.phone = patientInfo.phone
+        // this.form.birthday = patientInfo.birthday
+        // this.form.id_card = patientInfo.id_card_no
+        // this.form.social_type = patientInfo.health_care_type
+        // this.form.id_card_type = 1
+        // if( this.form.social_type == 0){
+        //   this.form.social_type = ""
+        //
+        // }
         this.visibility = true
 
-      }, hide: function() {
+      }, hide: function () {
         this.visibility = false
-      }, cancel: function(formName) {
+      }, cancel: function (formName) {
         this.$emit('cancel', this.getValue())
         this.$refs['formValue'].resetFields()
       },
-      confirm: function(formName) {
+      confirm: function (formName) {
         this.$refs['formValue'].validate((valid) => {
           if (valid) {
             let value = {}
@@ -307,7 +486,7 @@
           }
         })
       },
-      getValue: function() {
+      getValue: function () {
         let form = {}
         form = this.form
         return form
@@ -318,13 +497,16 @@
 </script>
 
 <style lang="scss" scoped>
-.registerDialog{
-  .el-form{
+  .registerDialog {
+
+  .el-form {
     display: flex;
     flex-wrap: wrap;
   }
-  .el-form-item{
-    width:50%;
+
+  .el-form-item {
+    width: 50%;
+  }
+
   }
-}
 </style>

src/xt_pages/outpatientCharges/statementTemplate/printOne.vue

@@ -186,9 +186,9 @@
             </tr>
             <tr>
                 <td>合计</td>
-                <td colspan="2" style="text-align:right;padding-right:10px;">{{(info.bed_cost_total + info.operation_cost_total + info.other_cost_total + info.material_cost_total + info.western_medicine_cost_total + info.chinese_traditional_medicine_cost_total + info.check_cost_total + info.laboratory_cost_total + info.treat_cost_total) * 100 /100 }}</td>
-                <td style="text-align:right;padding-right:10px;">{{(info.bed_cost_self_total + info.operation_cost_self_total + info.other_cost_self_total + info.material_cost_self_total + info.western_medicine_cost_self_total + info.chinese_traditional_medicine_cost_self_total + info.check_cost_self_total + info.laboratory_cost_self_total + info.treat_cost_self_total)*100/100}}</td>
-                <td colspan="2" style="text-align:right;padding-right:10px;">{{(info.bed_cost_part_self_total + info.operation_cost_part_self_total + info.other_cost_part_self_total + info.material_cost_part_self_total + info.western_medicine_cost_part_self_total + info.chinese_traditional_medicine_cost_part_self_total + info.check_cost_part_self_total + info.laboratory_cost_part_self_total + info.treat_cost_part_self_total)*100/100}}</td>
+                <td colspan="2" style="text-align:right;padding-right:10px;">{{(parseFloat(info.bed_cost_total) + parseFloat(info.operation_cost_total) + parseFloat(info.other_cost_total) + parseFloat(info.material_cost_total) + parseFloat(info.western_medicine_cost_total) + parseFloat(info.chinese_traditional_medicine_cost_total) + parseFloat(info.check_cost_total) + parseFloat(info.laboratory_cost_total) + parseFloat(info.treat_cost_total)).toFixed(2) }}</td>
+                <td style="text-align:right;padding-right:10px;">{{(parseFloat(info.bed_cost_self_total )+ parseFloat(info.operation_cost_self_total) + parseFloat(info.other_cost_self_total) + parseFloat(info.material_cost_self_total) + parseFloat(info.western_medicine_cost_self_total) + parseFloat(info.chinese_traditional_medicine_cost_self_total) + parseFloat(info.check_cost_self_total) + parseFloat(info.laboratory_cost_self_total) + parseFloat(info.treat_cost_self_total)).toFixed(2)}}</td>
+                <td colspan="2" style="text-align:right;padding-right:10px;">{{(parseFloat(info.bed_cost_part_self_total) + parseFloat(info.operation_cost_part_self_total) + parseFloat(info.other_cost_part_self_total) + parseFloat(info.material_cost_part_self_total) + parseFloat(info.western_medicine_cost_part_self_total) + parseFloat(info.chinese_traditional_medicine_cost_part_self_total) + parseFloat(info.check_cost_part_self_total) + parseFloat(info.laboratory_cost_part_self_total) + parseFloat(info.treat_cost_part_self_total)).toFixed(2)}}</td>
                 <td style="text-align:right;padding-right:10px;"></td>
                 <td colspan="2" style="text-align:right;padding-right:10px;"></td>
                 <td style="text-align:right;padding-right:10px;"></td>

src/xt_pages/outpatientCharges/summary.vue

@@ -67,13 +67,13 @@
           <template slot-scope="scope">{{scope.row.reality_price}}</template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="科室">
-          <template slot-scope="scope">{{scope.row.p_info.department.name}}</template>
+          <template slot-scope="scope">{{scope.row.department_name}}</template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="收费日期">
           <template slot-scope="scope">  {{getTimes(scope.row.settle_accounts_date)}}</template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="收费员">
-          <template slot-scope="scope">{{ scope.row.p_info.doctor }}</template>
+          <template slot-scope="scope">{{ scope.row.doctor_name }}</template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="状态">
           <template slot-scope="scope">

src/xt_pages/outpatientDoctorStation/components/callPrescription.vue

@@ -14,7 +14,6 @@
       :editable="false"
       style="width: 150px;"
       type="date"
-      :picker-options="pickerOptions"
       placeholder="选择日期时间"
       align="right"
       format="yyyy-MM-dd"
@@ -26,7 +25,6 @@
       prefix-icon="el-icon-date"
       @change="changeEndTime"
       :editable="false"
-      :picker-options="pickerOptions"
       style="width: 150px;"
       type="date"
       placeholder="选择日期时间"

src/xt_pages/outpatientRegistration/index.vue

@@ -7,18 +7,37 @@
       <div class="nameTitle">患者基本信息:</div>
       <div class="formMain">
         <el-form class="basicForm" :model="form" :rules="rules" ref="form" label-width="100px">
+          <!--<el-form-item label="患者姓名：" prop="name" :validate-event="is_Name">-->
+          <!--&lt;!&ndash; <el-input  v-model="form.name"></el-input> &ndash;&gt;-->
+          <!--<el-select v-model="form.name" placeholder="请选择" @change="changeName">-->
+          <!--<el-option-->
+          <!--v-for="item,index in patient"-->
+          <!--:key="index"-->
+          <!--:label="item.name"-->
+          <!--:value="item.id">-->
+          <!--</el-option>-->
+          <!--</el-select>-->
+          <!--</el-form-item>-->
+
           <el-form-item label="患者姓名：" prop="name" :validate-event="is_Name">
-            <!-- <el-input  v-model="form.name"></el-input> -->
-            <el-select v-model="form.name" placeholder="请选择" @change="changeName">
-              <el-option
-                v-for="item in patient"
-                :key="item.patient_id"
-                :label="item.name"
-                :value="item.patient_id">
-              </el-option>
-            </el-select>
+            <el-autocomplete
+              class="checkSearch"
+              popper-class="my-autocomplete"
+              v-model="form.name"
+              :fetch-suggestions="querySearchAsync"
+              :trigger-on-focus="false"
+              placeholder="请输入病人名字"
+              @select="handleSelect"
+              style="width:160px;"
+            >
+              <i class="el-icon-search el-input__icon" slot="suffix"></i>
+              <template slot-scope="{ item }">
+                <div class="name">{{ item.name }}</div>
+              </template>
+            </el-autocomplete>
           </el-form-item>
 
+
           <el-form-item label="性别：" prop="sex" :validate-event="is_Name">
             <el-select v-model="form.sex" placeholder="请选择">
               <el-option
@@ -45,25 +64,7 @@
           </el-form-item>
 
 
-          <el-form-item label="医疗类别：">
-            <el-select v-model="form.medicalCare" placeholder="请选择">
-              <!-- <el-option
-              v-for="item in medicalCare"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value">
-              </el-option> -->
-              <el-option
-                v-for="(item,index) in getDictionaryDataConfig('system','social_type')"
-                :key="index"
-                :label="item.name"
-                :value="item.id">
-              </el-option>
-            </el-select>
-          </el-form-item>
-
-
-          <el-form-item label="证件类型：">
+          <el-form-item label="证件类型：" prop="certificates" :validate-event="is_Name">
             <el-select v-model="form.certificates" placeholder="请选择">
               <el-option
                 v-for="item in certificates"
@@ -109,7 +110,7 @@
           </el-form-item>
 
 
-          <el-form-item label="读卡类型：">
+          <el-form-item label="读卡类型：" prop="id_card_type" :validate-event="is_Name">
             <el-select v-model="form.id_card_type" placeholder="请选择">
               <el-option
                 v-for="item in IDCardTypes"
@@ -142,6 +143,52 @@
               </el-option>
             </el-select>
           </el-form-item>
+
+          <el-form-item label="处方类型：" prop="p_type" :validate-event="is_Name">
+            <el-select style="margin-right:5px;width:100px;" v-model="form.p_type" placeholder=""
+            >
+              <el-option
+                v-for="(item,index) in registers"
+                :key="index"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="大病类别：" prop="sick_type" :validate-event="is_Name">
+            <el-select style="margin-right:5px;width:100px;" v-model="form.sick_type" placeholder="">
+              <el-option
+                v-for="(item,index) in sick"
+                :key="index"
+                :label="item.class_name"
+                :value="item.id">
+              </el-option>
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="诊断：" prop="diagnosis" :validate-event="is_Name">
+            <el-select style="margin-right:5px;width:100px;" v-model="form.diagnosis" placeholder="">
+              <el-option
+                v-for="(item,index) in diagnoses"
+                :key="index"
+                :label="item.class_name"
+                :value="item.id">
+              </el-option>
+            </el-select>
+          </el-form-item>
+
+
+          <el-form-item label="医疗类别：">
+            <el-select v-model="form.medicalCare" placeholder="请选择">
+              <el-option
+                v-for="(item,index) in getDictionaryDataConfig('system','social_type')"
+                :key="index"
+                :label="item.name"
+                :value="item.id">
+              </el-option>
+            </el-select>
+          </el-form-item>
+
           <el-form-item label="医生：" prop="doctor" :validate-event="is_Name">
             <el-select v-model="form.doctor" placeholder="请选择" @change="changeDoctor">
               <el-option
@@ -189,11 +236,19 @@
 </template>
 
 <script>
+  import {PostSearch} from '@/api/patient'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
   import {basename} from 'path'
-  import {getAllDoctorList, getPatientDetail, getTodaySchedulePatient, saveHisPatient} from "@/api/project/project"
+  import {
+    getAllDoctorList,
+    getPatientDetail,
+    getTodaySchedulePatient,
+    getUnRegisterHisPatientList,
+    saveHisPatient
+  } from "@/api/project/project"
   import {getDictionaryDataConfig} from '@/utils/data'
   import {uParseTime} from "@/utils/tools";
+  import {getInitData,} from '@/api/his/his'
   import axios from 'axios'
 
   const moment = require('moment')
@@ -203,16 +258,32 @@
     },
     data() {
       return {
+        registers: [
+          {value: 11, label: "普通门诊"},
+          {value: 12, label: '门诊挂号'},
+          {value: 13, label: "急诊"},
+          {value: 14, label: "门诊特殊病"},
+          {value: 15, label: "门诊统筹"},
+          {value: 16, label: "门诊慢性病"},
+          {value: 21, label: "普通住院"},
+
+        ],
+        sick: [],
+        diagnoses: [],
         crumbs: [
           {path: false, name: '门诊挂号'},
           {path: false, name: '门诊挂号'}
         ],
         form: {
+          id: 0,
+          p_type: '',
+          sick_type: '',
+          diagnosis: '',
           settlementValue: '',
           medicalInsuranceCard: '',
           name: '',
           sex: '',
-          certificates: '',
+          certificates: 1,
           medicalCare: '',
           birthday: '',
           age: '',
@@ -227,7 +298,8 @@
           total: '',
           phone: '',
           social_type: '',
-          id_card_type: '',
+          id_card_type: 1,
+
         },
         settlement:
           [
@@ -332,7 +404,16 @@
           doctor: [{required: true, message: '请选择医生', trigger: 'blur'}],
           department: [{required: true, message: '请填写科室', trigger: 'blur'}],
           age: [{required: true, message: "患者年龄不能为空", trigger: 'blur'}],
-          birthday: [{required: true, message: "患者出生日期不能为空", trigger: 'blur'}]
+          birthday: [{required: true, message: "患者出生日期不能为空", trigger: 'blur'}],
+          certificates: [{required: true, message: "证件类型不能为空", trigger: 'change'}],
+          id_card_type: [{required: true, message: "读卡类型不能为空", trigger: 'change'}],
+
+
+          p_type: [{required: true, message: "处方类型不能为空", trigger: 'change'}],
+          sick_type: [{required: true, message: "大病类别不能为空", trigger: 'change'}],
+          diagnosis: [{required: true, message: "诊断不能为空", trigger: 'change'}],
+
+
         },
         doctorList: [],
         departmentList: [],
@@ -351,6 +432,30 @@
       }
     },
     methods: {
+      handleSelect(val) {
+        this.form.id = val.id
+        this.form.name = val.name
+        this.form.sex = val.gender
+        this.form.age = val.age
+        this.form.birthday = uParseTime(val.birthday, '{y}-{m}-{d}')
+        this.form.phone = val.phone
+        this.form.idCard = val.id_card_no
+      },
+      querySearchAsync(keyword, cb) {
+        let key = ''
+        if (keyword != undefined) {
+          key = keyword
+        }
+        let searchArray = []
+        PostSearch(key).then(response => {
+          if (response.data.state == 1) {
+            searchArray = response.data.data.patient
+            cb(searchArray)
+          } else {
+            cb([])
+          }
+        })
+      },
       reading(medicalInsuranceCard) {
         var that = this
         if (this.form.id_card_type.length == 0 || this.form.id_card_type == 0) {
@@ -368,15 +473,26 @@
               that.$message.error(response.data.msg)
               return false
             } else {
-              this.form.name = this.baseinfo.psn_name
-              this.form.sex = parseInt(this.baseinfo.gend)
-              this.form.psn_cert_type = this.baseinfo.certificates
-              this.form.birthday = this.baseinfo.brdy
-              this.form.age = parseInt(this.baseinfo.age)
-              this.form.idCard = this.baseinfo.certno
-              this.form.certificates = 1
-
-
+              var patient = response.data.data.patient
+
+              if (that.form.id_card_type == 1) {
+                that.form.name = patient.ID
+                that.form.sex = patient.gender
+                that.form.age = patient.age
+                that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}')
+                that.form.phone = patient.phone
+                that.form.idCard = patient.id_card_no
+                that.form.medicalInsuranceCard = response.data.data.number
+
+
+              } else if (that.form.id_card_type == 2) {
+                that.form.name = patient.ID
+                that.form.sex = patient.gender
+                that.form.age = patient.age
+                that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}')
+                that.form.phone = patient.phone
+                that.form.idCard = patient.id_card_no
+              }
               that.$message({message: '读卡成功', type: 'success'})
             }
           })
@@ -510,21 +626,36 @@
           this.is_Name = true
           return
         }
+        if (this.form.id_card_type == "") {
+          this.$message.error("读卡类型不能为空")
+          this.is_Name = true
+          return
+        }
 
         if (this.form.idCard == "") {
           this.$message.error("证件号码不能为空")
           this.is_Name = true
           return
         }
-        var name = ""
-        for (let i = 0; i < this.patient.length; i++) {
-          if (this.form.name == this.patient[i].patient_id) {
-            name = this.patient[i].name
-          }
+
+        if (this.form.p_type == "") {
+          this.$message.error("处方类型不能为空")
+          this.is_Name = true
+          return
         }
 
-        this.form.name = name
 
+        if (this.form.diagnosis == "") {
+          this.$message.error("诊断不能为空")
+          this.is_Name = true
+          return
+        }
+
+        if (this.form.sick_type == "") {
+          this.$message.error("大病类别不能为空")
+          this.is_Name = true
+          return
+        }
 
         this.$refs[formName].validate((valid) => {
           if (valid) {
@@ -539,38 +670,40 @@
             }
 
             var params = {
-              settlementValue: this.form.settlementValue,
-              medicalInsuranceCard: this.form.medicalInsuranceCard,
+              id: this.form.id,
+              settlement_value: this.form.settlementValue,
+              medical_insurance_card: this.form.medicalInsuranceCard,
               name: this.form.name,
               sex: this.form.sex,
               id_card_type: this.form.id_card_type,
               certificates: this.form.certificates,
-              medicalCare: this.form.medicalCare,
-              birthDay: moment(new Date(this.form.birthday)).format('YYYY-MM-DD'),
+              medical_care: this.form.medicalCare,
+              birthday: moment(new Date(this.form.birthday)).format('YYYY-MM-DD'),
               age: parseInt(this.form.age),
-              idCard: this.form.idCard,
+              id_card: this.form.idCard,
               register: this.form.register,
               doctor: this.form.doctor,
               department: this.form.department,
               costChecked: this.check,
-              registrationFee: this.form.registrationFee,
-              medicalExpenses: this.form.medicalExpenses,
+              registration_fee: this.form.registrationFee,
+              medical_expenses: this.form.medicalExpenses,
               cost: this.form.cost,
               total: this.total,
               phone: this.form.phone,
-              social_type: this.form.social_type
+              social_type: this.form.social_type,
+              p_type: this.form.p_type,
+              diagnosis: this.form.diagnosis,
+              sick_type: this.form.sick_type
             }
-
-            params['id'] = this.patientInfo.id,
             params['record_time'] = this.record_date,
               params['admin_user_id'] = this.$store.getters.xt_user.user.id
             this.loadingone = true
 
-            if (this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919) {
+            if (this.$store.getters.xt_user.org_id == 9919) {
               var that = this
 
               axios.get('http://127.0.0.1:9532/api/register/get', {
-                params: forms
+                params: params
               })
                 .then(function (response) {
                   if (response.data.state == 0) {
@@ -591,59 +724,59 @@
 
                 });
             } else {
-              register(forms).then(response => {
-                if (response.data.state == 0) {
-                  this.$message.error(response.data.msg)
-                  this.loadingone = false
-                  this.$refs.register.hide()
-                  return false
+              saveHisPatient(params).then(response => {
+                if (response.data.state == 1) {
+                  var patient = response.data.data.patient
+                  this.getTodaySchedulePatient()
+                  this.$message.success("保存成功")
+                  this.form.settlementValue = "",
+                    this.form.medicalInsuranceCard = "",
+                    this.form.name = "",
+                    this.form.sex = "",
+                    this.form.certificates = "",
+                    this.form.medicalCare = "",
+                    this.form.birthday = "",
+                    this.form.age = "",
+                    this.form.idCard = "",
+                    this.form.register = "",
+                    this.form.doctor = "",
+                    this.form.department = "",
+                    this.form.costChecked = false,
+                    this.form.registrationFee = "",
+                    this.form.medicalExpenses = "",
+                    this.form.cost = "",
+                    this.form.total = "" ,
+                    this.form.phone = "",
+                    this.form.social_type = ""
                 } else {
-                  this.getPatientList()
-                  this.$message({message: '挂号成功', type: 'success'})
-                  this.$refs.register.hide()
-                  this.loadingone = false
-                  var his_info = response.data.data.his_info
-                  this.hisPatientInfo = his_info
+                  this.$message.error("今日患者已挂号!")
                 }
               })
+
             }
 
 
-            saveHisPatient(params).then(response => {
-              if (response.data.state == 1) {
-                var patient = response.data.data.patient
-                console.log("patient", patient)
-                this.$message.success("保存成功")
-                this.form.settlementValue = "",
-                  this.form.medicalInsuranceCard = "",
-                  this.form.name = "",
-                  this.form.sex = "",
-                  this.form.certificates = "",
-                  this.form.medicalCare = "",
-                  this.form.birthday = "",
-                  this.form.age = "",
-                  this.form.idCard = "",
-                  this.form.register = "",
-                  this.form.doctor = "",
-                  this.form.department = "",
-                  this.form.costChecked = false,
-                  this.form.registrationFee = "",
-                  this.form.medicalExpenses = "",
-                  this.form.cost = "",
-                  this.form.total = "" ,
-                  this.form.phone = "",
-                  this.form.social_type = ""
-              } else {
-                this.$message.error("今日患者已挂号!")
-              }
-            })
           }
         })
       },
       getTodaySchedulePatient() {
-        getTodaySchedulePatient().then(response => {
+        var nowDate = new Date()
+        var nowYear = nowDate.getFullYear()
+        var nowMonth = nowDate.getMonth() + 1
+        var nowDay = nowDate.getDate()
+        this.record_date =
+          nowYear +
+          '-' +
+          (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
+          '-' +
+          (nowDay < 10 ? '0' + nowDay : nowDay)
+        let params = {
+
+          record_date: this.record_date
+        }
+        getUnRegisterHisPatientList(params).then(response => {
           if (response.data.state == 1) {
-            var patient = response.data.data.patient
+            var patient = response.data.data.list
             console.log("今日排班", patient)
             this.patient = patient
           }
@@ -683,9 +816,26 @@
             this.form.idCard = patient.id_card_no
           }
         })
-      }
+      }, getInitData() {
+        getInitData().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.doctors = response.data.data.doctors
+            this.department = response.data.data.department
+            this.sick = response.data.data.sick
+            this.diagnoses = response.data.data.diagnose
+
+          }
+        })
+
+      },
+
     },
     created() {
+      this.getInitData()
+
       //获取当前机构有人员信息
       this.getAllDoctorList()
       //获取今日排班的患者

src/xt_pages/qcd/officesControlAnalysis/project.vue

@@ -285,11 +285,13 @@ export default {
         })
     },
     handleModeType(val){
-      // console.log("modetype",this.mode_type)
+
+      console.log("modetype",this.type,this.mode_type)
       if(this.type == 2){
          this.bloodType = val
         if(this.mode_type == -1 || this.mode_type == -2){
           this.getMonthBloodList()
+
           return false
         }else{
             // console.log("chuff")
@@ -597,6 +599,11 @@ export default {
 
         const  decStart = moment().month(11).startOf('month').format("YYYY-MM-DD")
         const decEnd = moment().month(11).endOf('month').format("YYYY-MM-DD")
+        for(let i=0;i<this.normdata.length;i++){
+            if(this.normdata[i].inspection_minor == this.mode_type){
+               this.range_type = this.normdata[i].range_type
+            }
+        }
 
         for(let i=0;i<this.normdata.length;i++){
           if(this.normdata[i].inspection_minor == this.mode_type){
@@ -634,7 +641,7 @@ export default {
           decEnd:decEnd,
           range_type:this.range_type,
         }
-
+       console.log("222222",params)
        getMonthProjectList(params).then(response=>{
         if(response.data.state === 1){
             var monthlist = response.data.data.monthlist
@@ -1089,7 +1096,7 @@ export default {
             decEnd:decEnd,
             bloodType:this.bloodType
          }
-        //  console.log("params",params)
+       console.log("params",params)
       getMonthBloodList(params).then(response=>{
         if(response.data.state == 1){
           if(this.bloodType == -1){

src/xt_pages/stock/drugs/drugStockInOrderAdd.vue

@@ -429,7 +429,7 @@
               this.recordInfo.recordData[this.currentIndex].drug_id = val.selectedGoodInfo[i].id
               this.recordInfo.recordData[this.currentIndex].price = val.selectedGoodInfo[i].last_price.toString()
               this.recordInfo.recordData[this.currentIndex].retail_price = val.selectedGoodInfo[i].retail_price.toString()
-              this.recordInfo.recordData[this.currentIndex].min_unit = val.selectedGoodInfo[i].min_unit
+              // this.recordInfo.recordData[this.currentIndex].min_unit = val.selectedGoodInfo[i].min_unit
             } else {
               const tempForm = {}
               tempForm["id"] = 0;
@@ -469,6 +469,7 @@
           } else {
             this.manufacturer = response.data.data.manufacturer;
             this.dealer = response.data.data.dealer;
+            console.log("2222333333",response.data.data.drugs)
             for(let i = 0; i<  response.data.data.drugs.length;i++){
               this.goodType.push(response.data.data.drugs[i])
               if(response.data.data.drugs[i].drug_specs != null) {

src/xt_pages/stock/stockInOrder.vue

@@ -586,6 +586,7 @@ export default {
       "-" +
       (nowDay < 10 ? "0" + nowDay : nowDay);
     nowDate.setMonth(nowDate.getMonth() - 1);
+    nowYear = nowDate.getFullYear();
     nowMonth = nowDate.getMonth() + 1;
     nowDay = nowDate.getDate();
     this.start_time =
@@ -595,6 +596,8 @@ export default {
       "-" +
       (nowDay < 10 ? "0" + nowDay : nowDay);
      
+
+
      
 
       // this.warehousing_time =

src/xt_pages/user/dialysisSolution.vue

@@ -1260,6 +1260,7 @@ export default {
       this.fetchPatientDialysisSolutions()
     },
     openEdit(index, row) {
+     
       this.current_index = index
 
       this.addPlan.id = row.id

src/xt_pages/user/patients.vue

@@ -679,7 +679,7 @@
         ],
         sourceType: 0,
         sourceID: 0,
-        lapsetoType: 0,
+        lapsetoType: 1,
         sourceArr: [
           { value: 0, label: '全部', source: 0, lapseto: 0 },
           // { value: 1, label: "转出", source: 0, lapseto: 2 },
@@ -728,7 +728,7 @@
           limit: 10,
           schedul_type: 0,
           binding_state: 0,
-          lapseto: 0,
+          lapseto: 1,
           source: 0,
           start_time: '',
           end_time: '',

src/xt_pages/workforce/appointment.vue

@@ -234,11 +234,12 @@
       getWeekPanels() {
         // this.scheduleZoneRow = []
         // this.scheduleZone = []
-        getWeekPanels(1).then(response => {
+        getWeekPanels(1,this.partition_id).then(response => {
           if (response.data.state == 0) {
             return false
           }
           var partitions = response.data.data.partitions
+          console.log("分区",partitions)
           this.theWeek.lastWeek = this.theWeek.thisWeek - 1
           this.theWeek.thisWeek = response.data.data.theWeek
           this.theWeek.nextWeek = this.theWeek.thisWeek + 1
@@ -414,6 +415,7 @@
                   total: 0
                 }
                 that.scheduleZone.push(thisPa)
+                
               })
             })
           }
@@ -2052,10 +2054,8 @@
                 }
                 i++
               }
-              console.log("list2021444444x",list)  
-              for(let i=0;i<list.length;i++){
-                console.log("list9999999999",list[i])
-              }
+             
+             
                const start_time = moment().weekday(1).format('YYYY-MM-DD'); //本周一
                var start = this.getTimestamp(start_time)
                console.log("start",start)
@@ -2100,7 +2100,7 @@
             if(this.export_type == 1){
                 week = scheduleList
              }
-             console.log("week88888888888",week)
+           
              if(week.length > 0){
               for(let i=0;i<list.length;i++){
                for(let j=0;j<week.length;j++){
@@ -2414,11 +2414,13 @@
        changePartition(val){
          this.partition_id = val
          this.getThreeWeekList()
+         this.getWeekPanels()
        },
 
        changeSchedule(val){
          this.schedule_type = val
          this.getThreeWeekList()
+         this.getWeekPanels()
        },
 
        changeWeek(val){

src/xt_pages/workforce/components/tableData.vue

@@ -760,7 +760,8 @@ export default {
       ],
       partition_id:"",
       schedule_type:"",
-      zones:[{id:0,name:"全部"}]
+      zones:[{id:0,name:"全部"}],
+      theType:""
     };
   },
 
@@ -768,11 +769,13 @@ export default {
     weekTime: function() {
       var theType = this.weekType(this.weekTime);
       console.log("999999999",theType)
-      this.getSchedules(theType);
+      this.theType = theType
+      this.getSchedules();
     },
     scheduleZoneRow: function() {
       var theType = this.weekType(this.weekTime);
-      this.getSchedules(theType);
+      this.theType = theType
+      this.getSchedules();
     },
     tableHeight(val) {
       if (!this.timer) {
@@ -901,16 +904,24 @@ export default {
       this.$refs.singleTable.setCurrentRow(row);
       this.currentData.patient_id = 0;
     },
-    getSchedules(weekType) {
-      
-      getSchedules(weekType).then(response => {
+    getSchedules() {
+        const params = {
+          weekTime:this.theType,
+          partition_id:this.partition_id,
+          schedule_type:this.schedule_type,
+        }
+      getSchedules(params).then(response => {
         if (response.data.state == 1) {
           this.weekTitle = response.data.data.weekTitle;
           this.weekDays = response.data.data.days;
           this.toDay = response.data.data.today;
           var theSchedules = response.data.data.schdules;
+          
+          console.log("中国4444444444444",this.scheduleZone)
+        
           var that = this;
           this.scheduleZone.forEach(function(zone, index) {
+           
             that.scheduleZone[index].Mon_M = {
               mode_id: 0,
               mode_name: "",
@@ -1041,6 +1052,7 @@ export default {
 
             if (response.data.data.schdules.length > 0) {
               theSchedules.forEach(function(schedule, sindex) {
+
                 if (zone.jihao_id == schedule.bed_id) {
                   // if(zone.zone_id == schedule.partition_id && zone.jihao_id == schedule.bed_id) {
                   var weekPath = that.weekPath(
@@ -1272,6 +1284,7 @@ export default {
 
       this.currentData.type_name = this.dayType(week[1]);
       this.currentData.zone_name = row.area;
+      
       this.currentData.bed_name = row.cut;
       this.currentData.partition_type = row.zone_type;
 
@@ -1993,10 +2006,12 @@ export default {
     changePartiton(val){
      this.$emit('event1', val)
       this.partition_id = val
+      this.getSchedules()
     },
     changeSchedule_type(val){
      this.$emit('event2', val)
      this.schedule_type = val
+     this.getSchedules()
     }
   },
   components: {
@@ -2041,6 +2056,7 @@ export default {
         }
       });
     }
+  
     this.scheduleZoneRow = this.scheduleZoneRowProp;
     
 
@@ -2048,7 +2064,7 @@ export default {
     if (this.weekday == 0) {
       this.weekday = 7;
     }
-  //  this.getAllZones()
+    this.getAllZones()
   }
 };
 </script>