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

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/router/modules/dialysis.js

@@ -316,6 +316,18 @@ export default {
         noCache: true
       }
     },
+    {
+      path: '/dialysis/print/batch/twentyFive',
+      component: () =>
+        import('@/xt_pages/dialysis/batch_print/batch_print_order_twentyFive'),
+      hidden: true,
+      is_menu: false,
+      name: 'dialysis_batch_twentyFive',
+      meta: {
+        title: '批量打印',
+        noCache: true
+      }
+    },
     {
       path: '/dialysis/print/batch/thirty',
       component: () =>

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -979,6 +979,8 @@
                           <td width="50">血流量<br />(ml/min)</td>
                           <td width="50">静脉压<br />(mmHg)</td>
                           <td width="50">跨膜压<br />(mmHg)</td>
+                          <td width="60" v-if="org_id != 9836">透析液温度(°C)</td>
+                          <td width="60" v-if="org_id == 9836">体温(°C)</td>
                           <td width="60">透析液温度(°C)</td>
                           <td width="50">电导度<br />(ms/cm)</td>
                           <td width="50">超滤量<br />(ml)</td>
@@ -1049,13 +1051,20 @@
                                 : ""
                             }}
                           </td>
-                          <td>
+                          <td v-if="org_id != 9836">
                             {{
                               monitor_record.dialysate_temperature
                                 ? monitor_record.dialysate_temperature
                                 : ""
                             }}
                           </td>
+                          <td v-if="org_id == 9836">
+                            {{
+                              monitor_record.temperature
+                                ? monitor_record.temperature
+                                : ""
+                            }}
+                          </td>
                           <td>
                             {{
                               monitor_record.sodium_concentration
@@ -2023,7 +2032,8 @@ export default {
         "出血",
         "心衰",
         "腹痛"
-      ]
+      ],
+      org_id:''
     };
   },
   created() {
@@ -2037,6 +2047,7 @@ export default {
     this.nutrition_arr = getDataConfig("hemodialysis", "nutrition");
     var xtuser = this.$store.getters.xt_user;
     this.orgname = xtuser.org.org_name;
+    this.org_id = this.$store.getters.xt_user.org.id
     //   this.orgname = "遂溪方济医院";
     this.modeOptions = this.$store.getters.treatment_mode;
     //   this.replacementWays = this.$store.getters.replacement_ways;

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -199,6 +199,16 @@
           >
         </div>
       </template>
+      <template v-if="this.template_id == 25">
+        <el-button
+          size="small"
+          icon="el-icon-printer"
+          :disabled="selecting_schs.length == 0"
+          @click="batchPrintAction"
+          type="primary"
+          >批量打印</el-button
+        >
+      </template>
       <template v-if="this.template_id == 30">
         <el-button
           size="small"
@@ -785,6 +795,8 @@ export default {
         this.$router.push({ path: "/dialysis/print/batch/twenty" });
       } else if (this.template_id == 22) {
         this.$router.push({ path: "/dialysis/print/batch/twentyTwo" });
+      } else if (this.template_id == 25) {
+        this.$router.push({ path: "/dialysis/print/batch/twentyFive" });
       } else if (this.template_id == 30) {
         this.$router.push({ path: "/dialysis/print/batch/thirty" });
       } else if (this.template_id == 32) {

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

@@ -139,7 +139,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-          
+
 
          <el-col :span="8" v-if="isShows('抗凝剂商品名称')">
             <el-form-item label="抗凝剂商品名称：">
@@ -350,7 +350,7 @@
             </el-form-item>
           </el-col>
 
-      
+
 
           <el-col :span="8" v-if="isShows('透析器/灌流器')">
             <el-form-item label="透析器/灌流器">
@@ -1318,6 +1318,23 @@
 
             //      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)
+            // 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)
             //      }
@@ -1329,7 +1346,8 @@
             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
@@ -1340,10 +1358,10 @@
             this.InnerDialogProps.titles = '抽血'
             this.InnerDialogProps.type = 'blood'
             this.InnerDialogProps.selected = this.dialysisPrescription.blood
-            this.InnerDialogProps.isShowTextArea = false    
-          
+            this.InnerDialogProps.isShowTextArea = false
+
            case '7': // 透析器
-          
+
         }
       },
       innerDialogComfirm: function(val) {
@@ -1922,7 +1940,7 @@
         this.isVisibility = false
       },
       changeThisAnticoagulant: function(val) {
-        
+
         var thismode = val
         if (isNaN(thismode) || thismode <= 0) {
           return false
@@ -3200,9 +3218,9 @@
         const res = new Map();
         return arr.filter((arr) => !res.has(arr.name) && res.set(arr.name, 1));
       },
-     
+
     },
-  
+
     watch: {
       'dialysisPrescription.dialysis_duration_hour': function() {
         let dialysis_duration_minute = 0
@@ -3257,7 +3275,7 @@
           this.dialysisPrescription.anticoagulant_zongliang = ''
         }
 
-       
+
       },
       'dialysisPrescription.anticoagulant_shouji': function() {
         let dialysis_duration_minute = 0
@@ -3289,7 +3307,7 @@
           this.dialysisPrescription.anticoagulant_zongliang = ''
         }
 
-        
+
       },
       'dialysisPrescription.anticoagulant_weichi': function() {
         let dialysis_duration_minute = 0
@@ -3316,7 +3334,9 @@
           this.dialysisPrescription.anticoagulant_zongliang = ''
         }
         console.log("首季",this.dialysisPrescription.anticoagulant_zongliang)
