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

src/xt_pages/data/druguse.vue

@@ -93,7 +93,7 @@
                   <el-form-item label="医嘱名称 :" required prop="advice_name">
                     <el-input v-model="templateForm.advice_name" style="width:50%"></el-input>
                   </el-form-item>
-               </el-col> 
+               </el-col>
               <!-- <el-form-item label="医嘱内容 :" prop="advice_desc">
                 <el-input v-model="templateForm.advice_desc" style="width:50%"></el-input>
               </el-form-item> -->
@@ -167,7 +167,7 @@
                   </el-form-item>
                 </el-col>
               </el-row>
-              <el-row>  
+              <el-row>
                 <el-col :span="12">
                   <el-form-item label="执行频率 :" prop="execution_frequency">
                     <el-select
@@ -395,6 +395,7 @@
             <el-form ref="efForm" :rules="efRules" :model="efForm" label-width="90px">
               <el-form-item label="执行频率 :" required prop="name">
                 <el-input v-model="efForm.name" placeholder="执行频率"></el-input>
+                <el-input v-model="efForm.code" placeholder="编码"></el-input>
               </el-form-item>
             </el-form>
             <div slot="footer" class="dialog-footer">
@@ -486,7 +487,8 @@ export default {
       },
       efForm: {
         name: "",
-        id: 0
+        id: 0,
+        code:"",
       },
       unitsOption: [
         { lable: 1, name: "盒" },

src/xt_pages/data/druguseTemplate.vue

@@ -1251,7 +1251,15 @@
               <el-form ref="efForm" :rules="efRules" :model="efForm" label-width="90px">
                 <el-form-item label="执行频率 :" required prop="name">
                   <el-input v-model="efForm.name" placeholder="执行频率"></el-input>
+
                 </el-form-item>
+
+
+                <el-form-item label="执行频率 :" >
+                  <el-input v-model="efForm.code" placeholder="编码"></el-input>
+                </el-form-item>
+
+
               </el-form>
               <div slot="footer" class="dialog-footer">
                 <el-button @click="efFormVisible = false">取消</el-button>
@@ -1438,7 +1446,8 @@
         },
         efForm: {
           name: '',
-          id: 0
+          id: 0,
+          code: "",
         },
 
         drugforms: [
@@ -1976,6 +1985,7 @@
         this.dialogTitle = '新增给药途径'
         this.isEdit = false
       },
+
       handleUpdateDrugWay(row, index) {
         this.currentIndex = index
         this.drugwayForm = {
@@ -2061,7 +2071,8 @@
         this.currentIndex = index
         this.efForm = {
           name: row.name,
-          id: row.id
+          id: row.id,
+          code: row.code
         }
 
         this.efFormVisible = true

src/xt_pages/hospitalStation/components/chargeDialog.vue

@@ -77,12 +77,12 @@
         ></el-input>
       </el-form-item>
 
-      <el-form-item label="支付方式：" style="width:100%;">
-        <el-radio-group v-model="form.pay_way">
+    <el-form-item label="支付方式：" style="width:100%;">
+         <el-radio-group v-model="form.pay_way">
           <el-radio :label="item.value" :value="item.value" v-for="(item,index) in payWays" :key="index">{{ item.label }}</el-radio>
-          <el-button type="primary" v-if="form.pay_way == 4" @click="reading()">读卡</el-button>
+           <el-button type="primary" v-if="form.pay_way == 4" @click="reading()">读卡</el-button>
 
-        </el-radio-group>
+         </el-radio-group>
       </el-form-item>
 
       <el-form-item label="个人现金支付方式：" style="width: 100%">
@@ -167,7 +167,7 @@
 
     <span slot="footer" class="dialog-footer">
     <el-button @click="cancel('formValue')">取 消</el-button>
-      <!--      <el-button @click="init">调试</el-button>-->
+<!--      <el-button @click="init">调试</el-button>-->
     <el-button type="primary" @click="confirm('formValue')">确 定</el-button>
   </span>
   </el-dialog>
@@ -259,186 +259,186 @@
         default: 1,
       },
     },
