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

.idea/.gitignore

@@ -0,0 +1,2 @@
+# Default ignored files
+/workspace.xml

.idea/Vue_New.iml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
+  </profile>
+</component>

.idea/misc.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="JavaScriptSettings">
+    <option name="languageLevel" value="ES6" />
+  </component>
+</project>

.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/Vue_New.iml" filepath="$PROJECT_DIR$/.idea/Vue_New.iml" />
+    </modules>
+  </component>
+</project>

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>

config/index.js

@@ -30,7 +30,7 @@ module.exports = {
     //  host: 'xt.test.sgjyun.com',
     //  host: 'xt.kuyicloud.com',
     // host: 'xt.test.sgjyun.com',
-    host: 'localhost',
+    host: 'xt.test.sgjyun.com',
     port: 9528, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,

package-lock.json

@@ -7943,7 +7943,7 @@
     },
     "normalize-wheel": {
       "version": "1.0.1",
-      "resolved": "http://registry.npm.taobao.org/normalize-wheel/download/normalize-wheel-1.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/normalize-wheel/-/normalize-wheel-1.0.1.tgz",
       "integrity": "sha1-rsiGr/2wRQcNhWRH32Ls+GFG7EU="
     },
     "normalize.css": {

src/xt_pages/dialysis/template/DialysisPrintOrderTen.vue

@@ -1399,8 +1399,8 @@ export default {
 
         this.prescription = response.data.data.dialysisPrescription;
 
-        this.receiverTreatmentAccess =
-          response.data.data.receiverTreatmentAccess;
+        this.receiverTreatmentAccess =response.data.data.receiverTreatmentAccess;
+        console.log("透析监测",this.receiverTreatmentAccess)
         this.prescription.mode = this.modeName(this.prescription.mode_id);
         var rwLen = this.replacementWays.length;
         this.prescription.replacement = "";
@@ -1738,10 +1738,10 @@ export default {
       }
     },
     "patientInfo.source": function() {
-      if (this.patientInfo.source == 1) {
+      if (this.receiverTreatmentAccess.condition == 2 ) {
         this.patientInfo_source_1 = true;
         this.patientInfo_source_2 = false;
-      } else if (this.patientInfo.source == 2) {
+      } else if (this.receiverTreatmentAccess.condition == 1) {
         this.patientInfo_source_2 = true;
         this.patientInfo_source_1 = false;
       } else {

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -44,9 +44,9 @@
       <div class="mainRight">
 
         <div class="mainCell" style="margin-bottom:10px;flex-direction: row-reverse;">
-          <el-button size="small" @click="open(1)" type="primary" style="margin-left:10px;">打印处置单</el-button>
-          <el-button size="small" @click="open(2)" type="primary">打印治疗单</el-button>
-          <el-button size="small" @click="open(3)" type="primary">打印</el-button>
+          <!-- <el-button size="small" @click="open(1)" type="primary" style="margin-left:10px;">打印处置单</el-button>
+          <el-button size="small" @click="open(2)" type="primary">打印治疗单</el-button> -->
+          <el-button size="small" @click="open(3)" type="primary" style="margin-left:10px;">打印</el-button>
           <el-button v-loading="loadingone" size="small"
                      @click="open(6)"
                      v-if="this.hisPatientInfo && this.hisPatientInfo.id == 0"
@@ -82,6 +82,7 @@
                         <el-date-picker
                           v-model="record_date"
                           type="date"
+                          :clearable="false"
                           @change="changeDate"
                           format="yyyy-MM-dd"
                           value-format="yyyy-MM-dd"
@@ -416,24 +417,21 @@
         if (this.curPrescriptions.type == 1) {
           if (this.curPrescriptions.advices != null) {
             for (let a = 0; a < this.curPrescriptions.advices.length; a++) {
-              console.log(this.curPrescriptions.advices[a].retail_price)
-              console.log(this.curPrescriptions.advices[a].prescribing_number)
+              total = total +  Math.floor((this.curPrescriptions.advices[a].retail_price * this.curPrescriptions.advices[a].prescribing_number)* 100) / 100
 
-              total = total + this.curPrescriptions.advices[a].retail_price * this.curPrescriptions.advices[a].prescribing_number
             }
           }
-          return total
+          return Math.floor(total * 100) / 100
 
         } else {
           var total = 0
           if (this.curPrescriptions.project != null) {
             for (let b = 0; b < this.curPrescriptions.project.length; b++) {
-              console.log(this.curPrescriptions.project[b].price)
-              console.log(this.curPrescriptions.project[b].total)
-              total = total + this.curPrescriptions.project[b].price * this.curPrescriptions.project[b].total
+              total = total +  Math.floor((this.curPrescriptions.project[b].price * this.curPrescriptions.project[b].total) * 100) / 100
+
             }
           }
-          return total
+          return Math.floor(total * 100) / 100
 
         }
 
@@ -443,21 +441,21 @@
         for (let i = 0; i < this.prescriptions.length; i++) {
           if (this.prescriptions[i].advices != null) {
             for (let a = 0; a < this.prescriptions[i].advices.length; a++) {
-              total = total + this.prescriptions[i].advices[a].retail_price * this.prescriptions[i].advices[a].prescribing_number
+              total = total + Math.floor((this.prescriptions[i].advices[a].retail_price * this.prescriptions[i].advices[a].prescribing_number) * 100) / 100
             }
           }
           if (this.prescriptions[i].project != null) {
             for (let b = 0; b < this.prescriptions[i].project.length; b++) {
-              total = total + this.prescriptions[i].project[b].price * this.prescriptions[i].project[b].total
+
+              total = total + Math.floor((this.prescriptions[i].project[b].price * this.prescriptions[i].project[b].total) * 100) / 100
             }
           }
 
+          for (let i = 0; i < this.addtions_charge.length; i++) {
+            total = total + Math.floor(this.addtions_charge[i].price * 100) / 100
+          }
+          return Math.floor(total * 100) / 100
         }
-        for (let i = 0; i < this.addtions_charge.length; i++){
-          total = total +  this.addtions_charge[i].price
-        }
-        return Math.floor(total * 100) / 100
-
       },
       moreState(tab, event) {
         if (tab == 'more') {

src/xt_pages/outpatientCharges/treatTemplate/printOne.vue

@@ -46,7 +46,7 @@
                     </div>
                     <div class="chargeUl" style="border-top:1px solid #000;border-bottom:1px solid #000;">
                         <p style="width:50%;">现金支付</p>
-                        <p style="width:50%;"></p>
+                        <p style="width:50%;">{{list.order_info.psn_cash_pay}}</p>
                     </div>
                 </div>
                 <div style="width:80%;display:flex;height:600px;">
@@ -71,8 +71,8 @@
             
         </div>
         <div class="moneyBox">
-            <p>实收金：</p>
-            <p>记账前金额：</p>
+            <p>实收金：{{list.order_info.medfee_sumamt}}</p>
+            <p>记账前金额：{{list.order_info.preselfpay_amt}}</p>
             <p>扣款金额：</p>
             <p>记账后金额：</p>
             <p>找赎金：</p>

src/xt_pages/outpatientDoctorStation/components/newPrescriptionTable.vue

@@ -15,32 +15,42 @@
       </el-table-column>
       <el-table-column align="center" prop="name" width="50" label="用法">
         <template slot-scope="scope">
-          <el-input v-model="scope.row.delivery_way" readonly></el-input>
+          <!--<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="50" label="频率">
         <template slot-scope="scope">
-          <el-input v-model="scope.row.execution_frequency" readonly></el-input>
+          <!--<el-input v-model="scope.row.execution_frequency" readonly></el-input>-->
+          <div> {{scope.row.execution_frequency}}</div>
+
         </template>
       </el-table-column>
 
       <el-table-column align="center" prop="name" width="100" label="总量">
         <template slot-scope="scope">
           <div style="display:flex;">
-            <el-input v-model="scope.row.prescribing_number" style="width:50%" readonly placeholder=""></el-input>
+            <!--<el-input v-model="scope.row.prescribing_number" style="width:50%" readonly placeholder=""></el-input>-->
+            <div> {{scope.row.prescribing_number}}</div>
+
             <div>{{scope.row.prescribing_number_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.retail_price" placeholder="" readonly></el-input>
+          <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" style="width:50%" placeholder="" readonly></el-input>
+          <!--<el-input v-model="scope.row.remark" style="width:50%" placeholder="" readonly></el-input>-->
+          <div> {{scope.row.remark}}</div>
+
         </template>
       </el-table-column>
     </el-table>
@@ -58,39 +68,53 @@
       </el-table-column>
       <el-table-column align="center" prop="single_dose" width="130" :label="'单次\n用量'">
         <template slot-scope="scope">
-          <el-input v-model="scope.row.single_dose" placeholder="" readonly></el-input>
+          <!--<el-input v-model="scope.row.single_dose" placeholder="" readonly></el-input>-->
+          <div> {{scope.row.single_dose}}</div>
+
         </template>
       </el-table-column>
       <el-table-column align="center" prop="delivery_way" width="130" label="用法">
         <template slot-scope="scope">
-          <el-input v-model="scope.row.delivery_way" placeholder="" readonly></el-input>
+          <!--<el-input v-model="scope.row.delivery_way" placeholder="" readonly></el-input>-->
+          <div> {{scope.row.delivery_way}}</div>
+
         </template>
       </el-table-column>
       <el-table-column align="center" prop="execution_frequency" width="130" label="频率">
         <template slot-scope="scope">
-          <el-input v-model="scope.row.execution_frequency" placeholder="" readonly></el-input>
+          <!--<el-input v-model="scope.row.execution_frequency" placeholder="" readonly></el-input>-->
+          <div> {{scope.row.execution_frequency}}</div>
+
         </template>
       </el-table-column>
       <el-table-column align="center" prop="number_days" width="130" label="天数">
         <template slot-scope="scope">
-          <el-input v-model="scope.row.number_days" placeholder="" readonly></el-input>
+          <!--<el-input v-model="scope.row.number_days" placeholder="" readonly></el-input>-->
+          <div> {{scope.row.number_days}}</div>
+
         </template>
       </el-table-column>
       <el-table-column align="center" prop="total" width="100" label="总量">
         <template slot-scope="scope">
           <div style="display:flex;">
-            <el-input v-model="scope.row.total" style="width:50" placeholder="" readonly></el-input>
+            <!--<el-input v-model="scope.row.total" style="width:50" placeholder="" readonly></el-input>-->
+            <div> {{scope.row.total}}</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>
+          <!--<el-input v-model="scope.row.price" placeholder="" readonly></el-input>-->
+          <div> {{scope.row.price}}</div>
+
         </template>
       </el-table-column>
       <el-table-column align="center" prop="name" width="120" label="备注">
         <template slot-scope="scope">
-          <el-input v-model="scope.row.remark" readonly></el-input>
+          <!--<el-input v-model="scope.row.remark" readonly></el-input>-->
+          <div> {{scope.row.remark}}</div>
+
         </template>
       </el-table-column>
     </el-table>

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -107,7 +107,7 @@
         width="200">
         <template slot-scope="scope">
           <span>
-           <el-input v-model="scope.row.id"></el-input>
+           <el-input v-model="scope.row.prescription_number" :disabled="true"></el-input>
           </span>
         </template>
       </el-table-column>
@@ -254,6 +254,7 @@
           } else {
 
             this.prescriptions = []
+            this.addtions_charge = []
             this.patientInfo = response.data.data.xt_info
             this.hisPatientInfo = response.data.data.his_info
             this.case_history = response.data.data.case_history
@@ -263,8 +264,6 @@
             this.addtions_charge = response.data.data.addtions_charge
 
 
-
-
             this.patientInfo.birth = uParseTime(this.patientInfo.birthday, '{y}-{m}-{d}')
             if (this.case_history.temperature <= 0) {
               this.case_history.temperature = ''
@@ -372,10 +371,11 @@
         })
       },
       open(index) {
-        if(this.prescriptionList.length == 0){
+        console.log("index0999999",this.prescriptions)
+         if(this.prescriptions[0].advices.length == 0){
            this.$message.error("请先开处方")
            return
-        }
+          }
         this.index = index
         if (index == 1) {
           this.$refs.prescriptions.open(1)
@@ -389,7 +389,6 @@
           this.$refs.prescriptions.open(4)
         }else if(index == 6){
           // this.$router.push("/outpatientDoctorStation/treatPrint?record="+this.record_date+"&prescription_id="+this.prescription_id)
-
           this.getPrescriptionList(this.patientid)
           // this.$router.push("/outpatientDoctorStation/treatPrint?record="+this.record_date+"&prescription_id="+this.prescription_id)
 
@@ -406,7 +405,7 @@
           }
           this.$refs.child.createCaseHistory()
         } else if (index == 2) {
-          this.$router.push('/outpatientDoctorStation/recordPrint?record='+this.record_date)
+          this.$router.push('/outpatientDoctorStation/recordPrint?record='+this.record_date+"&patient_id="+this.patientid)
         } else if (index == 3) {
           this.$refs.medicalRecord.show()
         } else if (index == 4) {
@@ -444,7 +443,7 @@
            if(response.data.state == 1){
              this.centerDialogVisible = true
              var list = response.data.data.list
-             console.log("list9999999",list)
+             // console.log("list9999999",list)
              this.tableData = list
            }
         })

src/xt_pages/outpatientDoctorStation/recordPrint.vue

@@ -14,7 +14,7 @@
     </div>
     <div class="app-container" style="min-height:0;">
         <el-container class="newContainer">
-            <div style="width:270px;margin-right:20px;">
+            <!-- <div style="width:270px;margin-right:20px;">
                 <div class="cell clearfix" style="margin-bottom:10px;">
                     <el-input size="small"  v-model.trim="search_input" class="filter-item"/>
                     <el-button size="small" class="filter-item" type="primary" :model="keyword" @click="searchAction">搜索</el-button>
@@ -31,7 +31,7 @@
                         </template>
                     </el-table-column>
                 </el-table>
-            </div>
+            </div> -->
             
             <div class='dialysisPage' style="flex: 1;height: calc(100vh - 178px);overflow-x:auto;::-webkit-scrollbar:height:15px">
               <printOne v-bind:childResponse="childResponse" :patient="patient" :hispatient = "hispatient" :history="history"></printOne>

src/xt_pages/outpatientDoctorStation/recordTemplate/printOne.vue

@@ -93,7 +93,7 @@
 <script>
 
 import { getDataConfig } from "@/utils/data";
-import { getAllDoctorList } from "@/api/project/project"
+import { getAllDoctorList,getPatientCaseHistory } from "@/api/project/project"
 export default {
     props:{
       patient:Object,
@@ -137,12 +137,32 @@ export default {
         }
         return name
       },
-      
+      getPatientCaseHistory(){
+
+        const params = {
+          patient_id:this.$route.query.patient_id
+        }
+      console.log("病历22222",params)
+      getPatientCaseHistory(params).then(response=>{
+         if(response.data.state == 1){
+           var patient = response.data.data.patient
+           console.log("patinet",patient)
+           this.patient = patient
+           var history = response.data.data.history
+           console.log("history",history)
+           this.history = history
+           var hispatient = response.data.data.hispatient
+           console.log("hispatient",hispatient)
+           this.hispatient = hispatient
+         }
+      })
+    },
     },
     created(){
       this.educationOptions = getDataConfig("patient", "education_types");
       console.log("22222",this.educationOptions)
       this.getAllDoctorList()
+      this.getPatientCaseHistory()
     }
 }
 </script>

src/xt_pages/outpatientDoctorStation/template/printOne.vue

@@ -1,41 +1,48 @@
 <template>
-    <div id='prescription-print' class="prescription-print">
+  <div>
+    <div id='prescription-print' class="prescription-print"  v-for="(item,index) in advicePrint" :key="index">
         <div class="printTitle">血液透析中心处方笺</div>
         <div class="infoTitle">
-            <p>姓名：{{patient.name?patient.name:""}}</p>
+            <p>姓名：{{item.patient.name?item.patient.name:""}}</p>
             <p>性别：
-               <span v-if="patient.gender == 1">男</span>
-               <span v-if="patient.gender == 2">女</span>
+               <span v-if="item.patient.gender == 1">男</span>
+               <span v-if="item.patient.gender == 2">女</span>
             </p>
-            <p>年龄：{{patient.age?patient.age:""}}岁</p>
+            <p>年龄：{{item.patient.age?item.patient.age:""}}岁</p>
         </div>
         <div class="infoMain">
-            <div style="margin-bottom: 10px;">门诊号：{{this.hisPatient.number?this.hisPatient.number:""}}</div>
-            <div style="margin-bottom: 10px;">科室：{{getDepart(this.hisPatient.departments?this.hisPatient.departments:"")}}</div>
-            <div style="margin-bottom: 10px;">医保卡号：{{this.hisPatient.number?this.hisPatient.number:""}}</div>
-            <div style="margin-bottom: 10px;">电话：{{patient.phone}}</div>
-            <div>地址：{{patient.home_address}}</div>
-            <div style="display:flex;width:50%;">临床诊断：{{patient.diagnose}}</div>
+            <div style="margin-bottom: 10px;">门诊号：{{item.hisPatient.number?item.hisPatient.number:""}}</div>
+            <div style="margin-bottom: 10px;">科室：{{getDepart(item.hisPatient.departments?item.hisPatient.departments:"")}}</div>
+            <div style="margin-bottom: 10px;">医保卡号：{{item.hisPatient.number?item.hisPatient.number:""}}</div>
+            <div style="margin-bottom: 10px;">电话：{{item.patient.phone}}</div>
+            <div>地址：{{item.patient.home_address}}</div>
+            <div style="display:flex;width:50%;">临床诊断：{{item.patient.diagnose}}</div>
         </div>
         <div class="prescriptionBox">
             <div class="Rp">Rp:</div>
-            <div class="drugsBox" v-for="(item,index) in advicePrint" :key="index">
-                <div class="drugsOne">{{item.advice_name?item.advice_name:""}}&nbsp;&nbsp;{{item.single_dose}}{{item.single_dose_unit}}&nbsp;×&nbsp; {{item.prescribing_number}}{{item.prescribing_number_unit}}</div>
-                <div style="margin-left:100px;"><span>用法：{{item.single_dose}}{{item.single_dose_unit}}</span>&nbsp;&nbsp;<span>{{item.execution_frequency}}</span>&nbsp;&nbsp;<span>{{item.advice_desc}}</span></div>
+            <div class="drugsBox" v-for="(it,index) in item.advices" :key="index">
+                <div class="drugsOne">{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div>
+                <div style="margin-left:100px;"><span>用法：{{it.single_dose}}{{it.single_dose_unit}}</span>&nbsp;&nbsp;<span>{{it.execution_frequency}}</span>&nbsp;&nbsp;<span>{{it.advice_desc}}</span></div>
             </div>
         </div>
         <div class="doctorBox">
-            <p>医师：{{getDoctor(advicePrint[0].advice_doctor)?getDoctor(advicePrint[0].advice_doctor):""}}</p>
-            <p>日期：{{getTime(advicePrint[0].advice_date)?getTime(advicePrint[0].advice_date):""}}</p>
+            <p>医师：{{getDoctor(item.doctor)?getDoctor(item.doctor):""}}</p>
+            <p>日期：{{getTime(item.ctime)?getTime(item.ctime):""}}</p>
         </div>
         <div class="actionBar">
-            <p>审核：{{getDoctor(advicePrint[0].advice_doctor)?getDoctor(advicePrint[0].advice_doctor):""}}</p>
-            <p>配对：{{getDoctor(advicePrint[0].advice_doctor)?getDoctor(advicePrint[0].advice_doctor):""}}</p>
-            <p>核对：{{getDoctor(advicePrint[0].checker)?getDoctor(advicePrint[0].checker):""}}</p>
-            <p>发药：{{getDoctor(advicePrint[0].execution_staff)?getDoctor(advicePrint[0].execution_staff):""}}</p>
-            <p>药费：{{advicePrint[0].price?advicePrint[0].price:""}}</p>
+            <p>审核：{{getDoctor(item.advices[0].checker)?getDoctor(item.advices[0].checker):""}}</p>
+            <p>配对：{{getDoctor(item.doctor)?getDoctor(item.doctor):""}}</p>
+            <p>核对：{{getDoctor(item.advices[0].checker)?getDoctor(item.advices[0].checker):""}}</p>
+            <p>发药：{{getDoctor(item.advices[0].execution_staff)?getDoctor(item.advices[0].execution_staff):""}}</p>
+            <p>药费：</p>
         </div>
     </div>
+
+
+    
+</div>
+
+    
 </template>
 <script>
 import { jsGetAge, uParseTime } from '@/utils/tools'
@@ -92,29 +99,30 @@ export default {
           // prescription_id:this.prescription_id,
           patient_id:this.$route.query.patient_id,
           record_date:this.$route.query.record,
-          prescription_id:this.$route.query.prescription_id 
+          prescription_id:this.$route.query.prescription_id,
+          ids:this.$route.query.ids
         }
         console.log("params---",params)
        getPrescriptionPrint(params).then(response=>{
          if(response.data.state == 1){
             var advicePrint =  response.data.data.advicePrint
-            console.log("adviceprint",advicePrint)
+            console.log("adviceprint9999",advicePrint)
             this.advicePrint = advicePrint
-            var patient =  response.data.data.patient
-            console.log("patient",patient)
-            this.patient = patient
-            var doctorPorject = response.data.data.doctorPorject
+            // var patient =  response.data.data.patient
+            // console.log("patient",patient)
+            // this.patient = patient
+            // var doctorPorject = response.data.data.doctorPorject
           
-            var arr = doctorPorject.project
-              console.log("我的中谷歌",arr)
-            for(let i=0;i<arr.length;i++){
-              console.log("arr",arr[i].project_name)
-            }
-            this.tableData = arr
-            console.log("3333",this.tableData)
-            var prescriptioninfo = response.data.data.prescriptionInfo
-            console.log("prescriptioninfo",prescriptioninfo)
-            this.prescriptionInfo = prescriptioninfo
+            // var arr = doctorPorject.project
+            //   console.log("我的中谷歌",arr)
+            // for(let i=0;i<arr.length;i++){
+            //   console.log("arr",arr[i].project_name)
+            // }
+            // this.tableData = arr
+            // console.log("3333",this.tableData)
+            // var prescriptioninfo = response.data.data.prescriptionInfo
+            // console.log("prescriptioninfo",prescriptioninfo)
+            // this.prescriptionInfo = prescriptioninfo
           }
        })
      },
@@ -153,6 +161,8 @@ export default {
       this.getInitData()
       this.getPrescriptionPrint()
       this.getHisPatientDetail()
+
+     
    },
   //  watch:{
   //    patient_id:function(val){

src/xt_pages/outpatientDoctorStation/treatTemplate/printOne.vue

@@ -1,5 +1,6 @@
 <template>
-    <div id='prescription-print' class="prescription-print">
+   <div>
+    <div id='prescription-print' class="prescription-print" v-for="(item,index) in advicePrint" :key="index">
         <div style="display:flex;justify-content: space-between;font-weight:bold;">
             <p style="width:300px;display:flex;justify-content: space-between;font-weight:bold;">
                 <span>费别</span>
@@ -8,27 +9,27 @@
                 <span>保险</span>
                 <span>其他</span>
             </p>
-            <p>就诊日期：{{this.$route.query.record}}</p>
+            <p>就诊日期：{{getTime(item.ctime)}}</p>
         </div>
         <div class="printTitle">血液透析中心</div>
         <div class="printTitle">处方、治疗单</div>
         <div class="infoTitle">
-            <p>门诊编号：34567876532345678</p>
+            <p>门诊编号：</p>
             <p>电脑号：</p>
         </div>
         <div class="infoMain">
-            <p style="margin-bottom: 10px;width:25%">姓名：{{patient.name}}</p>
+            <p style="margin-bottom: 10px;width:25%">姓名：{{item.patient.name}}</p>
             <p style="margin-bottom: 10px;width:25%">性别：
-                <span v-if="patient.gender == 1">男</span>
-                <span v-if="patient.gender == 2">女</span>
+                <span v-if="item.patient.gender == 1">男</span>
+                <span v-if="item.patient.gender == 2">女</span>
             </p>
             <p style="margin-bottom: 10px;width:25%">年龄：
-                <span>{{patient.age}}</span>
+                <span>{{item.patient.age}}</span>
             </p>
             <p style="margin-bottom: 10px;width:25%">参保类型：</p>
-            <p style="margin-bottom: 10px;width:50%;">联系电话：{{patient.phone}}</p>
-            <p style="width:50%;">地址：{{patient.unit_address}}</p>
-            <p style="width:50%;">诊断：{{patient.diagnose}}</p>
+            <p style="margin-bottom: 10px;width:50%;">联系电话：{{item.patient.phone}}</p>
+            <p style="width:50%;">地址：{{item.patient.unit_address}}</p>
+            <p style="width:50%;">诊断：{{item.patient.diagnose}}</p>
         </div>
         <div class="prescriptionBox">
             <table style="width:100%;text-align:center;line-height:25px;">
@@ -42,25 +43,25 @@
                     <td>备注</td>
                     <td>天数</td>
                 </tr>
-                <tr v-for="(item,index) in this.tableData" :key="index">
+                <tr v-for="(it,index) in item.project" :key="index">
                     <td>{{index+1}}</td>
-                    <td>{{item.project_name}}</td>
-                    <td>{{item.single_dose}}</td>
-                    <td>{{item.unit}}</td>
-                    <td>{{item.price}}</td>
+                    <td>{{getProjectName(it.project_id)}}</td>
+                    <td>{{it.single_dose}}</td>
+                    <td>{{getUnit(it.unit)}}</td>
+                    <td>{{it.price}}</td>
                     <td></td>
-                    <td>{{item.remark}}</td>
-                    <td>{{item.day}}</td>
+                    <td>{{it.remark}}</td>
+                    <td>{{it.day}}</td>
                    
                 </tr>
             </table>
         </div>
         <div class="infoTitle">
-            <p>开单医生：{{getDoctor(this.prescriptionInfo[0].creator)?getDoctor(this.prescriptionInfo[0].creator):""}}</p>
+            <p>开单医生：{{getDoctor(item.doctor)?getDoctor(item.doctor):""}}</p>
             <p>签章：</p>
         </div>
         <div class="actionBar">
-            <p>执行医生：{{getDoctor(this.prescriptionInfo[0].creator)?getDoctor(this.prescriptionInfo[0].creator):""}}</p>
+            <p>执行医生：{{getDoctor(item.doctor)?getDoctor(item.doctor):""}}</p>
             <p>费用：</p>
         </div>
         <table style="width:100%;text-align:center;line-height:25px;border-collapse: collapse;" border="1">
@@ -89,6 +90,7 @@
                 <td style="width:16px;"></td>
             </tr>
         </table>
+     </div>
     </div>
 </template>
 <script>
@@ -106,7 +108,8 @@ export default {
         advicePrint:{},
         patient:{},
         tableData:[],
-        prescriptionInfo:[]
+        prescriptionInfo:[],
+        projectList:[]
       }
     },
    methods:{
@@ -155,7 +158,8 @@ export default {
         //   prescription_id:this.prescription_id,
           patient_id:this.$route.query.patient_id,
           record_date:this.$route.query.record,
-          prescription_id:this.$route.query.prescription_id 
+          prescription_id:this.$route.query.prescription_id,
+          ids:this.$route.query.ids, 
         }
         console.log("999999",params)
        getPrescriptionPrint(params).then(response=>{
@@ -163,24 +167,29 @@ export default {
             var advicePrint =  response.data.data.advicePrint
             console.log("adviceprint",advicePrint)
             this.advicePrint = advicePrint
-            var patient =  response.data.data.patient
-            console.log("patient",patient)
-            this.patient = patient
-            this.tableData = arr
-            console.log("3333",this.tableData)
-            var prescriptioninfo = response.data.data.prescriptionInfo
-            console.log("prescriptioninfo",prescriptioninfo)
-            this.prescriptionInfo = prescriptioninfo
-
-            var doctorPorject = response.data.data.doctorPorject
-          
-            var arr = doctorPorject.project
-              console.log("治疗单",arr)
-            for(let i=0;i<arr.length;i++){
-              console.log("arr",arr[i].project_name)
-            }
+            var projectlist =  response.data.data.projectlist
+            console.log("所有项目列表",projectlist)
+            this.projectList = projectlist
           }
        })
+     },
+     getProjectName(id){
+        var project_name = ""
+        for(let i=0;i<this.projectList.length;i++){
+           if(id == this.projectList[i].id){
+               project_name = this.projectList[i].project_name
+           }
+        }
+        return project_name
+     },
+     getUnit(id){
+        var unit=""
+       for(let i=0;i<this.projectList.length;i++){
+           if(id == this.projectList[i].id){
+               unit = this.projectList[i].unit
+           }
+        }
+        return unit
      }
    },
    created(){

src/xt_pages/outpatientRegistration/index.vue

@@ -117,7 +117,7 @@
                         </el-select>
                     </el-form-item>
                     <el-form-item label="医生："  prop="doctor" :validate-event="is_Name" >
-                        <el-select v-model="form.doctor" placeholder="请选择">
+                        <el-select v-model="form.doctor" placeholder="请选择" @change="changeDoctor">
                             <el-option
                             v-for="item in doctorList"
                             :key="item.admin_user_id"
@@ -394,6 +394,7 @@ export default {
            getAllDoctorList().then(response=>{
              if(response.data.state == 1){
                var doctor =  response.data.data.doctor
+               console.log("doctor-----",doctor)
                this.doctorList = doctor
                var department = response.data.data.department
                console.log("department",department)
@@ -520,8 +521,21 @@ export default {
        },
        getDictionaryDataConfig(module, filed_name) {
         return getDictionaryDataConfig(module, filed_name)
-
       },
+
+      changeDoctor(id){
+          
+         for(let i=0;i<this.doctorList.length;i++){
+            if(this.doctorList[i].admin_user_id == id){
+              if(this.doctorList[i].department_id == 0){
+                 this.form.department = this.departmentList[0].id
+              }else{
+                this.form.department = this.doctorList[i].department_id
+              }
+             
+            }
+         }
+      }
     },
     created(){
       //获取当前机构有人员信息