-      
+
+
+
       },
       'prescription.id': {
         immediate: true,

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -501,7 +501,8 @@
                       <td width="50">血流量<br />(ml/min)</td>
                       <td width="50">静脉压<br />({{monitors[0]&&monitors[0]['venous_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</td>
                       <td width="50">跨膜压<br />({{monitors[0]&&monitors[0]['transmembrane_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</td>
-                      <td width="60">透析液温度(°C)</td>
+                      <td width="60" v-if="org_id != 9836">透析液温度(°C)</td>
+                      <td width="60" v-if="org_id == 9836">体温(°C)</td>
                       <td width="50">电导度<br />(ms/cm)</td>
                       <td width="50">超滤量<br />(ml)</td>
                       <td v-if="prescription.mode_id == 2 || prescription.mode_id == 5 || prescription.mode_id == 12" width="50">
@@ -543,7 +544,8 @@
                           {{ monitor.transmembrane_pressure ? monitor.transmembrane_pressure : 0 }}
                         </span>
                       </td>
-                      <td>{{ monitor.dialysate_temperature ? monitor.dialysate_temperature : "" }}</td>
+                      <td v-if="org_id != 9836">{{ monitor.dialysate_temperature ? monitor.dialysate_temperature : "" }}</td>
+                      <td v-if="org_id == 9836">{{ monitor.temperature ? monitor.temperature : "" }}</td>
                       <td>{{ monitor.sodium_concentration ? monitor.sodium_concentration : "" }}
                       </td>
                       <td v-if="(dialysisOrder && monitor.operate_time > dialysisOrder.end_time) || (dialysisOrder && monitor.operate_time < dialysisOrder.start_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/DialysisPrintOrderTwentyFive.vue

@@ -806,7 +806,7 @@
                   <td width="20">ml</td>
                   <td width="30">V端</td>
                   <td width="30">
-                    <div class="under-line">{{ afterdialysis.cvc_v ? afterdialysis.cvc_v : "" }}</div>
+                    <div class="under-line">&nbsp;{{ afterdialysis.cvc_v ? afterdialysis.cvc_v : "" }}</div>
                   </td>
                   <td width="20">ml</td>
                   <td></td>

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/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,13 +285,13 @@ export default {
         })
     },
     handleModeType(val){
-     
+
       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")
@@ -605,6 +605,12 @@ export default {
             }
         }
 
+        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
+          }
+        }
+
         const params = {
           lapseto:this.lapseto,
           itemtype:this.type,

src/xt_pages/stock/detail/print.vue

@@ -74,6 +74,15 @@
 
             </tbody>
           </table>
+
+          <div style="display:flex;margin-top:20px;float:right;">
+            <div style="width:50px;">审批：</div><div style="width:100px;"></div>
+            <div style="width:80px;">药材主任：</div><div style="width:100px;"></div>
+            <div style="width:50px;">会计：</div><div style="width:100px;"></div>
+            <div style="width:50px;">审核：</div><div style="width:100px;"></div>
+            <div style="width:70px;">制单人：</div><div style="width:100px;"></div>
+          </div>
+
         </div>
 
       </div>

src/xt_pages/stock/drugs/drugCancelDetailPrint.vue

@@ -10,7 +10,8 @@
         <div class="dialysis-print-order">
          <div class="order-yy-name">{{orgname}}</div>
           <div class="order-title">退库单</div>
-        <div style="float: right;margin-bottom: 10px;">{{getDateTwo()}}</div>
+          <div style="float: left;margin-bottom: 10px;">{{getDateOne()}}</div>
+          <div style="float: right;margin-bottom: 10px;">{{getDateTwo()}}</div>
 
           <table class="print-table" border="1">
             <tbody>
@@ -61,6 +62,14 @@
 
             </tbody>
           </table>
+
+          <div style="display:flex;margin-top:20px;float:right;">
+            <div style="width:50px;">审批：</div><div style="width:100px;"></div>
+            <div style="width:80px;">药材主任：</div><div style="width:100px;"></div>
+            <div style="width:50px;">会计：</div><div style="width:100px;"></div>
+            <div style="width:50px;">审核：</div><div style="width:100px;"></div>
+            <div style="width:70px;">制单人：</div><div style="width:100px;"></div>
+          </div>
         </div>
 
       </div>
@@ -105,6 +114,9 @@
       }
     },
     methods: {
+      getDateOne(){
+        return "出库日期: "+this.start_time +"~"+this.end_time
+      },
       getDateTwo(){
         var ptime = Math.round(new Date().getTime() / 1000)
         return "打印单日期："+uParseTime(ptime, '{y}-{m}-{d}')

src/xt_pages/stock/drugs/drugCancelOurderPrint.vue

@@ -10,7 +10,8 @@
         <div class="dialysis-print-order">
          <div class="order-yy-name">{{orgname}}</div>
           <div class="order-title">退货单</div>
-        <div style="float: right;margin-bottom: 10px;">{{getDateTwo()}}</div>
+          <div style="float: left;margin-bottom: 10px;">{{getDateOne()}}</div>
+          <div style="float: right;margin-bottom: 10px;">{{getDateTwo()}}</div>
 
           <table class="print-table" border="1">
             <tbody>
@@ -60,6 +61,14 @@
 
             </tbody>
           </table>
+
+          <div style="display:flex;margin-top:20px;float:right;">
+            <div style="width:50px;">审批：</div><div style="width:100px;"></div>
+            <div style="width:80px;">药材主任：</div><div style="width:100px;"></div>
+            <div style="width:50px;">会计：</div><div style="width:100px;"></div>
+            <div style="width:50px;">审核：</div><div style="width:100px;"></div>
+            <div style="width:70px;">制单人：</div><div style="width:100px;"></div>
+          </div>
         </div>
 
       </div>
@@ -104,6 +113,9 @@
       }
     },
     methods: {
+      getDateOne(){
+        return "退货日期: "+this.start_time +"~"+this.end_time
+      },
       getDateTwo(){
         var ptime = Math.round(new Date().getTime() / 1000)
         return "打印单日期："+uParseTime(ptime, '{y}-{m}-{d}')

src/xt_pages/stock/drugs/drugOutOrderPrint.vue

@@ -10,7 +10,8 @@
         <div class="dialysis-print-order">
          <div class="order-yy-name">{{orgname}}</div>
           <div class="order-title">出库单</div>
-        <div style="float: right;margin-bottom: 10px;">{{getDateTwo()}}</div>
+          <div style="float: left;margin-bottom: 10px;">{{getDateOne()}}</div>
+          <div style="float: right;margin-bottom: 10px;">{{getDateTwo()}}</div>
 
           <table class="print-table" border="1">
             <tbody>
@@ -68,6 +69,14 @@
 
             </tbody>
           </table>
+
+          <div style="display:flex;margin-top:20px;float:right;">
+            <div style="width:50px;">审批：</div><div style="width:100px;"></div>
+            <div style="width:80px;">药材主任：</div><div style="width:100px;"></div>
+            <div style="width:50px;">会计：</div><div style="width:100px;"></div>
+            <div style="width:50px;">审核：</div><div style="width:100px;"></div>
+            <div style="width:70px;">制单人：</div><div style="width:100px;"></div>
+          </div>
         </div>
 
       </div>
@@ -112,6 +121,9 @@
       }
     },
     methods: {
+      getDateOne(){
+        return "出库日期: "+this.start_time +"~"+this.end_time
+      },
       getDateTwo(){
         var ptime = Math.round(new Date().getTime() / 1000)
         return "打印单日期："+uParseTime(ptime, '{y}-{m}-{d}')

src/xt_pages/stock/drugs/drugPrint.vue

@@ -10,7 +10,8 @@
         <div class="dialysis-print-order">
          <div class="order-yy-name">{{orgname}}</div>
           <div class="order-title">入库单</div>
-        <div style="float: right;margin-bottom: 10px;">{{getDateTwo()}}</div>
+          <div style="float: left;margin-bottom: 10px;">{{getDateOne()}}</div>
+          <div style="float: right;margin-bottom: 10px;">{{getDateTwo()}}</div>
 
           <table class="print-table" border="1">
             <tbody>
@@ -60,6 +61,14 @@
 
             </tbody>
           </table>
+
+          <div style="display:flex;margin-top:20px;float:right;">
+            <div style="width:50px;">审批：</div><div style="width:100px;"></div>
+            <div style="width:80px;">药材主任：</div><div style="width:100px;"></div>
+            <div style="width:50px;">会计：</div><div style="width:100px;"></div>
+            <div style="width:50px;">审核：</div><div style="width:100px;"></div>
+            <div style="width:70px;">制单人：</div><div style="width:100px;"></div>
+          </div>
         </div>
 
       </div>
@@ -104,6 +113,9 @@
       }
     },
     methods: {
+      getDateOne(){
+        return "入库日期: "+this.start_time +"~"+this.end_time
+      },
       getDateTwo(){
         var ptime = Math.round(new Date().getTime() / 1000)
         return "打印单日期："+uParseTime(ptime, '{y}-{m}-{d}')

src/xt_pages/workforce/appointment.vue

@@ -91,7 +91,7 @@
     <div class="app-container">
       <!-- <el-row>
         <el-col :span="24"> -->
-      <div style="margin-left:832px;position:fixed;z-index:99">
+      <div style="right:30px;position:fixed;z-index:99">
        <span>导出周次:</span>
         <el-date-picker
           v-model="weekTime"