-    created() {
-    },
-    methods: {
-      reading() {
-        var that = this
-        let params = {
-          'id_card_type': 1,
-          'admin_user_id': this.$store.getters.xt_user.user.id,
-          'certificates':1,
-        }
-        axios.get('http://127.0.0.1:9532/zh/api/readcard', {
-          params: params
-        })
-          .then(function(response) {
-            if (response.data.state == 0) {
-              that.$message.error(response.data.msg)
-              return false
-            } else {
-              that.$message({ message: '读卡成功', type: 'success' })
-            }
-          })
-          .catch(function(error) {
-
-          })
-      },
-
-      init() {
-        console.log("====this.form.dec_way===", this.form.dec_way)
+      created() {
       },
-      lilili(val) {
-        console.log("val", val)
-        if (this.form.tmp_decimal == "") {
-          this.form.pay_price = this.tmp_pay
-          return
-        }
-        if (parseFloat(this.form.tmp_decimal) > parseFloat(this.form.private_price)) {
-          // alert("押金不得大于自费金额")
-          this.$message.error("押金不得大于自费金额");
-          this.form.tmp_decimal = ""
-          this.form.pay_price = this.tmp_pay
-          return
-        }
-        // this.form.private_price = parseFloat(this.form.tmp_decimal) + parseFloat(this.form.pay_price)
+      methods: {
+        reading() {
+          var that = this
+          let params = {
+            'id_card_type': 1,
+            'admin_user_id': this.$store.getters.xt_user.user.id,
+            'certificates':1,
+          }
+          axios.get('http://127.0.0.1:9532/zh/api/readcard', {
+            params: params
+          })
+              .then(function(response) {
+                if (response.data.state == 0) {
+                  that.$message.error(response.data.msg)
+                  return false
+                } else {
+                  that.$message({ message: '读卡成功', type: 'success' })
+                }
+              })
+              .catch(function(error) {
+
+              })
+        },
 
-        this.form.pay_price = ((parseFloat(this.form.private_price) * 10000 - parseFloat(this.form.tmp_decimal) * 10000) / 10000).toFixed(2)
-      },
-      changedecimal() {
-        // console.log("this.isshow前",this.isshow)
-        this.$forceUpdate();
-        this.isshow = this.form.dec_way
-        // console.log("this.form.dec_way后",this.form.dec_way)
-        if (this.isshow == false) {
-          // this.form.private_price = parseFloat(this.form.pay_price)
-          this.form.tmp_decimal = 0
-          this.form.pay_price = this.tmp_pay
-        } else {
-          //储存临时付款
-          this.tmp_pay = this.form.pay_price
+        init() {
+          console.log("====this.form.dec_way===", this.form.dec_way)
+        },
+        lilili(val) {
+          console.log("val", val)
+          if (this.form.tmp_decimal == "") {
+            this.form.pay_price = this.tmp_pay
+            return
+          }
           if (parseFloat(this.form.tmp_decimal) > parseFloat(this.form.private_price)) {
-            this.form.tmp_decimal = 0
             // alert("押金不得大于自费金额")
             this.$message.error("押金不得大于自费金额");
+            this.form.tmp_decimal = ""
+            this.form.pay_price = this.tmp_pay
             return
           }
           // this.form.private_price = parseFloat(this.form.tmp_decimal) + parseFloat(this.form.pay_price)
-          this.tmp_pay = this.form.pay_price
+
           this.form.pay_price = ((parseFloat(this.form.private_price) * 10000 - parseFloat(this.form.tmp_decimal) * 10000) / 10000).toFixed(2)
-        }
-      },
-      //查询用户当前的余额
-      updateconfig() {
-        var params = {
-          his_patient_id: this.id,
-        }
-        idtobalance(params).then((res) => {
-          if (res.data.state == 1) {
-            this.decimal = res.data.data.list;
+        },
+        changedecimal() {
+          // console.log("this.isshow前",this.isshow)
+          this.$forceUpdate();
+          this.isshow = this.form.dec_way
+          // console.log("this.form.dec_way后",this.form.dec_way)
+          if (this.isshow == false) {
+            // this.form.private_price = parseFloat(this.form.pay_price)
+            this.form.tmp_decimal = 0
+            this.form.pay_price = this.tmp_pay
+          } else {
+            //储存临时付款
+            this.tmp_pay = this.form.pay_price
+            if (parseFloat(this.form.tmp_decimal) > parseFloat(this.form.private_price)) {
+              this.form.tmp_decimal = 0
+              // alert("押金不得大于自费金额")
+              this.$message.error("押金不得大于自费金额");
+              return
+            }
+            // this.form.private_price = parseFloat(this.form.tmp_decimal) + parseFloat(this.form.pay_price)
+            this.tmp_pay = this.form.pay_price
+            this.form.pay_price = ((parseFloat(this.form.private_price) * 10000 - parseFloat(this.form.tmp_decimal) * 10000) / 10000).toFixed(2)
+          }
+        },
+        //查询用户当前的余额
+        updateconfig() {
+          var params = {
+            his_patient_id: this.id,
+          }
+          idtobalance(params).then((res) => {
+            if (res.data.state == 1) {
+              this.decimal = res.data.data.list;
+            }
+          })
+        },
+        show(total,order,id) {
+          this.record_date = moment(new Date()).add('year', 0).format("YYYY-MM-DD HH:mm")
+          //初始化
+          this.form.tmp_decimal = 0
+          this.tmp_pay = 0
+          this.id = id
+          this.updateconfig()
+          this.form.dec_way = false
+          this.form.total = total
+          this.form.private_price = total
+          this.form.pay_price = total
+          this.form.total = total + this.form.medical_insurance_price
+          this.form.discount_price = 0.0
+          this.form.preferential_price = 0.0
+
+          this.form.fapiao_code = "";
+          this.form.fapiao_number = "";
+          this.order = order;
+
+          if (this.order && this.order.id > 0) {
+            this.form.acct_pay = this.order.acct_pay
+            this.form.psn_pay = this.order.psn_cash_pay
+            this.form.total = this.order.medfee_sumamt
+            this.form.pay_price = (this.order.medfee_sumamt).toFixed(2)
+            this.form.medical_insurance_price = this.order.fund_pay_sumamt
+            this.form.private_price = this.order.psn_part_amt
           }
-        })
-      },
-      show(total,order,id) {
-        this.record_date = moment(new Date()).add('year', 0).format("YYYY-MM-DD HH:mm")
-        //初始化
-        this.form.tmp_decimal = 0
-        this.tmp_pay = 0
-        this.id = id
-        this.updateconfig()
-        this.form.dec_way = false
-        this.form.total = total
-        this.form.private_price = total
-        this.form.pay_price = total
-        this.form.total = total + this.form.medical_insurance_price
-        this.form.discount_price = 0.0
-        this.form.preferential_price = 0.0
-
-        this.form.fapiao_code = "";
-        this.form.fapiao_number = "";
-        this.order = order;
-
-        if (this.order && this.order.id > 0) {
-          this.form.acct_pay = this.order.acct_pay
-          this.form.psn_pay = this.order.psn_cash_pay
-          this.form.total = this.order.medfee_sumamt
-          this.form.pay_price = (this.order.medfee_sumamt).toFixed(2)
-          this.form.medical_insurance_price = this.order.fund_pay_sumamt
-          this.form.private_price = this.order.psn_part_amt
-        }
 
-        this.visibility = true
+          this.visibility = true
 
-      },
-      hide: function() {
-        this.form = Object.assign({}, this.resetForm);
-        this.loadingtwo = false;
-        this.visibility = false
-      }, cancel: function(formName) {
-        this.form.tmp_decimal = 0
-        this.tmp_pay = 0
-        this.form.dec_way = false
-        this.$emit('cancel', this.getValue());
-        this.$refs['formValue'].resetFields()
-      },
-      confirm: function(formName) {
-        if (parseFloat(this.form.tmp_decimal) > parseFloat(this.decimal)){
-          this.$message.error("押金余额不足");
-          return
-        }
-        this.$refs['formValue'].validate((valid) => {
-          if (valid) {
-            let value = {};
-            value = this.getValue();
-            this.$emit('confirm', value);
-            this.loadingtwo = true
+        },
+        hide: function() {
+          this.form = Object.assign({}, this.resetForm);
+          this.loadingtwo = false;
+          this.visibility = false
+        }, cancel: function(formName) {
+          this.form.tmp_decimal = 0
+          this.tmp_pay = 0
+          this.form.dec_way = false
+          this.$emit('cancel', this.getValue());
+          this.$refs['formValue'].resetFields()
+        },
+        confirm: function(formName) {
+          if (parseFloat(this.form.tmp_decimal) > parseFloat(this.decimal)){
+            this.$message.error("押金余额不足");
+            return
           }
-        })
-      },
-      getValue: function() {
-        let form = {};
-        form = this.form;
-        return form
-      },
-      realityPrice(val) {
-        if (val < (this.form.total - this.form.discount_price - this.form.preferential_price)) {
-          this.$message.error('实收金额不能小于收费金额');
-          return
-        }
-        this.form.found_price = parseInt(val) - parseInt(this.form.total) + parseInt(this.form.discount_price) + parseInt(this.form.preferential_price)
-      },
-      changeDiscountPrice(val) {
-        if (val > this.form.total) {
-          this.$message.error('折扣金额不能超过费用总额');
-          return
+          this.$refs['formValue'].validate((valid) => {
+            if (valid) {
+              let value = {};
+              value = this.getValue();
+              this.$emit('confirm', value);
+              this.loadingtwo = true
+            }
+          })
+        },
+        getValue: function() {
+          let form = {};
+          form = this.form;
+          return form
+        },
+        realityPrice(val) {
+          if (val < (this.form.total - this.form.discount_price - this.form.preferential_price)) {
+            this.$message.error('实收金额不能小于收费金额');
+            return
+          }
+          this.form.found_price = parseInt(val) - parseInt(this.form.total) + parseInt(this.form.discount_price) + parseInt(this.form.preferential_price)
+        },
+        changeDiscountPrice(val) {
+          if (val > this.form.total) {
+            this.$message.error('折扣金额不能超过费用总额');
+            return
+          }
+          this.form.reality_price = parseInt(this.form.total) - parseInt(val) - parseInt(this.form.preferential_price)
+        },
+        changePreferentialPrice(val) {
+          if (val > this.form.total) {
+            this.$message.error('优惠金额不能超过费用总额');
+            return
+          }
+          this.form.reality_price = parseInt(this.form.total) - parseInt(val) - parseInt(this.form.discount_price)
         }
-        this.form.reality_price = parseInt(this.form.total) - parseInt(val) - parseInt(this.form.preferential_price)
       },
-      changePreferentialPrice(val) {
-        if (val > this.form.total) {
-          this.$message.error('优惠金额不能超过费用总额');
-          return
-        }
-        this.form.reality_price = parseInt(this.form.total) - parseInt(val) - parseInt(this.form.discount_price)
+      mounted() {
+        var nowDate = new Date();
+        var nowYear = nowDate.getFullYear();
+        var nowMonth = nowDate.getMonth() + 1;
+        var nowDay = nowDate.getDate();
+
+        var nowHours = nowDate.getHours();
+        var nowMin = nowDate.getMinutes();
+        var nowSecond = nowDate.getSeconds();
+
+        this.record_date =
+          nowYear +
+          '-' +
+          (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
+          '-' +
+          (nowDay < 10 ? '0' + nowDay : nowDay) + " " + (nowHours < 10 ? '0' + nowHours : nowHours) + ":" + (nowMin < 10 ? '0' + nowMin : nowMin)
       }
-    },
-    mounted() {
-      var nowDate = new Date();
-      var nowYear = nowDate.getFullYear();
-      var nowMonth = nowDate.getMonth() + 1;
-      var nowDay = nowDate.getDate();
-
-      var nowHours = nowDate.getHours();
-      var nowMin = nowDate.getMinutes();
-      var nowSecond = nowDate.getSeconds();
-
-      this.record_date =
-        nowYear +
-        '-' +
-        (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
-        '-' +
-        (nowDay < 10 ? '0' + nowDay : nowDay) + " " + (nowHours < 10 ? '0' + nowHours : nowHours) + ":" + (nowMin < 10 ? '0' + nowMin : nowMin)
-    }
 
 
   }
@@ -446,16 +446,16 @@
 
 
 <style lang="scss" scoped>
-  /deep/input::-webkit-input-placeholder {
-    color: red;
-    font-size: 15px;
-  }
-
-  /deep/.el-input__inner {
-    background-color: transparent !important;
-    border: 1px solid red;
-  }
-  .chargeDialog {
+/deep/input::-webkit-input-placeholder {
+  color: red;
+  font-size: 15px;
+}
+
+/deep/.el-input__inner {
+  background-color: transparent !important;
+  border: 1px solid red;
+}
+.chargeDialog {
   .el-form {
     display: flex;
     flex-wrap: wrap;
@@ -463,13 +463,13 @@
   .el-form-item {
     width: 50%;
   }
-  }
-  .input_style {
-    border-radius: 5px;
-    border: 1px solid #dddddd;
-  }
-  .input_style:focus {
-    outline:none;
-    border: 1px solid #66b1ff;
-  }
+}
+.input_style {
+  border-radius: 5px;
+  border: 1px solid #dddddd;
+}
+.input_style:focus {
+outline:none;
+border: 1px solid #66b1ff;
+}
 </style>

src/xt_pages/outpatientCharges/components/registerDialog.vue

@@ -638,6 +638,7 @@
           'admin_user_id': this.$store.getters.xt_user.user.id,
           'certificates':this.form.certificates,
         }
+        axios.defaults.retry = 0
         axios.get('http://127.0.0.1:9532/api/readcard', {
           params: params
         })

src/xt_pages/outpatientCharges/statementTemplate/printFive.vue

@@ -22,142 +22,142 @@
         <td colspan="10">明细信息</td>
       </tr>
 
-      <!-- 帐单列表分为左右两列，需要对数据进行x/2分别放进list_L，list_R两个数组进行循环 -->
-      <tr>
-        <!--          <td colspan="24">-->
-        <!--            <template v-for="(v, i) in info.list" >-->
-        <!--              <el-row gutter="24" >-->
-        <!--                <el-col span="12" :key="i" v-if='i%2 == 0'>-->
-        <!--                  <table class="list_table">-->
-        <!--                    <template>-->
-        <!--                      <tr colspan="12">-->
-        <!--                        <td colspan="2">{{v.name}}</td>-->
-        <!--                        <td>{{v.spec}}</td>-->
-        <!--                        <td>{{v.cnt}}</td>-->
-        <!--                        <td>{{v.det_item_fee_sumamt}}</td>-->
-        <!--                      </tr>-->
-        <!--                    </template>-->
-        <!--                  </table>-->
-        <!--                </el-col>-->
-        <!--                <el-col span="12" v-if="i+1 < info.list.length">-->
-        <!--                  <table class="list_table">-->
-        <!--                    <template >-->
-        <!--                      <tr colspan="12">-->
-        <!--                        <td colspan="2">{{v.name}}</td>-->
-        <!--                        <td>{{v.spec}}</td>-->
-        <!--                        <td>{{v.cnt}}</td>-->
-        <!--                        <td>{{v.det_item_fee_sumamt}}</td>-->
-        <!--                      </tr>-->
-        <!--                    </template>-->
-        <!--                  </table>-->
-        <!--                </el-col>-->
-        <!--              </el-row>-->
-        <!--            </template>-->
-        <!--          </td>-->
-      <tr>
-        <td colspan="6">
-          <table class="list_table">
-            <tr colspan="6" v-for="(v, index) in info.L_list" :key="index">
-              <td colspan="2">{{v.name}}</td>
-              <td>{{v.spec}}</td>
-              <td>{{v.cnt}}</td>
-              <td>{{v.det_item_fee_sumamt}}</td>
-            </tr>
-          </table>
-        </td>
+        <!-- 帐单列表分为左右两列，需要对数据进行x/2分别放进list_L，list_R两个数组进行循环 -->
+        <tr>
+<!--          <td colspan="24">-->
+<!--            <template v-for="(v, i) in info.list" >-->
+<!--              <el-row gutter="24" >-->
+<!--                <el-col span="12" :key="i" v-if='i%2 == 0'>-->
+<!--                  <table class="list_table">-->
+<!--                    <template>-->
+<!--                      <tr colspan="12">-->
+<!--                        <td colspan="2">{{v.name}}</td>-->
+<!--                        <td>{{v.spec}}</td>-->
+<!--                        <td>{{v.cnt}}</td>-->
+<!--                        <td>{{v.det_item_fee_sumamt}}</td>-->
+<!--                      </tr>-->
+<!--                    </template>-->
+<!--                  </table>-->
+<!--                </el-col>-->
+<!--                <el-col span="12" v-if="i+1 < info.list.length">-->
+<!--                  <table class="list_table">-->
+<!--                    <template >-->
+<!--                      <tr colspan="12">-->
+<!--                        <td colspan="2">{{v.name}}</td>-->
+<!--                        <td>{{v.spec}}</td>-->
+<!--                        <td>{{v.cnt}}</td>-->
+<!--                        <td>{{v.det_item_fee_sumamt}}</td>-->
+<!--                      </tr>-->
+<!--                    </template>-->
+<!--                  </table>-->
+<!--                </el-col>-->
+<!--              </el-row>-->
+<!--            </template>-->
+<!--          </td>-->
+        <tr>
+          <td colspan="6">
+            <table class="list_table">
+              <tr colspan="6" v-for="(v, index) in info.L_list" :key="index">
+                <td colspan="2">{{v.name}}</td>
+                <td>{{v.spec}}</td>
+                <td>{{v.cnt}}</td>
+                <td>{{v.det_item_fee_sumamt}}</td>
+              </tr>
+            </table>
+          </td>
 
-        <td colspan="6">
-          <table class="list_table">
-            <tr colspan="6" v-for="(v, index) in info.R_list" :key="index">
-              <td colspan="2">{{v.name}}</td>
-              <td>{{v.spec}}</td>
-              <td>{{v.cnt}}</td>
-              <td>{{v.det_item_fee_sumamt}}</td>
-            </tr>
-          </table>
-        </td>
-      </tr>
-      <tr>
-        <td colspan="10">共一页，第一页{{info.medfee_sumamt}}</td>
-      </tr>
-      <tr class="dashed_tr">
-        <td colspan="10">结付分类</td>
-      </tr>
-      <tr>
-        <td colspan="10">
-          <div>费用总计：{{info.medfee_sumamt}}</div>
-          <div>统筹支付：{{info.fund_pay_sumamt}}</div>
-          <div>账户支付：{{info.acct_pay}}</div>
-          <div>个人现金支付：{{info.cash_payamt}}</div>
-          <div>其他支付：{{info.oth_pay}}</div>
-          <div>减免金额：</div>
-        </td>
-      </tr>
+          <td colspan="6">
+            <table class="list_table">
+              <tr colspan="6" v-for="(v, index) in info.R_list" :key="index">
+                <td colspan="2">{{v.name}}</td>
+                <td>{{v.spec}}</td>
+                <td>{{v.cnt}}</td>
+                <td>{{v.det_item_fee_sumamt}}</td>
+              </tr>
+            </table>
+          </td>
+        </tr>
+        <tr>
+          <td colspan="10">共一页，第一页{{info.medfee_sumamt}}</td>
+        </tr>
+        <tr class="dashed_tr">
+          <td colspan="10">结付分类</td>
+        </tr>
+        <tr>
+          <td colspan="10">
+            <div>费用总计：{{info.medfee_sumamt}}</div>
+            <div>统筹支付：{{info.fund_pay_sumamt}}</div>
+            <div>账户支付：{{info.acct_pay}}</div>
+            <div>个人现金支付：{{info.cash_payamt}}</div>
+            <div>其他支付：{{info.oth_pay}}</div>
+            <div>减免金额：</div>
+          </td>
+        </tr>
       </tbody>
     </table>
   </div>
 </template>
 <script>
-  export default {
-    props: {
-      info: {
-        type: Object,
-        default: function () {
-          return {};
-        },
+export default {
+  props: {
+    info: {
+      type: Object,
+      default: function () {
+        return {};
       },
-      p_admin: {
-        type: Object,
-        default: function () {
-          return {};
-        },
+    },
+    p_admin: {
+      type: Object,
+      default: function () {
+        return {};
       },
-      charge_admin: {
-        type: Object,
-        default: function () {
-          return {};
-        },
+    },
+    charge_admin: {
+      type: Object,
+      default: function () {
+        return {};
       },
     },
-    data() {
-      return {
-        list:[1,2,3],
-        list_L: [1,2],
-        list_R: [1,2],
-      };
+  },
+  data() {
+    return {
+      list:[1,2,3],
+      list_L: [1,2],
+      list_R: [1,2],
+    };
+  },
+  methods: {
+    getDay(dateString1, dateString2) {
+      var startDate = Date.parse(dateString1);
+      var endDate = Date.parse(dateString2);
+      if (startDate > endDate) {
+        return 0;
+      }
+      if (startDate == endDate) {
+        return 1;
+      }
+      var days = (endDate - startDate) / (1 * 24 * 60 * 60 * 1000);
+      return days;
     },
-    methods: {
-      getDay(dateString1, dateString2) {
-        var startDate = Date.parse(dateString1);
-        var endDate = Date.parse(dateString2);
-        if (startDate > endDate) {
-          return 0;
-        }
-        if (startDate == endDate) {
-          return 1;
-        }
-        var days = (endDate - startDate) / (1 * 24 * 60 * 60 * 1000);
-        return days;
-      },
-      getNowTime: function () {
-        let dateTime;
-        let yy = new Date().getFullYear();
-        let mm = new Date().getMonth() + 1;
-        let dd = new Date().getDate();
-        let hh = new Date().getHours();
-        let mf =
-          new Date().getMinutes() < 10
-            ? "0" + new Date().getMinutes()
-            : new Date().getMinutes();
-        let ss =
-          new Date().getSeconds() < 10
-            ? "0" + new Date().getSeconds()
-            : new Date().getSeconds();
-        dateTime = yy + "-" + mm + "-" + dd + " " + hh + ":" + mf + ":" + ss;
-        return dateTime;
-      },
+    getNowTime: function () {
+      let dateTime;
+      let yy = new Date().getFullYear();
+      let mm = new Date().getMonth() + 1;
+      let dd = new Date().getDate();
+      let hh = new Date().getHours();
+      let mf =
+        new Date().getMinutes() < 10
+          ? "0" + new Date().getMinutes()
+          : new Date().getMinutes();
+      let ss =
+        new Date().getSeconds() < 10
+          ? "0" + new Date().getSeconds()
+          : new Date().getSeconds();
+      dateTime = yy + "-" + mm + "-" + dd + " " + hh + ":" + mf + ":" + ss;
+      return dateTime;
     },
-  };
+  },
+};
 </script>
 
 

src/xt_pages/outpatientTool/components/detailStatistics.vue

@@ -167,11 +167,11 @@
     <div style="display: flex; justify-content: space-around; margin-top: 25px">
       <div>总费用:{{ getAllPice() }}</div>
       <div>
-        个人支付: 
+        个人支付:
         {{getActPay()}}
-        <!-- <span v-if="his_patient.balance_accounts_type == 2">{{ getAllPice() }}</span>  
+        <!-- <span v-if="his_patient.balance_accounts_type == 2">{{ getAllPice() }}</span>
         <span v-if="his_patient.balance_accounts_type != 2">{{ getActPay() }}</span> -->
-      
+
       </div>
       <div>基金支付记账:{{ getFundPaySumamt() }}</div>
       <div>补充医疗支付记账:{{ getHifesPay() }}</div>
@@ -345,7 +345,7 @@ export default {
             this.item_type = this.id;
           }
 
-          
+
           if (this.keywords != "") {
             for (let i = 0; i < this.tableData.length; i++) {
               if (this.tableData[i].index != "合计") {
@@ -444,25 +444,18 @@ export default {
       return total_price.toFixed(2);
     },
     getActPay() {
-      var arrNew = []
       var act_pay = 0;
       for (let i = 0; i < this.list.length; i++) {
         for (let j = 0; j < this.list[i].orders.length; j++) {
-          //个人支付
-          console.log("is",this.list[i].orders[j])
-          if(this.list[i].orders[j].is_medicine_insurance == 0){
-             arrNew.push(this.list[i].orders[j])
+          if(this.list[i].orders[j].is_medicine_insurance == 1){
+            act_pay = act_pay + this.list[i].orders[j].psn_cash_pay
+          }else{
+            act_pay= act_pay +  this.list[i].orders[j].medfee_sumamt
           }
+
         }
       }
-      if(arrNew.length > 0){
-        for(let i=0;i<arrNew.length;i++){
-           for(let j=0;j<arrNew[i].order_info.length;j++){
-             act_pay += arrNew[i].order_info[j].cnt * arrNew[i].order_info[j].pric
-           }
-        }
-      }
-      console.log("arrNew2332323223",arrNew)
+
       return act_pay.toFixed(2);
     },
     getFundPaySumamt() {

src/xt_pages/outpatientTool/detailPrint.vue

@@ -28,7 +28,7 @@
           <span v-if="his_patient!=null && his_patient.number!=''">{{his_patient.number}}</span>
           <span v-if="his_record_patient!=null && his_record_patient.ipt_otp_no!=''">{{his_record_patient.ipt_otp_no}}</span></td>
             <td>科室：
-          <span v-if="his_patient!=null && his_patient.departments >0"> {{ getDepartment(his_patient.departments) }}</span> 
+          <span v-if="his_patient!=null && his_patient.departments >0"> {{ getDepartment(his_patient.departments) }}</span>
           <span v-if="his_record_patient!=null && his_record_patient.departments > 0">{{ getDepartment(his_record_patient.departments) }}</span></td>
             <td>就诊流水号：
           <span v-if="his_patient!=null && his_patient.number!=''"> {{ his_patient.number }}</span>
@@ -60,7 +60,7 @@
         <div>患者姓名：{{ patient.name }}</div>
         <div>性别：{{ patient.gender == 1 ? "男" : "女" }}</div>
         <div>结算类别：
-          
+
           {{getType(his_record_patient.balance_accounts_type)}}
         </div>
         <div style="min-width:300px;">发票号码：{{order.fa_piao_number}}</div>
@@ -73,7 +73,7 @@
           {{ getDepartment(his_record_patient.departments) }}
         </div>
         <div style="min-width:350px;">就诊流水号：
-       
+
           {{his_record_patient.number}}
         </div>
       </div> -->
@@ -108,7 +108,7 @@
             <span v-if="item.is_total == 2">合计</span>
           </td>
           <td style="text-align: center">
-            <span v-if="item.is_total == 1">{{getTimes(item.record_date)}}</span> 
+            <span v-if="item.is_total == 1">{{getTimes(item.record_date)}}</span>
           </td>
           <td width="80" style="text-align: center">{{ item.number }}</td>
           <td style="text-align: center">
@@ -239,11 +239,11 @@ export default {
           this.patient = response.data.data.patient;
 
           this.his_patient = response.data.data.his_patient;
-         
+
          this.his_record_patient = response.data.data.his_record_patient
 
          this.hisDepatment = response.data.data.hisDepatment;
-          
+
          this.orderList = response.data.data.orderList
           this.order = response.data.data.order
           this.tableData = [];
@@ -271,7 +271,7 @@ export default {
           this.tableData.push(obj);
 
 
-         
+
           if (this.$route.query.keyword != "") {
             var new_arr = []
             for (let i = 0; i < this.tableData.length; i++) {
@@ -314,7 +314,7 @@ export default {
             objs.total_price = this.getPrice(new_arr)
             new_arr.push(objs)
             this.tableData = new_arr;
-           
+
           }
 
           if(this.$route.query.id == 1){
@@ -347,10 +347,10 @@ export default {
                 }
               }
             }
-         
+
             this.tableData = []
             obj.total_price = this.getPrice(new_arr)
-           
+
             for(let i=0;i<new_arr.length;i++){
               new_arr[i].is_total = 1
             }
@@ -376,7 +376,7 @@ export default {
               new_arr[i].is_total = 1
             }
             new_arr.push(obj)
-           
+
             this.tableData = new_arr
           }
 
@@ -393,25 +393,18 @@ export default {
       return total_price;
     },
     getActPay() {
-      var arrNew = []
       var act_pay = 0;
       for (let i = 0; i < this.list.length; i++) {
         for (let j = 0; j < this.list[i].orders.length; j++) {
-          //个人支付
-          console.log("is",this.list[i].orders[j])
-          if(this.list[i].orders[j].is_medicine_insurance == 0){
-             arrNew.push(this.list[i].orders[j])
+          if(this.list[i].orders[j].is_medicine_insurance == 1){
+            act_pay = act_pay + this.list[i].orders[j].psn_cash_pay
+          }else{
+            act_pay= act_pay +  this.list[i].orders[j].medfee_sumamt
           }
+
         }
       }
-      if(arrNew.length > 0){
-        for(let i=0;i<arrNew.length;i++){
-           for(let j=0;j<arrNew[i].order_info.length;j++){
-             act_pay += arrNew[i].order_info[j].cnt * arrNew[i].order_info[j].pric
-           }
-        }
-      }
-      console.log("arrNew2332323223",arrNew)
+
       return act_pay.toFixed(2);
     },
     getFundPaySumamt() {

src/xt_pages/outpatientTool/gatherPrint.vue

@@ -10,12 +10,12 @@
         </div>
         <div class="listInfo">
             <div>科别：
-              <span v-if="org_id!=10215"> {{getDepartment(his_patient.departments)}}</span> 
+              <span v-if="org_id!=10215"> {{getDepartment(his_patient.departments)}}</span>
               {{getDepartment(his_record_patient.departments)}}
             </div>
             <div>床号：<span v-if="schedule.length > 0">{{getBedName(schedule[0].bed_id)}}</span></div>
             <div>门诊号：
-               <span v-if="org_id!=10215">{{his_patient.number}}</span> 
+               <span v-if="org_id!=10215">{{his_patient.number}}</span>
                {{his_record_patient.ipt_otp_no}}
             </div>
             <div>姓名：{{patient.name}}</div>
@@ -76,27 +76,27 @@
                    {{item.cost_type}}
                  </span>
                   <span v-if="item.type == 2">
-                    {{item.cost_type}} 
+                    {{item.cost_type}}
                   </span>
                   <span v-if="item.type == 3">
                     材料费
-                  </span> 
+                  </span>
                 </td>
                 <td style="text-align:center" >
-                  <span>{{item.name}}</span>  
+                  <span>{{item.name}}</span>
                 </td>
                 <td style="text-align:center" >
                   {{ item.spec }}
                 </td>
                 <td style="text-align:center" >
-                  {{item.pric}}  
+                  {{item.pric}}
                 </td>
                 <td style="text-align:center" >
                    {{item.count_number }}{{item.unit }}
                 </td>
                 <td style="text-align:center" >
-                   <span v-if="item.is_total == 1">{{ item.total }}</span>  
-                   <span v-if="item.is_total == 2">{{ (item.pric * item.count_number).toFixed(2) }}</span> 
+                   <span v-if="item.is_total == 1">{{ item.total }}</span>
+                   <span v-if="item.is_total == 2">{{ (item.pric * item.count_number).toFixed(2) }}</span>
                 </td>
                 <td style="text-align:center" >
                   {{getChrgitmLv(item.medical_insurance_level)}}
@@ -194,7 +194,7 @@
             return false
           } else {
           this.drugTypeList =response.data.data.drugTypeList
-          this.costClassifyList = response.data.data.costClassifyList 
+          this.costClassifyList = response.data.data.costClassifyList
           var list = response.data.data.list
           this.list = list
           this.orderList = response.data.data.orderList
@@ -206,7 +206,7 @@
                new_arr.push(list[i].orders[j])
             }
           }
-          
+
 
           var order_info = []
           for(let i=0;i<new_arr.length;i++){
@@ -228,8 +228,8 @@
               }
             }
           }
-          
-          
+
+
           //合并，相同的合并在一起
 
           let dataInfo = {}
@@ -257,8 +257,8 @@
             }
             dataInfo[item_id].child.push(item)
           })
-          let arr = Object.values(dataInfo) 
-          
+          let arr = Object.values(dataInfo)
+
           for(let i=0;i<arr.length;i++){
             for(let j=0;j<arr[i].child.length;j++){
                if(arr[i].advice_id >0){
@@ -269,8 +269,8 @@
                   arr[i].unit = arr[i].child[0].advice.prescribing_number_unit
                   arr[i].cost_type = arr[i].child[0].advice.drug.drug_type
                   arr[i].medical_insurance_level = arr[i].child[0].advice.drug.medical_insurance_level
-                 
-                 
+
+
                }
                if(arr[i].project_id > 0){
                   arr[i].record_date = arr[i].child[0].project.record_date
@@ -293,7 +293,7 @@
                arr[i].count_number +=arr[i].child[j].cnt
             }
           }
-          
+
           var obj = {is_total:1,total:0}
           obj.total = this.getAllPiceTwo(arr)
           for(let i=0;i<arr.length;i++){
@@ -307,18 +307,18 @@
           arr.push(obj)
 
           this.tableList = arr
-         
+
           this.patient = response.data.data.patient
-         
+
           this.his_patient = response.data.data.his_patient
           this.hisDepatment =  response.data.data.hisDepatment
           this.order =  response.data.data.order
           this.his_record_patient = response.data.data.his_record_patient
-          this.medicalInsuranceLevelList = response.data.data.medicalInsuranceLevelList  
+          this.medicalInsuranceLevelList = response.data.data.medicalInsuranceLevelList
           this.schedule = response.data.data.schedule
           this.bedNumber = response.data.data.bedNumber
           if(this.$route.query.keyword !=""){
-           
+
             var new_arr = []
             for(let i=0;i<this.tableList.length;i++){
               if(this.tableList[i].is_total!=1){
@@ -326,7 +326,7 @@
                   new_arr.push(this.tableList[i])
                 }
               }
-             
+
              }
               var obj ={index:"合计",is_total:1,total:0}
               obj.total = this.getAllPiceTwo(new_arr)
@@ -341,9 +341,9 @@
                 if(this.tableList[i].is_total!=1){
                   if(this.tableList[i].type == 1){
                    new_arr.push(this.tableList[i])
-                }  
+                }
               }
-                
+
              }
              this.tableList = []
              this.tableList = new_arr
@@ -353,9 +353,9 @@
              for(let i=0;i<this.tableList.length;i++){
                if(this.tableList[i].is_total!=1){
                   if(this.tableList[i].type == 2){
-                
+
                   new_arr.push(this.tableList[i])
-                }  
+                }
               }
              }
              this.tableList = []
@@ -367,7 +367,7 @@
                 if(this.tableList[i].is_total!=1){
                   if(this.tableList[i].type == 3){
                     new_arr.push(this.tableList[i])
-                }  
+                }
               }
              }
              this.tableList = []
@@ -404,7 +404,7 @@
               id: details[i].advice.drug_id,
               price: details[i].advice.price,
               record_date:details[i].advice.advice_date
-              
+
             }
             drug_ids.push(obj)
           } else if (details[i].project && details[i].project.id > 0 && details[i].project.prescription && details[i].project.prescription.type == 2) { //项目
@@ -418,10 +418,10 @@
           }
 
         }
-      
+
         let new_drug_ids = this.unique(drug_ids)
         let new_project_ids = this.unique(project_ids)
-       
+
         let list = []
         if (new_drug_ids.length > 0 && new_project_ids.length == 0) {
           for (let i = 0; i < new_drug_ids.length; i++) {
@@ -476,7 +476,7 @@
             }
             obj['count'] = count
             list.push(obj)
-          
+
           }
         }
 
@@ -502,7 +502,7 @@
             list.push(obj)
 
           }
-         
+
           for (let i = 0; i < new_project_ids.length; i++) {
             let obj = {}
             let count = 0
@@ -529,13 +529,13 @@
             }
             obj['count'] = count
             list.push(obj)
-          
+
           }
          }
-       
+
         return list
-      }, 
-    
+      },
+
       getMedicineInsuranceType(type) {
         switch (type) {
           case "01":
@@ -663,7 +663,7 @@
       }else{
         return "0.00"
       }
-     
+
     },
     getAllPiceTwo(arr){
 
@@ -678,7 +678,7 @@
       }else{
         return total_price
       }
-     
+
     },
     setMonthPrescription(month_prescriptions) {
       let drug_month_prescriptions = {
@@ -718,7 +718,7 @@
 
       drug_ids = this.unique(drug_ids)
       project_ids= this.unique(project_ids)
-  
+
       for (let i = 0; i < drug_ids.length; i++) {
         let obj = {}
         let count = 0
@@ -738,7 +738,7 @@
             obj['record_date'] = drug_month_prescriptions.advices[a].advice_date
             obj['spec'] = drug_month_prescriptions.advices[a].drug.dose  + drug_month_prescriptions.advices[a].drug.dose_unit +"*" + drug_month_prescriptions.advices[a].drug.min_number + drug_month_prescriptions.advices[a].drug.min_unit + "/" + drug_month_prescriptions.advices[a].drug.max_unit
             obj['is_total'] = 2
-            obj['chrgitm_lv'] =  drug_month_prescriptions.advices[a].drug.medical_insurance_level 
+            obj['chrgitm_lv'] =  drug_month_prescriptions.advices[a].drug.medical_insurance_level
             obj['unit'] = drug_month_prescriptions.advices[a].prescribing_number_unit
             count = count + drug_month_prescriptions.advices[a].prescribing_number
 
@@ -777,7 +777,7 @@
             obj['day'] = project_month_prescriptions.project[a].day
             obj['single_dose_unit'] = project_month_prescriptions.project[a].unit
             obj['prescribing_number_unit'] = project_month_prescriptions.project[a].unit
-           
+
             count = count + parseFloat(project_month_prescriptions.project[a].count)
             obj['price'] = parseFloat(project_month_prescriptions.project[a].price)
             obj['remark'] = project_month_prescriptions.project[a].remark
@@ -911,7 +911,7 @@
             total_price += this.tableList[i].count_number * this.tableList[i].pric
          }
       }
-      
+
       return total_price.toFixed(2)
     },
     getChineseTraditionalMedicineCostTotal(){
@@ -1041,7 +1041,7 @@
       return total_price.toFixed(2)
     },
     getDrugType(id){
-    
+
       var name = ""
       for(let i=0;i<this.drugTypeList.length;i++){
          if(id == this.drugTypeList[i].value){
@@ -1108,42 +1108,35 @@
       for(let i=0;i<this.orderList.length;i++){
         fund_pay_sumamt +=this.orderList[i].fund_pay_sumamt
       }
-     
+
       if(fund_pay_sumamt >0){
         return fund_pay_sumamt.toFixed(2)
       }else{
-      
+
         return "0.00"
       }
     },
     getActPay() {
-      var arrNew = []
       var act_pay = 0;
       for (let i = 0; i < this.list.length; i++) {
         for (let j = 0; j < this.list[i].orders.length; j++) {
-          //个人支付
-          console.log("is",this.list[i].orders[j])
-          if(this.list[i].orders[j].is_medicine_insurance == 0){
-             arrNew.push(this.list[i].orders[j])
+          if(this.list[i].orders[j].is_medicine_insurance == 1){
+            act_pay = act_pay + this.list[i].orders[j].psn_cash_pay
+          }else{
+            act_pay= act_pay +  this.list[i].orders[j].medfee_sumamt
           }
+
         }
       }
-      if(arrNew.length > 0){
-        for(let i=0;i<arrNew.length;i++){
-           for(let j=0;j<arrNew[i].order_info.length;j++){
-             act_pay += arrNew[i].order_info[j].cnt * arrNew[i].order_info[j].pric
-           }
-        }
-      }
-      console.log("arrNew2332323223",arrNew)
+
       return act_pay.toFixed(2);
     },
 
     },
     created(){
       this.org_id = this.$store.getters.xt_user.org.id;
-     
-      this.getGatherDetailList()   
+
+      this.getGatherDetailList()
     }
 
   }

src/xt_pages/qcd/workAnalysis/nurse.vue

@@ -421,10 +421,15 @@
                 total_diffcult_nurse = total_diffcult_nurse + resp.data.data[i].difficult_nuser_count
                 total_new_fistula_nurse = total_new_fistula_nurse + resp.data.data[i].new_nuser_count
                 total_start_nurse = total_start_nurse + resp.data.data[i].start_nuser_count
+                console.log( resp.data.data[i].start_nuser_count)
+
+                console.log(total_start_nurse)
                 total_finish_nurse = total_finish_nurse + resp.data.data[i].finish_nuser_count
                 total_washpipe_nurse = total_washpipe_nurse + resp.data.data[i].washpipe_nuser_count
                 this.tableData.push(resp.data.data[i])
              }
+              console.log(total_start_nurse)
+
               this.tableData.push( {
                 user_name:"合计",
                 cure_count:total_cure,