1

src/api/project/project.js

@@ -533,4 +533,12 @@ export function postProjectInformation(params){
     method:"post",
     data:params
   })
+}
+
+export function getInvoice(params){
+  return request({
+    url:"/api/fapiao/get",
+    method:"get",
+    data:params
+  })
 }

src/xt_pages/data/components/addDrugs.vue

@@ -589,7 +589,7 @@
         this.$refs[formName].validate((valid) => {
           console.log(valid)
           if (valid) {
-            console.log(this.getValue())
+            console.log(1111,this.getValue())
             this.$emit('dialog-comfirm', this.getValue())
           }
         })
@@ -603,7 +603,15 @@
       },
       _close: function(done) {
         // this.clear()
-        done()
+        // done()
+        this.$confirm('是否保存')
+          .then(_ => {
+            this.comfirm('form')
+            // done();
+          })
+          .catch(_ => {
+            done()
+          });
       },
       clear: function() {
         this.form.id = 0

src/xt_pages/data/components/addProject.vue

@@ -315,7 +315,15 @@ export default {
     methods:{
         _close: function(done) {
             // this.clear()
-            done()
+            // done()
+            this.$confirm('是否保存')
+            .then(_ => {
+                this.submitAction('form')
+                // done();
+            })
+            .catch(_ => {
+                done()
+            });
         },
         clear: function() {
             this.form.id = 0;

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -533,6 +533,16 @@
           >打印</el-button
         >
       </template>
+      <template v-if="org_template_info.template_id == 38">
+        <el-button
+          :loading="loading"
+          size="small"
+          icon="el-icon-printer"
+          @click="printThisPage"
+          type="primary"
+          >打印</el-button
+        >
+      </template>
     </div>
     <div class="app-container" style="min-height:0;">
       <!--<div class="order-print-btn"-->
@@ -798,6 +808,11 @@
             v-if="org_template_info.template_id == 37"
           >
           </DialysisPrintOrderThirtySeven>
+          <DialysisPrintOrderThirtyEight
+            v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 38"
+          >
+          </DialysisPrintOrderThirtyEight>
         </div>
       </el-container>
     </div>
@@ -854,9 +869,11 @@ import DialysisPrintOrderThirtyFour from "./template/DialysisPrintOrderThirtyFou
 import DialysisPrintOrderThirtyFive from "./template/DialysisPrintOrderThirtyFive";
 import DialysisPrintOrderThirtySix from "./template/DialysisPrintOrderThirtySix";
 import DialysisPrintOrderThirtySeven from "./template/DialysisPrintOrderThirtySeven";
+import DialysisPrintOrderThirtyEight from "./template/DialysisPrintOrderThirtyEight";
 export default {
   name: "dialysisPrintOrder",
   components: {
+    DialysisPrintOrderThirtyEight,
     DialysisPrintOrderThirtySeven,
     DialysisPrintOrderThirtySix,
     DialysisPrintOrderThirtyFive,
@@ -1069,6 +1086,9 @@ export default {
         '@media print {.dialysis-print-order{width:960px;margin:0 auto}.dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:23px;font-size:16px}.dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:16px}.dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:16px}.dialysis-print-order .under-line{border-bottom:1px solid #999;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}';
       const style7 =
         '@media print {.dialysis-print-order {width: 960px; margin: 0 auto;}.dialysis-print-order .order-yy-name {margin: auto;text-align: center;font-size: 20px;letter-spacing: 5px;}.dialysis-print-order .order-title {  margin: auto;  font-weight: 600;  text-align: center;  font-size: 22px;  padding: 10px 20px 0px 20px;}.dialysis-print-order .table-box {  width: 100%;  line-height: 18px;  font-size: 18px;}.dialysis-print-order .print-table {  width: 100%;  text-align: center;  border-collapse: collapse;  line-height: 28px;  font-size: 18px;}.dialysis-print-order .print-table-no {  width: 100%;  text-align: center;  border-collapse: collapse;  font-size: 14px;}.dialysis-print-order .under-line {  border-bottom: 1px solid #999;  width: 95%;  text-align: center;  margin-left: 2px;}.dialysis-print-order .title-box {  text-align: center;  font-size: 16px;}.dialysis-print-order .radio-lebel-box {  font-weight: 400;  cursor: pointer;}.dialysis-print-order .radio-no {  opacity: 0;  outline: none;  position: absolute;  margin: 0;  width: 0;  height: 0;  z-index: -1;}.dialysis-print-order .radio-inner {  white-space: nowrap;  cursor: pointer;  outline: none;  display: inline-block;  line-height: 1;  position: relative;  vertical-align: middle;}.dialysis-print-order .radio-fang {  display: inline-block;  position: relative;  border: 1px solid #000;  box-sizing: border-box;  width: 18px;  height: 18px;  background-color: #fff;  z-index: 1;  transition: border-color 0.25s cubic-bezier(0.71, -0.46, 0.29, 1.46),    background-color 0.25s cubic-bezier(0.71, -0.46, 0.29, 1.46);}.dialysis-print-order .is-checked-radio::after {  content: "√";  font-size: 19px;}.dialysis-print-order .print-table-no tr td {  padding: 8px 5px;  line-height: 25px;}.dialysis-print-order .print-table tr td {  padding: 1px 1px;  /*line-height: 25px;*/}.es-img {  height: 25px;}.advice-name {  text-align: left;}.advice-children {  display: flex;}.title-box-pro {  border: 0 #fff;  line-height: 25px;  height: 25px;  text-align: left;  padding-left: 10px !important;}.title-box-pro-tr {  border: 0 #fff;}.text-align-left {  text-align: left !important;  padding-left: 10px !important;  font-size: 14px !important;  line-height: 25px;}.print-table-tr-new td {line-height: 20px !important;}.border-top-solid {border: solid 1px #000;}.print-template-two tr {line-height: 30px;}}';
+      const style8 =
+        '@media print {.dialysis-print-order{width:960px;margin:0 auto;font-size:10px;}.dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:23px;font-size:10px}.dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:14px}.dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:14px}.dialysis-print-order .under-line{border-bottom:1px solid #999;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}.widthLength25{width: 25%;}.lineHeight{line-height: 20px;display: flex;justify-content: space-between;}';
+
 
       if (this.org_template_info.template_id == 1) {
         printJS({
@@ -1315,6 +1335,13 @@ export default {
           style: style,
           scanStyles: false
         });
+      } else if (this.org_template_info.template_id == 38) {
+        printJS({
+          printable: "dialysis-print-box",
+          type: "html",
+          style: style8,
+          scanStyles: false
+        });
       }
     },
     printThisOnePage() {

src/xt_pages/dialysis/template/DialysisPrintOrderThirtySeven.vue

@@ -187,8 +187,8 @@
                     <span style="display:inline-block;width:30%">
                         医生签名:
                         <span>
-                            <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 />
+                            <span v-if="setAdminUserES(tableAdvice[0].advice_doctor) == ''">{{ getAdminUser(tableAdvice[0].advice_doctor) }}</span>
+                            <img class="es-img" style="height:30px;" :src="setAdminUserES(tableAdvice[0].advice_doctor)" alt="" srcset="" v-else />
                         </span>
                     </span>
                 </span>
@@ -415,8 +415,8 @@
             <div style="text-align:right;">
                 医生签名:
                 <span style="display:inline-block;width:100px;text-align:left;">
-                    <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 />
+                    <span v-if="setAdminUserES(tableAdvice[0].advice_doctor) == ''">{{ getAdminUser(tableAdvice[0].advice_doctor) }}</span>
+                    <img class="es-img" style="height:30px;" :src="setAdminUserES(tableAdvice[0].advice_doctor)" alt="" srcset="" v-else />
                 </span>
                 护士签名:
                 <span style="display:inline-block;width:100px;text-align:left;">

src/xt_pages/outpatientCharges/costComparison.vue

@@ -435,7 +435,7 @@
             clr_type: '11'
           }
           var that = this
-          if (this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 10106) {
+          if (this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 9990 ) {
             axios.get('http://127.0.0.1:9532/api/checkaccount/get', {
               params: params
             })

src/xt_pages/outpatientCharges/invoicePrint.vue

@@ -0,0 +1,152 @@
+<template>
+  <div>
+    <template>
+      <el-button
+        style="position:fixed;right:25px;z-index:999"
+        :loading="loading"
+        size="small"
+        icon="el-icon-printer"
+        @click="printThisPage"
+        type="primary"
+        >打印</el-button
+      >
+    </template>
+    <div class="app-container" style="padding-top:40px;">
+        <div class='dialysisPage'>
+            <printOne :paramsObj="invoiceParams"></printOne>
+        </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import printOne from './invoiceTemplate/printOne'
+export default {
+  name: "invoicePrint",
+  components: {
+    printOne
+  },
+  props:{
+    invoiceParams:Object
+  },
+  data() {
+    return {
+      childResponse: {},
+    //   invoiceParams:{}
+      
+
+    };
+  },
+  methods: {
+    getAdminUser(id) {
+      if (id == 0) {
+        return "";
+      }
+      if (id == undefined) {
+        return "";
+      }
+      for (let i = 0; i < this.adminUser.length; i++) {
+        if (this.adminUser[i].id == id) {
+          return this.adminUser[i].name;
+        }
+      }
+    },
+    getTime(value, temp) {
+      if (value == 0) {
+        return "";
+      }
+      if (value != undefined) {
+        return uParseTime(value, temp);
+      }
+      return "";
+    },
+    printThisPage() {
+
+      const style =
+        '@media print {.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoMain{display: flex;flex-wrap: wrap;padding:0 10px;margin-top:10px;}.infoMain .infoP{width: 33%;}.chargeBox{border: 1px solid #000;}.chargeUl{display:flex;justify-content: space-between;text-align: center;}.chargeUl p{line-height: 1px;}.chargeP{line-height: 1px;padding-bottom:16px;}.moneyBox{display: flex;justify-content: space-between;padding: 0 10px;background: #eeeeee;-webkit-print-color-adjust:exact;-moz-print-color-adjust:exact;-ms-print-color-adjust:exact;print-color-adjust:exact;height: 40px;align-items: center;border:1px solid #000; border-top:none}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar div{width:150px;}}';
+        printJS({
+            printable: "invoice-print",
+            type: "html",
+            style: style,
+            scanStyles: false
+        });
+
+      // if (this.org_template_info.template_id == 1) {
+      //   printJS({
+      //     printable: "dialysis-print-box",
+      //     type: "html",
+      //     style: style,
+      //     scanStyles: false
+      //   });
+      // }
+    },
+  },
+  created() {
+      console.log('this.invoiceParams',this.invoiceParams)
+  },
+  watch:{
+    paramsObj:{//深度监听，可监听到对象、数组的变化
+      handler(val, oldVal){
+        this.invoiceParams = val
+        
+      },
+      deep:true
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.printTitle{
+    font-size: 22px;
+    text-align: center;
+    font-weight: bold;
+}
+.infoMain{
+    display: flex;
+    flex-wrap: wrap;
+    border-bottom: 2px solid #000;
+    padding:0 10px;
+}
+.infoMain .infoP{
+    width: 33%;
+    line-height: 24px;
+}
+.prescriptionBox{
+    padding:0 10px;
+    height:600px;
+}
+.Rp{
+    font-size: 22px;
+    font-weight: bold;
+}
+.drugsBox{
+    padding-left: 40px;
+    margin-bottom: 10px;
+}
+.drugsBox p{
+    line-height: 30px;
+}
+.drugsOne{
+    line-height: 24px;
+}
+.drugsOne span{
+    margin-right: 20px;
+}
+.doctorBox{
+    display: flex;
+    justify-content: space-between;
+    padding:0 10px;
+    line-height: 24px;
+    border-bottom: 2px solid #000;
+}
+.actionBar{
+    display: flex;
+    justify-content: space-between; 
+    line-height: 24px;
+    padding:0 10px;
+}
+.actionBar p{
+    width:150px;
+}
+</style>

src/xt_pages/outpatientCharges/invoiceTemplate/printOne.vue

@@ -0,0 +1,172 @@
+<template>
+    <div id='invoice-print'>
+        <div style="display:flex;">
+            <div>业务流水号：{{ list.order_number }}</div>
+            <div>社会保障号：{{ list.id_card_no }}</div>
+        </div>
+        <div style="display:flex;justify-content: space-between;">
+            <div>科室：{{ list.department_name }}</div>
+            <div>门诊号：{{ list.number }}</div>
+            <div>医院类型：</div>
+            <div>
+                <span>{{ printDate.slice(0,4) }}</span>年
+                <span>{{ printDate.slice(5,7) }}</span>月
+                <span>{{ printDate.slice(8,11) }}</span>日
+            </div>
+        </div>
+        <div style="display:flex;justify-content: space-between;">
+            <div>姓名: {{ paramsObj.name }}</div>
+            <div>{{ list.pay_way }}</div>
+            <div>住院日期: {{ paramsObj.setl_time.split(' ')[0] }}</div>
+            <div>出院日期: {{ paramsObj.setl_time.split(' ')[0] }}</div>
+        </div>
+        <div style="display:flex;justify-content: space-between;">
+            <div>性别: {{ paramsObj.gend == 1 ? '男' : '女' }}</div>
+            <div>医保/公医记账:{{ totalPrice - list.psn_cash_money }}</div>
+            <div>个人缴费: {{ list.psn_cash_money }}</div>
+            <div>结算方式: {{ list.pay_way }}</div>
+        </div>
+        <div style="display:flex;justify-content: space-between;">
+            <div style="width:12.5%">西药</div>
+            <div style="width:12.5%">{{ list.westernMedicineCostTotal }}</div>
+            <div style="width:12.5%">检查费</div>
+            <div style="width:12.5%">{{ list.checkCostTotal }}</div>
+            <div style="width:12.5%">治疗费</div>
+            <div style="width:12.5%">{{ list.treatCostTotal }}</div>
+            <div style="width:12.5%">床位费</div>
+            <div style="width:12.5%">{{ list.bedCostTotal }}</div>
+        </div>
+        <div style="display:flex;justify-content: space-between;">
+            <div style="width:12.5%">中成药</div>
+            <div style="width:12.5%">{{ list.chineseTraditionalMedicineCostTotal }}</div>
+            <div style="width:12.5%">化验费</div>
+            <div style="width:12.5%">{{ list.laboratoryCostTotal }}</div>
+            <div style="width:12.5%">手术费</div>
+            <div style="width:12.5%">{{ list.operationCostTotal }}</div>
+            <div style="width:12.5%">其他费</div>
+            <div style="width:12.5%">{{ list.otherCostTotal }}</div>
+        </div>
+        <div style="display:flex;justify-content: space-between;">
+            <div style="width:12.5%"></div>
+            <div style="width:12.5%"></div>
+            <div style="width:12.5%"></div>
+            <div style="width:12.5%"></div>
+            <div style="width:12.5%">材料费</div>
+            <div style="width:12.5%">{{ list.materialCostTotal }}</div>
+            <div style="width:12.5%"></div>
+            <div style="width:12.5%"></div>
+        </div>
+        <div>
+            <span>
+                <span v-if="zhongwen.indexOf('万') > -1">
+                    {{ zhongwen.substring(zhongwen.indexOf('万'),-1) }}
+                </span>
+                <span v-else>零</span>
+            </span>
+            <span>
+                <span v-if="zhongwen.indexOf('仟') > -1">
+                    {{ zhongwen.substring(zhongwen.indexOf('仟'),-1) }}
+                </span>
+                <span v-else>零</span>
+            </span>
+            <span>
+                <span v-if="zhongwen.indexOf('佰') > -1">
+                    {{ zhongwen.substring(zhongwen.indexOf('佰') - 1,zhongwen.indexOf('佰')) }}
+                </span>
+                <span v-else>零</span>
+            </span>
+            <span>
+                <span v-if="zhongwen.indexOf('拾') > -1">
+                    {{ zhongwen.substring(zhongwen.indexOf('拾') - 1,zhongwen.indexOf('拾')) }}
+                </span>
+                <span v-else>零</span>
+            </span>
+            <span>
+                <span v-if="zhongwen.indexOf('元') > -1">
+                    {{ zhongwen.substring(zhongwen.indexOf('元') - 1,zhongwen.indexOf('元')) }}
+                </span>
+                <span v-else>零</span>
+            </span>
+            <span>
+                <span v-if="zhongwen.indexOf('角') > -1">
+                    {{ zhongwen.substring(zhongwen.indexOf('角') - 1,zhongwen.indexOf('角')) }}
+                </span>
+                <span v-else>零</span>
+            </span>
+            <span>
+                <span v-if="zhongwen.indexOf('分') > -1">
+                    {{ zhongwen.substring(zhongwen.indexOf('分') - 1,zhongwen.indexOf('分')) }}
+                </span>
+                <span v-else>零</span>
+            </span>
+            <span>{{ totalPrice }}</span>
+        </div>
+    </div>
+</template>
+
+
+<script>
+import { getInvoice } from '@/api/project/project'
+export default {
+    props:{
+        paramsObj:Object
+    },
+    data(){
+        return{
+            list:{},
+            printDate:'',
+            zhongwen:'',
+            totalPrice:0.0
+        }
+    },
+    created(){
+        console.log('paramsObj',this.paramsObj)
+        let params = {
+            order_id: this.paramsObj.order_id,
+            patient_id: this.paramsObj.patient_id,
+        }
+        this.getInvoice(params)
+        var data = new Date();
+        var month =data.getMonth() < 9 ? "0" + (data.getMonth() + 1) : data.getMonth() + 1;
+        var date = data.getDate() <= 9 ? "0" + data.getDate() : data.getDate();
+        this.printDate = data.getFullYear() + "-" + month + "-" + date;
+        
+    },
+    methods:{
+        getInvoice(params){
+            getInvoice(params).then((res) => {
+                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.smalltoBIG(this.totalPrice)
+            })
+        },
+        smalltoBIG(price) {
+            let fraction = ['角', '分'];
+            let digit = ['零', '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖'];
+            let unit = [['元.', '万,', '亿,'], ['元', '拾', '佰', '仟']];
+            let head = price < 0 ? '欠' : '';
+            price = Math.abs(price);
+            let upper = '';
+            for (let i = 0; i < fraction.length; i++) {
+            upper += (digit[Math.floor(price * 10 * Math.pow(10, i)) % 10] + fraction[i]).replace(/零./, '');
+            }
+            upper = upper || '整';
+            price = Math.floor(price);
+            for (let i = 0; i < unit[0].length && price > 0; i++) {
+            let p = '';
+            for (let j = 0; j < unit[1].length && price > 0; j++) {
+                p = digit[price % 10] + unit[1][j] + p;
+                price = Math.floor(price / 10);
+            }
+            upper = p.replace(/(零.)*零$/, '').replace(/^$/, '零') + unit[0][i] + upper;
+            }
+            this.zhongwen = head + upper.replace(/(零.)*零圆/, '圆').replace(/(零.)+/g, '零').replace(/^整$/, '零圆整')
+            console.log('6666',head + upper.replace(/(零.)*零圆/, '圆').replace(/(零.)+/g, '零').replace(/^整$/, '零圆整'))
+    
+        },
+
+    }
+}
+</script>

src/xt_pages/outpatientCharges/newStatementPrint.vue

@@ -152,7 +152,7 @@
 
       },
       getInfo(order_id) {
-        if (this.$store.getters.xt_user.org_id == 3877 || this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4  || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671 ||  this.$store.getters.xt_user.org_id == 9674 || this.$store.getters.xt_user.org_id == 10106) {
+        if (this.$store.getters.xt_user.org_id == 3877 || this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4  || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671 ||  this.$store.getters.xt_user.org_id == 9674 || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 9990 ) {
 
           var that = this
 

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -133,13 +133,13 @@
                         </el-button>
 
                         <el-button
-                                v-if="this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4  || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671 || this.$store.getters.xt_user.org_id == 9674 || this.$store.getters.xt_user.org_id == 10106"
+                                v-if="this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4  || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671 || this.$store.getters.xt_user.org_id == 9674 || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 9990"
                                 size="small" @click="open(10)" type="primary"
                         >退号
                         </el-button>
 
                         <el-button
-                        v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919  || this.$store.getters.xt_user.org_id == 9671 || this.$store.getters.xt_user.org_id == 9674   || this.$store.getters.xt_user.org_id == 10106"
+                        v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919  || this.$store.getters.xt_user.org_id == 9671 || this.$store.getters.xt_user.org_id == 9674   || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 9990"
                         size="small" @click="open(11)" type="primary"
                         >撤销明细
                         </el-button>
@@ -525,7 +525,7 @@
     },
     methods: {
       query() {
-        if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 10106) {
+        if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 9990 ) {
           var that = this
           axios.get('http://127.0.0.1:9532/api/org/info', {
             params: {}
@@ -643,7 +643,7 @@
 
             })
 
-        } else if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671 || this.$store.getters.xt_user.org_id == 9674 || this.$store.getters.xt_user.org_id == 10106) {
+        } else if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671 || this.$store.getters.xt_user.org_id == 9674 || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 9990  ) {
           var that = this
           axios.get('http://127.0.0.1:9532/api/upload/get', {
             params: form,
@@ -870,7 +870,7 @@
 
             })
 
-        } else if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671  || this.$store.getters.xt_user.org_id == 9674 || this.$store.getters.xt_user.org_id == 10106) {
+        } else if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671  || this.$store.getters.xt_user.org_id == 9674 || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 9990) {
 
           axios.get('http://127.0.0.1:9532/api/register/get', {
             params: forms,
@@ -1495,7 +1495,7 @@
           }
 
         } else if (index == 5) {
-          if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671 || this.$store.getters.xt_user.org_id == 9674 || this.$store.getters.xt_user.org_id == 10106) {
+          if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671 || this.$store.getters.xt_user.org_id == 9674 || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 9990 ) {
 
             var that = this
             this.$confirm('是否退费', '退费', {
@@ -1594,7 +1594,7 @@
 
           var that = this
 
-          if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 10106) {
+          if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 9990) {
             axios.get('http://127.0.0.1:9532/api/checkaccount/get', {
               params: params
             })
@@ -1745,7 +1745,7 @@
             })
         } else if (index == 15) {
           var that = this
-          if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 10106) {
+          if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 10106 ||   this.$store.getters.xt_user.org_id == 9990) {
 
             if (this.diagnosis.length || this.diagnosis == 0) {
               that.$message.error('诊断不能为空,请选择诊断内容')
@@ -1854,7 +1854,7 @@
 
           }
           this.loadingtwo = true
-          if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 10106) {
+          if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 9990) {
             var that = this
             axios.get('http://127.0.0.1:9532/api/pre_upload/get', {
               params: form

src/xt_pages/outpatientCharges/statementPrint.vue

@@ -13,7 +13,8 @@
       </template>
 
       <div class='dialysisPage' style="padding-top:40px;">
-        <printOne :info="info"></printOne>
+        <printOne :info="info" v-if="org_id != 0"></printOne>
+        <printTwo  v-if="org_id == 0"></printTwo>
       </div>
   </div>
 </template>
@@ -30,12 +31,14 @@ import axios from 'axios'
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import print from "print-js";
 import printOne from "./statementTemplate/printOne"
+import printTwo from "./statementTemplate/printTwo"
 import { getAllDoctorList,getAllHisPatientList,getPrescriptionPrint } from "@/api/project/project"
 export default {
   name: "dialysisPrintOrder",
   components: {
     BreadCrumb,
-    printOne
+    printOne,
+    printTwo
   },
   props:{
     paramsObj:Object
@@ -57,6 +60,7 @@ export default {
       prescription_id:0,
       ids:'',
       info:null,
+      org_id:""
     };
   },
   methods:{
@@ -150,7 +154,7 @@ export default {
 
     },
     getInfo(order_id) {
-      if (this.$store.getters.xt_user.org_id == 3877 || this.$store.getters.xt_user.org_id == 9919 ||  this.$store.getters.xt_user.org_id == 9671 ||  this.$store.getters.xt_user.org_id == 9674 ||  this.$store.getters.xt_user.org_id == 10106  ||  this.$store.getters.xt_user.org_id == 4) {
+      if (this.$store.getters.xt_user.org_id == 3877 || this.$store.getters.xt_user.org_id == 9919 ||  this.$store.getters.xt_user.org_id == 9671 ||  this.$store.getters.xt_user.org_id == 9674 ||  this.$store.getters.xt_user.org_id == 10106  ||  this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9990) {
 
         var that = this
 
@@ -222,6 +226,7 @@ export default {
 
   created() {
     this.getInfo(this.paramsObj.order_id)
+    this.org_id = this.$store.getters.xt_user.org_id
   },
   watch:{
     paramsObj:{//深度监听，可监听到对象、数组的变化

src/xt_pages/outpatientCharges/statementTemplate/printTwo.vue

@@ -0,0 +1,129 @@
+<template>
+  <div id="statement-print" class="statement-print">
+    <div class="statementTitle">珠海市职工基本医疗保险门慢就医结算单</div>
+    <div style="display:flex">
+        <div style="width:70%">医疗机构名称：</div>
+        <div style="width:30%">医院等级：</div>
+    </div>
+    <div style="display:flex;justify-content: space-between;border-bottom:1px solid #000;padding-bottom:10px;">
+        <div style="flex:1;">单据编码：</div>
+        <div style="width:33%">就诊时间：</div>
+        <div>金额单位：</div>
+    </div>
+    <div style="display:flex">
+        <div style="width:50%">姓名：</div>
+        <div style="width:50%">个人电脑号： </div>
+    </div>
+    <div style="display:flex">
+        <div style="width:50%">社保卡号</div>
+        <div style="width:50%">诊断： </div>
+    </div>
+    <div style="display:flex">
+        <div style="width:50%">人员类别：</div>
+        <div style="width:50%">待遇类别： </div>
+    </div>
+    <div style="display:flex;padding:10px 0;border-top:1px solid #000;border-bottom:1px solid #000;">
+        <div style="width:50%;text-align:center;">项目名称</div>
+        <div style="width:10%;text-align:center;">单价</div>
+        <div style="width:10%;text-align:center;">数量</div>
+        <div style="width:10%;text-align:center;">金额</div>
+        <div style="width:10%;text-align:center;">门诊目录</div>
+        <div style="width:10%;text-align:center;">医保目录</div>
+    </div>
+    <div style="border-bottom:1px solid #000;padding:10px 0;display:flex;">
+        <div style="width:50%;text-align:center;">1</div>
+        <div style="width:10%;text-align:center;">2</div>
+        <div style="width:10%;text-align:center;">3</div>
+        <div style="width:10%;text-align:center;">4</div>
+        <div style="width:10%;text-align:center;">5</div>
+        <div style="width:10%;text-align:center;">6</div>
+    </div>
+    <div style="display:flex;border-bottom:1px solid #000;padding:20px 0 10px;">
+        <div style="width:70%;">合计：</div>
+        <div style="width:10%;text-align:center;">4</div>
+        <div style="width:20%;"></div>
+    </div>
+    <div>医保基金支付金额：</div>
+    <div>个人现金支付金额：</div>
+    <div>其中</div>
+    <div style="display:flex;border-bottom:1px solid #000;padding-bottom:10px;">
+        <div>个人自付：</div>
+        <div>其中：1.乙类自付    </div>
+        <div>2.自费    </div>
+    </div>
+    <div style="display:flex;padding-top:10px;">
+        <div style="width:33%">参保人签名：</div>
+        <div style="width:33%">审核人： </div>
+        <div style="width:33%">医院盖章： </div>
+    </div>
+    
+  </div>
+</template>
+<script>
+  export default {
+    props: {
+      info: {
+        type: Object,
+        default: function() {
+          return {}
+        }
+      }, p_admin: {
+        type: Object,
+        default: function() {
+          return {}
+        }
+      }, charge_admin: {
+        type: Object,
+        default: function() {
+          return {}
+        }
+      }
+    },methods:{
+      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>
+
+
+<style lang="scss" scoped>
+  .statement-print {
+    -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 60px rgba(0, 0, 0, 0.06) inset;
+    -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
+    box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
+    margin-bottom: 20px;
+    padding: 20px 10px;
+  }
+
+  .statementTitle {
+    font-size: 28px;
+    text-align: center;
+    font-weight: bold;
+    margin-bottom: 10px;
+  }
+
+  .statementTable {
+    width: 100%;
+    text-align: center;
+    border-collapse: collapse;
+    line-height: 40px;
+    font-size: 14px;
+    border-color: #000;
+  }
+</style>

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -360,9 +360,6 @@
                 </div>
               </el-tab-pane>
               <el-tab-pane label="项目组套" name="2">
-                <el-input style="width:100%;" @input="searchProjectList" @keyup.enter.native='searchProjectList'
-                            v-model.trim="project_item_keyword"
-                            placeholder="请输入项目组套名称"></el-input>
                 <div style="width: 100%;flex:1;overflow-y: auto;">
                   <el-table :data="tabPrjectTeam" border
                             :height="multipleTableHeight != '' ? multipleTableHeight : '200'"
@@ -576,9 +573,8 @@
             }
           }
         },
-        hisList:[],
-        project_item_keyword:"",
-        projectList:[] 
+        hisList:[]
+
       }
     },
     methods: {
@@ -1397,8 +1393,7 @@
         }
         this.$refs.additionalCharges.hide()
 
-      }, 
-      searchProjectAction() {
+      }, searchProjectAction() {
 
         if (this.search_project_keyword.length == 0) {
           this.tabProject = this.allProject
@@ -1415,20 +1410,6 @@
         }
 
       },
-      searchProjectList(){
-         if(this.project_item_keyword.length == 0){
-             this.tabPrjectTeam = this.projectList
-         }else{
-           let arr = []
-           for(let i=0;i<this.projectList.length;i++){
-              if(this.projectList[i].project_team.indexOf(this.project_item_keyword)!=-1){
-                 arr = arr.concat(this.projectList[i])
-              }
-           }
-           this.tabPrjectTeam = arr
-         }
-      },
-
       searchAction() {
         if (this.search_keyword.length == 0) {
           this.drugs = this.allDrugs
@@ -1951,8 +1932,6 @@
               'prescriptions': this.prescriptions
             }
             isLoading = true
-           
-            
             createHisPrescription(data, params).then(response => {
               if (response.data.state == 1) {
                 this.$emit('change')
@@ -2485,7 +2464,6 @@
             var team = response.data.data.team
             console.log("team2222",team)
             this.tabPrjectTeam = team
-            this.projectList = team
           }
         })
       },

src/xt_pages/outpatientDoctorStation/components/deskRecord.vue

@@ -316,7 +316,8 @@
         allergic_history:"",
         form:{
           id:0,
-        }
+        },
+        watchSign:0
       }
     },
     methods: {
@@ -330,7 +331,7 @@
 
 
       // },
-      createCaseHistory() {
+      createCaseHistory(id) {
           if(this.patientInfo.id == undefined){
             this.$message.error("请先选择病人")
             return
@@ -344,7 +345,7 @@
           let params = {
             "his_patient_id":this.hisPatientInfo.id,
             "delivery_way":this.delivery_way?"":0,
-            "patient_id":this.patientInfo.id,
+            "patient_id":id ? id : this.patientInfo.id,
             "temperature":this.case_history.temperature,
             "blood_sugar":this.case_history.blood_sugar,
             "pulse":this.case_history.pulse,
@@ -375,6 +376,7 @@
           createCaseHistory(params).then(response => {
             if (response.data.state == 0) {
               this.$message.error("患者病历已存在")
+              this.watchSign = 0
               return false
             } else {
               var caseHistory = response.data.data.caseHistory
@@ -382,6 +384,7 @@
               this.$message.success("保存成功")
               this.doctor_advice = ""
               this.remark = ""
+              this.watchSign = 0
             }
           })
 
@@ -562,20 +565,26 @@
         immediate: true,
         deep: true
       },
-      case_history:function(val){
-        console.log("南京人明",this.case_history)
-        if(this.case_history.breathing == 0){
-           this.case_history.breathing = ""
-        }
-        if(this.case_history.sick == 0){
-          this.case_history.sick = ""
-        }
-        if(this.case_history.diagnose == 0){
-           this.case_history.diagnose = ""
-        }
-        this.form.id = this.case_history.id
-        this.allergic_history = this.case_history.allergic_history
-        
+      case_history:{
+        handler(val){
+          console.log("南京人明",this.case_history)
+          if(this.case_history.breathing == 0){
+            this.case_history.breathing = ""
+          }
+          if(this.case_history.sick == 0){
+            this.case_history.sick = ""
+          }
+          if(this.case_history.diagnose == 0){
+            this.case_history.diagnose = ""
+          }
+          this.form.id = this.case_history.id
+          this.allergic_history = this.case_history.allergic_history
+          this.watchSign++
+        },
+        deep:true
+      },
+      allergic_history:function(){
+        this.watchSign++
       }
     }
   }

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

@@ -204,6 +204,7 @@
         input: 1,
       }
     },
+    
    methods:{
      createFilter(queryString) {
        return (restaurant) => {
@@ -380,6 +381,24 @@
       this.getInitData()
      
     },
+    watch:{
+      "prescription.advices":{
+        handler(newVal,oldVal){
+          newVal.map(item => {
+            item.prescribing_number = item.single_dose * item.day
+          })
+        },
+        deep:true
+      },
+      "prescription.project":{
+        handler(newVal,oldVal){
+          newVal.map(item => {
+            item.total = item.single_dose * item.number_days
+          })
+        },
+        deep:true
+      }
+    }
     
   }
 </script>

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -903,7 +903,520 @@
       },
 
       choosePatient(val) {
+        console.log(val)
+        if(this.titleType == '电子病历'){
+          console.log('this.$refs.child.watchSign',this.$refs.child.watchSign)
+          if(this.$refs.child.watchSign > 2){
+            this.$confirm('是否保存当前病例', '保存', {
+              confirmButtonText: '确 定',
+              cancelButtonText: '取 消',
+              type: 'warning'
+            }).then(() => {
+              
+              this.$refs.child.createCaseHistory(this.newPatientId)
+              this.patientid = val.id
+              
+              let params = {
+                'record_date': this.record_date,
+                'patient_id': val.id,
+                'start_time': moment(new Date()).subtract(30, 'days').format('YYYY-MM-DD'),
+                'end_time': moment(new Date()).add('year', 0).format("YYYY-MM-DD")
+              }
+              getPatientInfo(params).then(response => {
+                if (response.data.state == 0) {
+                  this.$message.error(response.data.msg)
+                  return false
+                } else {
+                  this.prescriptions = []
+
+                  this.month_prescriptions = []
+
+                  var month_prescriptions = response.data.data.month_prescriptions
+                  this.setMonthPrescription(month_prescriptions)
+
+
+                  this.patientInfo = response.data.data.xt_info
+                  this.hisPatientInfo = response.data.data.his_info
+                  this.case_history = response.data.data.case_history
+                  console.log("数据是22222多少",this.case_history)
+                  this.info = response.data.data.info
+                  this.doctors = response.data.data.doctors
+                  this.department = response.data.data.department
+
+                  for (let i = 0; i < this.doctors.length; i++){
+                    if(this.doctors[i].user_type == 1){
+                      this.doctors.splice(i,1)
+                    }
+                  }
+                  this.patientInfo.birth = uParseTime(this.patientInfo.birthday, '{y}-{m}-{d}')
+                  if (this.case_history.breathing <= 0) {
+                    this.case_history.breathing = ""
+                  }
+                  if (this.case_history.sick <= 0) {
+                    this.case_history.sick = ""
+                  }
+                  if (this.case_history.diagnose <= 0) {
+                    this.case_history.diagnose = ""
+                  }
+
+                  if (this.case_history.temperature <= 0) {
+                    this.case_history.temperature = ''
+                  }
+                  if (this.case_history.blood_sugar <= 0) {
+                    this.case_history.blood_sugar = ''
+                  }
+                  if (this.case_history.pulse <= 0) {
+                    this.case_history.pulse = ''
+                  }
+                  if (this.case_history.sbp <= 0) {
+                    this.case_history.sbp = ''
+                  }
+                  if (this.case_history.dbp <= 0) {
+                    this.case_history.dbp = ''
+                  }
+                  if (this.case_history.height <= 0) {
+                    this.case_history.height = ''
+                  }
+                  if (this.case_history.blood_fat <= 0) {
+                    this.case_history.blood_fat = ''
+                  }
+                  if (this.case_history.sick_type <= 0) {
+                    this.case_history.sick_type = ''
+                  }
+                  this.case_history.sick_date = uParseTime(this.case_history.sick_date, '{y}-{m}-{d}')
+                  if (this.case_history.is_infect == 1) {
+                    this.case_history.is_infect = true
+                  } else {
+                    this.case_history.is_infect = false
+                  }
+                  this.prescriptionList = response.data.data.prescription
+                  if (response.data.data.prescription.length > 0) {
+                    for (let i = 0; i < response.data.data.prescription.length; i++) {
+                      var prescription = response.data.data.prescription[i]
+                      let tempAdvice = []
+                      let tempProject = []
+                      let tempAddition = []
+                      for (let b = 0; b < prescription.advices.length; b++) {
+                        let obj = {
+                          advice_id: prescription.advices[b].id,
+                          drug_name: prescription.advices[b].advice_name,
+                          single_dose: prescription.advices[b].single_dose,
+                          delivery_way: prescription.advices[b].delivery_way,
+                          execution_frequency: prescription.advices[b].execution_frequency,
+                          retail_price: prescription.advices[b].price.toString(),
+                          remark: prescription.advices[b].remark,
+                          day: prescription.advices[b].day,
+                          prescribing_number: prescription.advices[b].prescribing_number.toString(),
+                          single_dose_unit: prescription.advices[b].single_dose_unit,
+                          prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
+                          medical_insurance_number: prescription.advices[b].med_list_codg,
+                          id: prescription.advices[b].drug_id
+                        }
+                        tempAdvice.push(obj)
+                      }
+                      for (let b = 0; b < prescription.project.length; b++) {
+                        let obj = {
+                          id: prescription.project[b].id,
+                          project_id: prescription.project[b].project_id,
+                          project_name: prescription.project[b].project.project_name,
+                          statistical_classification: prescription.project[b].project.statistical_classification,
+                          single_dose: prescription.project[b].single_dose,
+                          delivery_way: prescription.project[b].delivery_way,
+                          execution_frequency: prescription.project[b].execution_frequency,
+                          number_days: prescription.project[b].day,
+                          total: prescription.project[b].count.toString(),
+                          price: prescription.project[b].price,
+                          remark: prescription.project[b].remark,
+                          medical_code: prescription.project[b].project.medical_code,
+                          unit: prescription.project[b].unit
+                        }
+                        tempProject.push(obj)
+                      }
+                      for (let b = 0; b < prescription.addition.length; b++) {
+                        let obj = {
+                          id: prescription.addition[b].id,
+                          item_name: prescription.addition[b].item_name,
+                          price: prescription.addition[b].price,
+                          count: prescription.addition[b].count,
+                          item_id: prescription.addition[b].item_id,
+                        }
+                        tempAddition.push(obj)
+                      }
+
+                      var preTime = ""
+
+                      if (prescription.pre_time == 0) {
+                        preTime = nowTime
+                      } else {
+                        preTime = this.getTime(prescription.pre_time, "{y}-{m}-{d} {h}:{i}")
+                      }
+
+                      let index = i + 1
+                      let obj = {
+                        id: prescription.id,
+                        name: '处方' + index,
+                        advices: tempAdvice,
+                        project: tempProject,
+                        addition: tempAddition,
+                        order_status: prescription.order_status,
+                        pre_time: preTime
+                      }
+                      this.prescriptions.push(obj)
+                    }
+                  } else {
+                    let obj = {
+                      id: 0,
+                      name: '处方' + 1,
+                      advices: [],
+                      project: [],
+                      addition: [],
+                      orderStatus: 0,
+                      pre_time: nowTime,
+                    }
+                    this.prescriptions.push(obj)
+                  }
+                  this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department,this.hisPatientInfo, this.month_prescriptions)
+                  this.$refs.child.watchSign = 0
+                }
+              })
+              this.$refs.child.watchSign = 0
+            }).catch(() => {
+              
+              this.patientid = val.id
+              let params = {
+                'record_date': this.record_date,
+                'patient_id': val.id,
+                'start_time': moment(new Date()).subtract(30, 'days').format('YYYY-MM-DD'),
+                'end_time': moment(new Date()).add('year', 0).format("YYYY-MM-DD")
+              }
+              getPatientInfo(params).then(response => {
+                if (response.data.state == 0) {
+                  this.$message.error(response.data.msg)
+                  return false
+                } else {
+                  this.prescriptions = []
+
+                  this.month_prescriptions = []
+
+                  var month_prescriptions = response.data.data.month_prescriptions
+                  this.setMonthPrescription(month_prescriptions)
+
+
+                  this.patientInfo = response.data.data.xt_info
+                  this.hisPatientInfo = response.data.data.his_info
+                  this.case_history = response.data.data.case_history
+                  console.log("数据是22222多少",this.case_history)
+                  this.info = response.data.data.info
+                  this.doctors = response.data.data.doctors
+                  this.department = response.data.data.department
+
+                  for (let i = 0; i < this.doctors.length; i++){
+                    if(this.doctors[i].user_type == 1){
+                      this.doctors.splice(i,1)
+                    }
+                  }
+                  this.patientInfo.birth = uParseTime(this.patientInfo.birthday, '{y}-{m}-{d}')
+                  if (this.case_history.breathing <= 0) {
+                    this.case_history.breathing = ""
+                  }
+                  if (this.case_history.sick <= 0) {
+                    this.case_history.sick = ""
+                  }
+                  if (this.case_history.diagnose <= 0) {
+                    this.case_history.diagnose = ""
+                  }
+
+                  if (this.case_history.temperature <= 0) {
+                    this.case_history.temperature = ''
+                  }
+                  if (this.case_history.blood_sugar <= 0) {
+                    this.case_history.blood_sugar = ''
+                  }
+                  if (this.case_history.pulse <= 0) {
+                    this.case_history.pulse = ''
+                  }
+                  if (this.case_history.sbp <= 0) {
+                    this.case_history.sbp = ''
+                  }
+                  if (this.case_history.dbp <= 0) {
+                    this.case_history.dbp = ''
+                  }
+                  if (this.case_history.height <= 0) {
+                    this.case_history.height = ''
+                  }
+                  if (this.case_history.blood_fat <= 0) {
+                    this.case_history.blood_fat = ''
+                  }
+                  if (this.case_history.sick_type <= 0) {
+                    this.case_history.sick_type = ''
+                  }
+                  this.case_history.sick_date = uParseTime(this.case_history.sick_date, '{y}-{m}-{d}')
+                  if (this.case_history.is_infect == 1) {
+                    this.case_history.is_infect = true
+                  } else {
+                    this.case_history.is_infect = false
+                  }
+                  this.prescriptionList = response.data.data.prescription
+                  if (response.data.data.prescription.length > 0) {
+                    for (let i = 0; i < response.data.data.prescription.length; i++) {
+                      var prescription = response.data.data.prescription[i]
+                      let tempAdvice = []
+                      let tempProject = []
+                      let tempAddition = []
+                      for (let b = 0; b < prescription.advices.length; b++) {
+                        let obj = {
+                          advice_id: prescription.advices[b].id,
+                          drug_name: prescription.advices[b].advice_name,
+                          single_dose: prescription.advices[b].single_dose,
+                          delivery_way: prescription.advices[b].delivery_way,
+                          execution_frequency: prescription.advices[b].execution_frequency,
+                          retail_price: prescription.advices[b].price.toString(),
+                          remark: prescription.advices[b].remark,
+                          day: prescription.advices[b].day,
+                          prescribing_number: prescription.advices[b].prescribing_number.toString(),
+                          single_dose_unit: prescription.advices[b].single_dose_unit,
+                          prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
+                          medical_insurance_number: prescription.advices[b].med_list_codg,
+                          id: prescription.advices[b].drug_id
+                        }
+                        tempAdvice.push(obj)
+                      }
+                      for (let b = 0; b < prescription.project.length; b++) {
+                        let obj = {
+                          id: prescription.project[b].id,
+                          project_id: prescription.project[b].project_id,
+                          project_name: prescription.project[b].project.project_name,
+                          statistical_classification: prescription.project[b].project.statistical_classification,
+                          single_dose: prescription.project[b].single_dose,
+                          delivery_way: prescription.project[b].delivery_way,
+                          execution_frequency: prescription.project[b].execution_frequency,
+                          number_days: prescription.project[b].day,
+                          total: prescription.project[b].count.toString(),
+                          price: prescription.project[b].price,
+                          remark: prescription.project[b].remark,
+                          medical_code: prescription.project[b].project.medical_code,
+                          unit: prescription.project[b].unit
+                        }
+                        tempProject.push(obj)
+                      }
+                      for (let b = 0; b < prescription.addition.length; b++) {
+                        let obj = {
+                          id: prescription.addition[b].id,
+                          item_name: prescription.addition[b].item_name,
+                          price: prescription.addition[b].price,
+                          count: prescription.addition[b].count,
+                          item_id: prescription.addition[b].item_id,
+                        }
+                        tempAddition.push(obj)
+                      }
+
+                      var preTime = ""
+
+                      if (prescription.pre_time == 0) {
+                        preTime = nowTime
+                      } else {
+                        preTime = this.getTime(prescription.pre_time, "{y}-{m}-{d} {h}:{i}")
+                      }
+
+                      let index = i + 1
+                      let obj = {
+                        id: prescription.id,
+                        name: '处方' + index,
+                        advices: tempAdvice,
+                        project: tempProject,
+                        addition: tempAddition,
+                        order_status: prescription.order_status,
+                        pre_time: preTime
+                      }
+                      this.prescriptions.push(obj)
+                    }
+                  } else {
+                    let obj = {
+                      id: 0,
+                      name: '处方' + 1,
+                      advices: [],
+                      project: [],
+                      addition: [],
+                      orderStatus: 0,
+                      pre_time: nowTime,
+                    }
+                    this.prescriptions.push(obj)
+                  }
+                  this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department,this.hisPatientInfo, this.month_prescriptions)
+                  this.$refs.child.watchSign = 0
+                }
+              })
+              
+            })
+            this.$refs.child.watchSign = 0
+          }else{
+            this.patientid = val.id
+            let params = {
+              'record_date': this.record_date,
+              'patient_id': val.id,
+              'start_time': moment(new Date()).subtract(30, 'days').format('YYYY-MM-DD'),
+              'end_time': moment(new Date()).add('year', 0).format("YYYY-MM-DD")
+            }
+            getPatientInfo(params).then(response => {
+                if (response.data.state == 0) {
+                  this.$message.error(response.data.msg)
+                  return false
+                } else {
+                  this.prescriptions = []
+
+                  this.month_prescriptions = []
+
+                  var month_prescriptions = response.data.data.month_prescriptions
+                  this.setMonthPrescription(month_prescriptions)
+
+
+                  this.patientInfo = response.data.data.xt_info
+                  this.hisPatientInfo = response.data.data.his_info
+                  this.case_history = response.data.data.case_history
+                  console.log("数据是22222多少",this.case_history)
+                  this.info = response.data.data.info
+                  this.doctors = response.data.data.doctors
+                  this.department = response.data.data.department
+
+                  for (let i = 0; i < this.doctors.length; i++){
+                    if(this.doctors[i].user_type == 1){
+                      this.doctors.splice(i,1)
+                    }
+                  }
+                  this.patientInfo.birth = uParseTime(this.patientInfo.birthday, '{y}-{m}-{d}')
+                  if (this.case_history.breathing <= 0) {
+                    this.case_history.breathing = ""
+                  }
+                  if (this.case_history.sick <= 0) {
+                    this.case_history.sick = ""
+                  }
+                  if (this.case_history.diagnose <= 0) {
+                    this.case_history.diagnose = ""
+                  }
+
+                  if (this.case_history.temperature <= 0) {
+                    this.case_history.temperature = ''
+                  }
+                  if (this.case_history.blood_sugar <= 0) {
+                    this.case_history.blood_sugar = ''
+                  }
+                  if (this.case_history.pulse <= 0) {
+                    this.case_history.pulse = ''
+                  }
+                  if (this.case_history.sbp <= 0) {
+                    this.case_history.sbp = ''
+                  }
+                  if (this.case_history.dbp <= 0) {
+                    this.case_history.dbp = ''
+                  }
+                  if (this.case_history.height <= 0) {
+                    this.case_history.height = ''
+                  }
+                  if (this.case_history.blood_fat <= 0) {
+                    this.case_history.blood_fat = ''
+                  }
+                  if (this.case_history.sick_type <= 0) {
+                    this.case_history.sick_type = ''
+                  }
+                  this.case_history.sick_date = uParseTime(this.case_history.sick_date, '{y}-{m}-{d}')
+                  if (this.case_history.is_infect == 1) {
+                    this.case_history.is_infect = true
+                  } else {
+                    this.case_history.is_infect = false
+                  }
+                  this.prescriptionList = response.data.data.prescription
+                  if (response.data.data.prescription.length > 0) {
+                    for (let i = 0; i < response.data.data.prescription.length; i++) {
+                      var prescription = response.data.data.prescription[i]
+                      let tempAdvice = []
+                      let tempProject = []
+                      let tempAddition = []
+                      for (let b = 0; b < prescription.advices.length; b++) {
+                        let obj = {
+                          advice_id: prescription.advices[b].id,
+                          drug_name: prescription.advices[b].advice_name,
+                          single_dose: prescription.advices[b].single_dose,
+                          delivery_way: prescription.advices[b].delivery_way,
+                          execution_frequency: prescription.advices[b].execution_frequency,
+                          retail_price: prescription.advices[b].price.toString(),
+                          remark: prescription.advices[b].remark,
+                          day: prescription.advices[b].day,
+                          prescribing_number: prescription.advices[b].prescribing_number.toString(),
+                          single_dose_unit: prescription.advices[b].single_dose_unit,
+                          prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
+                          medical_insurance_number: prescription.advices[b].med_list_codg,
+                          id: prescription.advices[b].drug_id
+                        }
+                        tempAdvice.push(obj)
+                      }
+                      for (let b = 0; b < prescription.project.length; b++) {
+                        let obj = {
+                          id: prescription.project[b].id,
+                          project_id: prescription.project[b].project_id,
+                          project_name: prescription.project[b].project.project_name,
+                          statistical_classification: prescription.project[b].project.statistical_classification,
+                          single_dose: prescription.project[b].single_dose,
+                          delivery_way: prescription.project[b].delivery_way,
+                          execution_frequency: prescription.project[b].execution_frequency,
+                          number_days: prescription.project[b].day,
+                          total: prescription.project[b].count.toString(),
+                          price: prescription.project[b].price,
+                          remark: prescription.project[b].remark,
+                          medical_code: prescription.project[b].project.medical_code,
+                          unit: prescription.project[b].unit
+                        }
+                        tempProject.push(obj)
+                      }
+                      for (let b = 0; b < prescription.addition.length; b++) {
+                        let obj = {
+                          id: prescription.addition[b].id,
+                          item_name: prescription.addition[b].item_name,
+                          price: prescription.addition[b].price,
+                          count: prescription.addition[b].count,
+                          item_id: prescription.addition[b].item_id,
+                        }
+                        tempAddition.push(obj)
+                      }
 
+                      var preTime = ""
+
+                      if (prescription.pre_time == 0) {
+                        preTime = nowTime
+                      } else {
+                        preTime = this.getTime(prescription.pre_time, "{y}-{m}-{d} {h}:{i}")
+                      }
+
+                      let index = i + 1
+                      let obj = {
+                        id: prescription.id,
+                        name: '处方' + index,
+                        advices: tempAdvice,
+                        project: tempProject,
+                        addition: tempAddition,
+                        order_status: prescription.order_status,
+                        pre_time: preTime
+                      }
+                      this.prescriptions.push(obj)
+                    }
+                  } else {
+                    let obj = {
+                      id: 0,
+                      name: '处方' + 1,
+                      advices: [],
+                      project: [],
+                      addition: [],
+                      orderStatus: 0,
+                      pre_time: nowTime,
+                    }
+                    this.prescriptions.push(obj)
+                  }
+                  this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department,this.hisPatientInfo, this.month_prescriptions)
+                  this.$refs.child.watchSign = 0
+                }
+              })
+            this.$refs.child.watchSign = 0
+          }
+        }else{
         var nowDate = new Date()
         var nowYear = nowDate.getFullYear()
         var nowMonth = nowDate.getMonth() + 1
@@ -1296,11 +1809,16 @@
 
 
         }
+        }
+        
 
 
+      
+      
       },
       currentChange(currentRow, oldCurrentRow) {
-
+        this.newPatientId = oldCurrentRow.id
+        console.log('执行',this.newPatientId)
         let isShowDailog = false
         for (let i = 0; i < this.prescriptions.length; i++) {
           if ((this.prescriptions[i].id == 0 && this.prescriptions[i].advices.length > 0) || (this.prescriptions[i].id == 0 && this.prescriptions[i].project.length > 0)) {
@@ -1311,7 +1829,8 @@
           this.oldCurrentRow = currentRow
           return
         }
-
+        
+        
 
       }, open_two() {
         this.$refs.prescriptions.open_two()

src/xt_pages/outpatientRegistration/index.vue

@@ -1000,7 +1000,7 @@
                 .catch(function(error) {
 
                 })
-            } else if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9538) {
+            } else if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9990) {
               var that = this
 
               axios.get('http://127.0.0.1:9532/api/register/get', {
@@ -1259,7 +1259,7 @@
                 .catch(function(error) {
 
                 })
-            } else if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9538) {
+            } else if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9990) {
               var that = this
 
               axios.get('http://127.0.0.1:9532/api/register/get', {

src/xt_pages/qcd/basicInformationAnalysis.vue

@@ -63,13 +63,13 @@
           :picker-options="pickerOptions"
         ></el-date-picker>
       </div>
-       <div class="cell clearfix">
+       <!-- <div class="cell clearfix">
         <label class="title"><span class="name">转归情况</span> : </label>
         <div class="time ">
           <ul class="">
             <li
               :class="item.lapseto == lapsetoType ? 'active' : ''"
-              @click="selectLapseOne(item.lapseto)"
+              @click="selectLapseTo(item.lapseto)"
               v-for="item in lapsetoArr"
               :key="item.value"
             >
@@ -77,8 +77,8 @@
             </li>
           </ul>
         </div>
-      </div>
-      <div class="cell clearfix">
+      </div> -->
+      <!-- <div class="cell clearfix">
         <label class="title"><span class="name">病人来源</span> : </label>
         <div class="time ">
           <ul class="">
@@ -92,7 +92,7 @@
             </li>
           </ul>
         </div>
-      </div>
+      </div> -->
 
        <div class="cell clearfix" v-show="treatShow">
         <label class="title">
@@ -243,12 +243,10 @@
                 <p class="infoTitle">转归统计(总人数{{patientCount}}人)</p>
               </div>
               <div class="borderBox1">
-                 <span v-if="lapsetoType == 0 || lapsetoType == 1"><p>留治:{{rollOutTotal}}人({{(rollOutTotal/patientCount*100).toFixed(1)}}%)</p>
-                  <el-progress :percentage="(rollOutTotal/patientCount*100).toFixed(1)"></el-progress>
-                </span>
-                <span v-if="lapsetoType == 0 || lapsetoType == 2"><p>转出:{{outTotal}}人({{(outTotal/patientCount*100).toFixed(1)}}%)</p>
-                 <el-progress :percentage="(outTotal/patientCount*100).toFixed(1)"></el-progress>
-                </span> 
+                <p>留治:{{rollOutTotal}}人({{(rollOutTotal/patientCount*100).toFixed(1)}}%)</p>
+                <el-progress :percentage="(rollOutTotal/patientCount*100).toFixed(1)"></el-progress>
+                <p>转出:{{outTotal}}人({{(outTotal/patientCount*100).toFixed(1)}}%)</p>
+                <el-progress :percentage="(outTotal/patientCount*100).toFixed(1)"></el-progress>
               </div>
             </div>
             <div class="infoOne">
@@ -329,7 +327,7 @@
         </div>
         <div>
 
-        <!-- <div class="cell clearfix" v-show="treatShow">
+        <div class="cell clearfix" v-show="treatShow">
         <label class="title">
           <span class="name">转归状态</span> :
         </label>
@@ -343,7 +341,7 @@
             >{{ item.label }}</li>
           </ul>
         </div>
-       </div> -->
+       </div>
 
           <p style="font-size: 16px;font-weight: bold;color: #000;">转归统计</p>
           <line-chart :options="bar"></line-chart>
@@ -423,7 +421,7 @@ export default {
         { value: 0, label: '全部', source: 0, lapseto: 0 },
         { value: 1, label: '转出', source: 0, lapseto: 2 },
         { value: 2, label: '留治', source: 0, lapseto: 1 },
-        // { value: 3, label: '死亡', source:0,  lapseto: 3 },
+        { value: 3, label: '死亡', source:0,  lapseto: 3 },
       ],
       sourceType: 0,
       sourceArr: [
@@ -654,7 +652,7 @@ export default {
         //统计转归状态
         this.getTotalLapseCount(this.listQuery.start_time,this.listQuery.end_time,this.lapsetoType,this.sourceType)
         //统计男女比例
-        this.getTotalSexCount(timeStar,timeEnd,this.lapsetoType,this.sourceType)
+        this.getTotalSexCount(timeStar,timeEnd)
         //统计传染病
         this.getTotalInfectiousCount(this.listQuery.start_time,this.listQuery.end_time,this.lapsetoType,this.sourceType)
         //统计年龄
@@ -664,7 +662,7 @@ export default {
         this.start = timeStar
         this.end =timeEnd
         this.getCountModeId()
-        this.getRolloutCount(timeStar,timeEnd,this.lapsetoType,this.sourceType)
+        this.getRolloutCount(timeStar,timeEnd)
       }
     },
     changeEndTime(val) {
@@ -692,7 +690,7 @@ export default {
         this.start = timeStar
         this.end =timeEnd
         this.getCountModeId()
-        this.getRolloutCount(timeStar,timeEnd,this.lapsetoType,this.sourceType)
+        this.getRolloutCount(timeStar,timeEnd)
       }
     },
     selectLapseTo(state) {
@@ -701,7 +699,7 @@ export default {
       //获取本月当前机构的透析模式
       const startDate = moment().subtract('month', 0).format('YYYY-MM') + '-01'
       const endDate = moment(new Date()).format('YYYY-MM-DD')
-     
+
       var now = new Date()
       var nowMonth = now.getMonth(); //当前月
       var nowYear = now.getFullYear(); //当前年
@@ -730,14 +728,14 @@ export default {
         this.start = timeStar
         this.end = timeEnd
         this.getCountModeId()
-        this.getRolloutCount(timeStar,timeEnd,this.lapsetoType,this.sourceType)
+        this.getRolloutCount(timeStar,timeEnd)
       }
       //近三月
       if(state == 1){
         this.listQuery.start_time = ""
         this.listQuery.end_time = ""
         const startDate = moment().subtract('month', 3).format('YYYY-MM-DD')
-       
+
         var startunitx = Date.parse(startDate)/1000
         // console.log("开始时间搓",startunitx)
         const endDate = moment(new Date()).format('YYYY-MM-DD')
@@ -759,7 +757,7 @@ export default {
         this.start = startunitx
         this.end = endunitx
         this.getCountModeId()
-        this.getRolloutCount(startunitx,endunitx,this.lapsetoType,this.sourceType)
+        this.getRolloutCount(startunitx,endunitx)
       }
 
      //近半年
@@ -790,7 +788,7 @@ export default {
         this.start = startunitx
         this.end = endunitx
         this.getCountModeId()
-        this.getRolloutCount(startunitx,endunitx,this.lapsetoType,this.sourceType)
+        this.getRolloutCount(startunitx,endunitx)
      }
 
      //近一年
@@ -817,10 +815,11 @@ export default {
         this.getTotalAgeCount(startunitx,endunitx,this.lapsetoType,this.sourceType)
         //统计透析年龄
         this.getTotalDialysisCount(startunitx,endunitx,this.lapsetoType,this.sourceType)
+
         this.start = startunitx
         this.end = endunitx
         this.getCountModeId()
-        this.getRolloutCount(startunitx,endunitx,this.lapsetoType,this.sourceType)
+        this.getRolloutCount(startunitx,endunitx)
      }
 
 
@@ -843,12 +842,12 @@ export default {
          if(response.data.state == 1){
 
           var modetype =  response.data.data.modetype
-         
+
           this.modetype = modetype
           var total =  response.data.data.total
-          
-          this.total = total.count
-          // this.total = total
+
+          // this.total = total.count
+          this.total = total
           // console.log("数据",this.modetype)
           var modedate = response.data.data.modetype
           for(let i=0;i<modedate.length;i++){
@@ -920,52 +919,61 @@ export default {
       })
     },
     //统计转归
-    getTotalLapseCount(startDate,endDate,lapsetoType,sourceType ){
-   
+    getTotalLapseCount(startDate,endDate){
        this.modesDataTwo.series = []
        this.modesDataTwo.xAxis = []
-      getTotalLapseCount(startDate,endDate,lapsetoType,sourceType).then(response=>{
+      getTotalLapseCount(startDate,endDate).then(response=>{
          if(response.data.state == 1){
            var arr = [
              {name:"留治",count:0},
              {name:"转出",count:0}
            ]
           var patients =  response.data.data.patients
-      
-          this.rollOutTotal = patients.length
 
+          this.rollOutTotal = patients.length
           var patienttwo = response.data.data.patienttwo
+
           this.outTotal = patienttwo.length
           var count = response.data.data.count
           this.patientCount = count
 
           var rollout = response.data.data.rollout
-        
+          console.log("rollout",rollout)
 
           for(let i=0;i<arr.length;i++){
             arr[0].count = this.rollOutTotal
             arr[1].count = this.outTotal
           }
+
+          // for(let j=0;j<arr.length;j++){
+          //   this.modesDataTwo.xAxis.push(arr[j].name)
+          //   this.modesDataTwo.series.push(((arr[j].count/count)*100).toFixed(1))
+          // }
+          // this.bar.series[0].data = this.modesDataTwo.series
+          // this.bar.xAxis.data = this.modesDataTwo.xAxis
+          // this.getArrLength(this.bar.xAxis.data)
+
          }
       })
     },
     //统计男女比例
-    getTotalSexCount(timeStar,timeEnd,lapsetoType,sourceType){
-      getTotalSexCount(timeStar,timeEnd,lapsetoType,sourceType).then(response=>{
+    getTotalSexCount(timeStar,timeEnd){
+      getTotalSexCount(timeStar,timeEnd).then(response=>{
         if(response.data.state === 1){
-          console.log("resp2222",response.data.data.totalWoman)
           var total = response.data.data.total
+        //  console.log("总人数",total)
           this.totalGender = total
           var totalMan = response.data.data.totalSex
+       //  console.log("男人",totalMan)
           this.totalMan = totalMan
-          var totalWoman = response.data.data.totalWoman
+          var totalWoman = total - totalMan
           this.totalWoman = totalWoman
         }
       })
     },
     //统计传染病
-    getTotalInfectiousCount(timeStar,timeEnd,lapsetoType,sourceType){
-       getTotalInfectiousCount(timeStar,timeEnd,lapsetoType,sourceType).then(response=>{
+    getTotalInfectiousCount(timeStar,timeEnd){
+       getTotalInfectiousCount(timeStar,timeEnd).then(response=>{
            if(response.data.state === 1){
              this.InfectiousTotal = response.data.data.total
              var infectious = response.data.data.count
@@ -988,10 +996,11 @@ export default {
            }
        })
     },
-    getTotalAgeCount(timeStar,timeEnd,lapsetoType,sourceType){
-      getTotalAgeCount(timeStar,timeEnd,lapsetoType,sourceType).then(response=>{
+    getTotalAgeCount(timeStar,timeEnd){
+      getTotalAgeCount(timeStar,timeEnd).then(response=>{
          if(response.data.state == 1){
           var ageCount =  response.data.data.ageCount
+          // console.log("ageCount",ageCount)
           var arr = []
           arr =  ageCount.sort(this.compare('age'))
           this.ageCount = arr
@@ -1009,8 +1018,8 @@ export default {
           }
       },
     //统计透析年龄
-    getTotalDialysisCount(timeStar,timeEnd,lapsetoType,sourceType){
-      getTotalDialysisCount(timeStar,timeEnd,lapsetoType,sourceType).then(response=>{
+    getTotalDialysisCount(timeStar,timeEnd){
+      getTotalDialysisCount(timeStar,timeEnd).then(response=>{
          if(response.data.state == 1){
            var dataage =  response.data.data.dataage
           //  console.log("dataage",dataage)
@@ -1167,9 +1176,7 @@ export default {
        this.modesDataTwo.xAxis = []
         const params = {
           start_time:this.start,
-          end_time:this.end,
-          lapsetotype:this.lapsetoType,
-          sourcetype:this.sourceType,
+          end_time:this.end
         }
       getRolloutCount(params).then(response=>{
          if(response.data.state == 1){
@@ -1218,10 +1225,8 @@ export default {
       this.getTotalInfectiousCount(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
       this.getTotalAgeCount(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
       this.getTotalDialysisCount(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
-      this.getRolloutCount(this.lapsetoType,this.sourceType)
     },
-    selectLapseOne(lapseto) {
-      console.log("lapseto22222",lapseto)
+    selectLapseTo(lapseto) {
       this.lapsetoType = lapseto
       this.getDialysisModeType(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
       this.getTotalLapseCount(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
@@ -1229,7 +1234,6 @@ export default {
       this.getTotalInfectiousCount(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
       this.getTotalAgeCount(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
       this.getTotalDialysisCount(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
-      this.getRolloutCount(this.lapsetoType,this.sourceType)
     },
   },
   created() {
@@ -1266,7 +1270,7 @@ export default {
       this.start = timeStar
       this.end = timeEnd
 
-     this.getRolloutCount(timeStar,timeEnd,this.lapsetoType,this.sourceType)
+     this.getRolloutCount(timeStar,timeEnd)
 
 
   },
@@ -1417,3 +1421,4 @@ export default {
 </style>
 
 
+

src/xt_pages/stock/Dialog/goodInfoDailog.vue

@@ -3,7 +3,8 @@
              :title="titles"
              :visible.sync="visible"
              :close-on-click-modal="isClose"
-             :close-on-press-escape="isClose">
+             :close-on-press-escape="isClose"
+             :before-close="_close">
 
     <el-tabs v-model="activeName">
       <el-tab-pane label="基础数据" name="first">
@@ -471,6 +472,18 @@
           }
         })
       },
+      _close: function(done) {
+        // this.clear()
+        // done()
+        this.$confirm('是否保存')
+          .then(_ => {
+            this.comfirm('form')
+            // done();
+          })
+          .catch(_ => {
+            done()
+          });
+      },
       getValue: function() {
         
         const form = {}

src/xt_pages/upload/fast/One.vue

@@ -5,7 +5,7 @@
       <div class="information">
         <div class="row">
           <div class="rowOne">
-            <p class="rowName">首次诊治时间:</p>
+            <p class="rowName">首次透析时间:</p>
             <el-input
               placeholder="请输入内容"
               v-model="form.first_treatment_date"

src/xt_pages/user/components/PatientForm.vue

@@ -785,7 +785,7 @@
             </el-col>
 
             <el-col :span="6" :style="isEdit ? 'width:360px' : ''">
-              <el-form-item label="首次诊治时间 : ">
+              <el-form-item label="首次透析时间 : ">
                 <el-date-picker
                   v-model="form.first_treatment_date"
                   type="date"

src/xt_pages/user/components/PatientSidebar.vue

@@ -188,8 +188,24 @@ export default {
     },
     changePatient(value) {
       console.log(value)
-
-      this.$router.push('/patients/patient/' + value)
+      if(this.$route.path.indexOf('edit') > -1){
+        this.$confirm('是否保存当前病历', '保存', {
+          confirmButtonText: '确 定',
+          cancelButtonText: '取 消',
+          type: 'warning'
+        }).then(() => {
+            this.$emit('updateInfo')
+            setTimeout(() => {
+              this.$router.push('/patients/patient/' + value)
+            },1000)
+        }).catch(() => {
+          this.$router.push('/patients/patient/' + value)
+        })
+      }else{
+        this.$router.push('/patients/patient/' + value)
+      }
+      
+      
     },
     getList() {
       fetchAllList().then(response => {

src/xt_pages/user/editPatient.vue

@@ -1,8 +1,8 @@
 
 <template>
   <div class="patient-container">
-  <patient-sidebar :id="patientID"></patient-sidebar>
-  <patient-form :is-edit='true' :class='panelClass' v-on:tran-patient-info="patientInfo=$event"></patient-form>
+  <patient-sidebar :id="patientID" @updateInfo="submit"></patient-sidebar>
+  <patient-form :is-edit='true' :class='panelClass' ref="patientForm" v-on:tran-patient-info="patientInfo=$event"></patient-form>
   </div>
 </template>
 
@@ -33,6 +33,12 @@ export default {
           });
           this.$router.push('/patients/patients');
       }
+  },
+  methods:{
+    submit(){
+      this.$refs.patientForm.onSubmit('form')
+    }
+    
   }
 
 }