合并带嘛

src/xt_pages/hospitalStation/invoiceTemplate/printThree.vue

@@ -69,7 +69,7 @@
             <div style="position: absolute;top:160px;left:220px">检查费</div>
             <div style="position: absolute;top:160px;left:290px">{{ list.checkCostTotal?list.checkCostTotal:'0.00' }}</div>
             <div style="position: absolute;top:160px;left:400px">材料费</div>
-            <div style="position: absolute;top:160px;left:470px">0.00</div>
+            <div style="position: absolute;top:160px;left:470px">{{list.materialCostTotal?list.materialCostTotal:"0.00"}}</div>
             <div style="position: absolute;top:160px;left:580px">麻醉费</div>
             <div style="position: absolute;top:160px;left:650px">0.00</div>
         </div>

src/xt_pages/hospitalStation/listTemplate/printTwo.vue

@@ -6,7 +6,7 @@
       </div>
       <!-- <div class="listTitle" :style="{position: 'absolute',top:(20 + (index * 160))  + 'px',left:200+ 'px',}">赤峰市肿瘤医院病人费用明细清单</div> -->
       <div class="listInfo">
-        <div>病人ID:</div>
+        <div>个人编码:{{order.psn_no}}</div>
         <div>住院号：{{ patient.dialysis_no }}</div>
         <div>次数：</div>
         <div>姓名：{{ patient.name }}</div>

src/xt_pages/outpatientCharges/components/registerDialog.vue

@@ -657,6 +657,8 @@
                 that.form.phone = patient.phone
                 that.form.id_card = patient.id_card_no
                 that.form.medical_insurance_card = response.data.data.number
+                that.form.social_type = parseInt(response.data.data.insutype)
+
 
               } else if (that.form.id_card_type == 2) {
                 that.form.id = patient.id
@@ -674,6 +676,8 @@
                 that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}')
                 that.form.phone = patient.phone
                 that.form.id_card = patient.id_card_no
+                that.form.social_type = parseInt(response.data.data.insutype)
+
               }
               that.$message({ message: '读卡成功', type: 'success' })
             }

src/xt_pages/outpatientCharges/invoiceTemplate/printTwo.vue

@@ -48,10 +48,10 @@
             <div style="position: absolute;top:170px;left:640px">{{ list.otherCostTotal }}</div>
         </div>
         <div style="display:flex;justify-content: space-between;">
-            <div style="position: absolute;top:200px;left:40px"></div>
-            <div style="position: absolute;top:200px;left:110px"></div>
-            <div style="position: absolute;top:200px;left:200px"></div>
-            <div style="position: absolute;top:200px;left:280px"></div>
+            <div style="position: absolute;top:170px;left:560px"></div>
+            <div style="position: absolute;top:170px;left:640px"></div>
+            <div style="position: absolute;top:200px;left:200px">诊察费</div>
+            <div style="position: absolute;top:200px;left:280px">{{ list.zhenChaCostTotal }}</div>
             <div style="position: absolute;top:200px;left:380px">材料费</div>
             <div style="position: absolute;top:200px;left:460px">{{ list.materialCostTotal }}</div>
             <div style="position: absolute;top:200px;left:560px"></div>
@@ -152,7 +152,7 @@ export default {
                 console.log('res',res)
                 this.list = res.data.data
                 this.totalPrice = this.list.westernMedicineCostTotal + this.list.checkCostTotal + this.list.treatCostTotal + this.list.bedCostTotal + this.list.chineseTraditionalMedicineCostTotal +
-                                    this.list.laboratoryCostTotal + this.list.operationCostTotal + this.list.otherCostTotal + this.list.materialCostTotal
+                                    this.list.laboratoryCostTotal + this.list.operationCostTotal + this.list.otherCostTotal + this.list.materialCostTotal + this.list.zhenChaCostTotal
                 this.smalltoBIG(this.totalPrice)
                 var data = new Date(res.data.data.date * 1000);
                 var month =data.getMonth() < 9 ? "0" + (data.getMonth() + 1) : data.getMonth() + 1;

src/xt_pages/outpatientCharges/listTemplate/printTwo10265.vue

@@ -4,7 +4,7 @@
       <div class="listTitle">{{$store.getters.xt_user.org.org_name}}费用清单</div>
       <!-- <div class="listTitle" :style="{position: 'absolute',top:(20 + (index * 160))  + 'px',left:200+ 'px',}">赤峰市肿瘤医院病人费用明细清单</div> -->
       <div class="listInfo">
-        <div>病人ID:{{order.psn_no}}</div>
+        <div>个人编码:{{order.psn_no}}</div>
         <div>住院号：{{ order.mdtrt_id }}</div>
 <!--        <div>次数：</div>-->
         <div>姓名：{{ order.psn_name }}</div>
@@ -59,8 +59,7 @@
 
         <tr>
           <td style="width: 20%;white-space: nowrap;">甲类：{{item.jiaTotal?item.jiaTotal:"0.00"}}</td>
-          <td style="width: 20%;white-space: nowrap;">乙类药品：{{item.yiTotal?item.yiTotal:"0.00"}}</td>
-          <td style="width: 5%;white-space: nowrap;">非药品：{{0.00}}</td>
+          <td style="width: 20%;white-space: nowrap;" >乙类：{{item.yiTotal?item.yiTotal:"0.00"}}</td>
           <td style="width: 5%;white-space: nowrap;">丙类：{{item.bingTotal?item.bingTotal:"0.00"}}</td>
           <td style="width: 5%;white-space: nowrap;">其他：{{0.00}}</td>
           <td></td>

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -985,11 +985,11 @@ export default {
         { value: 11, label: '普通门诊' },
         { value: 14, label: '门诊特殊病' },
         { value: '9922', label: '家庭通道' },
-        { value: '1111', label: '精一' },
-        { value: '1112', label: '精二' },
         { value: '9933', label: '门诊特殊病(9933)' },
         { value: '990602', label: '门诊特殊病(990602)' },
         { value: '1402', label: '门诊特殊病(1402)' },
+        { value: '1111', label: '精一' },
+        { value: '1112', label: '精二' },
         { value: '0', label: '自费' }
 
       ],
@@ -4359,9 +4359,16 @@ export default {
                 this.form.diagnosis = []
               } else {
                 for (let i = 0; i < response.data.data.info.diagnosis.split(',').length; i++) {
-                  this.form.diagnosis.push(response.data.data.info.diagnosis.split(',')[i])
+                  this.form.diagnosis.push(parseInt(response.data.data.info.diagnosis.split(',')[i]))
                 }
               }
+              console.log("~~~~~~")
+              console.log(this.form.diagnosis)
+              console.log(this.diagnoses)
+              console.log("~~~~~~")
+
+
+
               this.sick_history = this.info.sick_history
               if (this.info.register_type == 0) {
                 this.form.p_type = ''
@@ -4377,7 +4384,7 @@ export default {
                 this.form.diagnosis = []
               } else {
                 for (let i = 0; i < response.data.data.last_info.diagnosis.split(',').length; i++) {
-                  this.form.diagnosis.push(response.data.data.last_info.diagnosis.split(',')[i])
+                  this.form.diagnosis.push(parseInt(response.data.data.last_info.diagnosis.split(',')[i]))
                 }
               }
 

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -532,12 +532,12 @@
         register: [
           { value: 11, label: '普通门诊' },
           { value: 14, label: '门诊特殊病' },
-          { value: 1111, label: '精一' },
-          { value: 1112, label: '精二' },
           { value: 9922, label: '家庭通道' },
           { value: 9933, label: '门诊特殊病(9933)' },
           { value: 990602, label: '门诊特殊病(990602)' },
           { value: 1402, label: '门诊特殊病(1402)' },
+          { value: 1111, label: '精一' },
+          { value: 1112, label: '精二' },
           { value: 0, label: '自费' }