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

src/api/his/his.js

@@ -519,6 +519,18 @@ export function refunddetail(params) {
 
 
 
+export function getPrivateExpensesOrder(params) {
+  return request({
+    url: "/api/privateexpensesorder/get",
+    method: "get",
+    params:params,
+  });
+}
+
+
+
+
+
 
 
 

src/api/patient.js

@@ -468,3 +468,11 @@ export function getAccessList(params) {
     params: params
   })
 }
+
+export function getInitDataList(params) {
+  return request({
+    url: '/api/patient/getinitdatelist',
+    method: 'get',
+    params: params
+  })
+}

src/xt_pages/data/druguseTemplate.vue

@@ -1818,10 +1818,12 @@
       },
       handleSelect1(){
        this.templateForm.drug_id =  val.id
+       this.templateForm.way = 1
       },
       handleSelect(val){
         console.log("val23232",val)
         this.templateForm.drug_id =  val.id
+        this.templateForm.way = 1
       },
       submitTemplate(formName) {
 
@@ -2379,6 +2381,7 @@
           }).join(',')
           this.templateForm.way = 1
         }
+        this.templateForm.way = 1
         console.log("编辑模板",this.templateForm)
       
         // 编辑创建医嘱模版

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

@@ -1315,10 +1315,13 @@
 
               if(msg == 2){
                 this.$message.error("库存不足,请入库")
-                return
+                this.execTimeDialogVisible = false
+                return false
               }
               if(msg == 3){
                 this.$message.error("无库存,请入库")
+                this.execTimeDialogVisible = false
+                return false
               }
               
             }

src/xt_pages/outpatientCharges/listPrint.vue

@@ -14,8 +14,10 @@
     </template>
 
     <div class='dialysisPage' style="padding-top:40px;">
-      <printOne v-if="org_id != 10106" :list="list" :patient="patient" :order="order" :admin="admin"></printOne>
-      <printTwo v-if="org_id == 10106" :info="info" :order_infos="order_infos" :p_admin="p_admin" :charge_admin="charge_admin"></printTwo>
+      <printOne v-if="org_id != 10106 && this.paramsObj.balance_accounts_type != 2" :list="list" :patient="patient" :order="order" :admin="admin"></printOne>
+      <printTwo v-if="org_id == 10106 && this.paramsObj.balance_accounts_type != 2" :info="info" :order_infos="order_infos" :p_admin="p_admin" :charge_admin="charge_admin"></printTwo>
+      <!--<printThree v-if="org_id == 0 && this.paramsObj.balance_accounts_type == 2" :info="info" :order_infos="order_infos" :p_admin="p_admin" :charge_admin="charge_admin"></printThree>-->
+      <print-three v-if="org_id == 10106 && this.paramsObj.balance_accounts_type == 2" :info="info" :order_infos="order_infos" :p_admin="p_admin" :charge_admin="charge_admin"></print-three>
     </div>
   </div>
 </template>
@@ -23,13 +25,17 @@
 <script>
   import printOne from './listTemplate/printOne'
   import printTwo from './listTemplate/printTwo'
-  import { getHisOrderDetail } from '@/api/his/his'
+  // import printThree from './listTemplate/printThree'
+
+  import { getHisOrderDetail,getPrivateExpensesOrder } from '@/api/his/his'
   import { uParseTime } from '@/utils/tools'
   import axios from 'axios'
+  import PrintThree from './listTemplate/printThree'
 
   export default {
     name: 'listPrint',
     components: {
+      PrintThree,
       printOne,
       printTwo
     },
@@ -42,8 +48,7 @@
         patient:{},
         order:{},
         admin:{},
-
-
+        order_infos:null,
         info:null,
         p_admin:{},
         charge_admin:{},
@@ -54,7 +59,16 @@
       this.getInfo(this.paramsObj.id)
       this.org_id = this.$store.getters.xt_user.org_id
       if(this.org_id == 10106){
-        this.getInfo10106(this.paramsObj.id)
+        if(this.paramsObj.balance_accounts_type == 2){
+
+          this.getInfoPrivateExpenses10106(this.paramsObj.id)
+
+        }else{
+          this.getInfo10106(this.paramsObj.id)
+
+
+
+        }
       }
 
     },
@@ -204,6 +218,28 @@
         //     scanStyles: false
         //   });
         // }
+      },getInfoPrivateExpenses10106(order_id){
+        let params = {
+          order_id: order_id,
+          admin_user_id:this.$store.getters.xt_user.user.id
+        }
+
+        getPrivateExpensesOrder(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.info = response.data.data.info
+            this.info['org_name'] = response.data.data.org_name
+            this.info['date'] = response.data.data.date
+            this.info['number'] = response.data.data.number
+            this.info['name'] = response.data.data.name
+            this.p_admin = response.data.data.printor_admin
+            this.charge_admin = response.data.data.charge_admin
+            this.order_infos = response.data.data
+          }
+        })
+
       },
       getInfo10106(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 || this.$store.getters.xt_user.org_id == 9990 ) {

src/xt_pages/outpatientCharges/listTemplate/printThree.vue

@@ -0,0 +1,300 @@
+<template>
+    <div id="statement-print" class="statement-print">
+        <div class="statementTitle" style="margin-top:20px;" >医保费用明细清单</div>
+        <!--<div class="statementTitle" style="margin-top:20px;" v-if="info.insutype == '390'">医保费用明细清单</div>-->
+
+        <div style="display:flex">
+            <div style="width:70%">医疗机构名称：{{info.org_name}}</div>
+            <!--<div style="width:30%" v-if="info.hosp_lv == '1'">医院等级：三级特等</div>-->
+            <!--<div style="width:30%" v-if="info.hosp_lv == '2'">医院等级：三级甲等</div>-->
+            <!--<div style="width:30%" v-if="info.hosp_lv == '3'">医院等级：三级乙等</div>-->
+            <!--<div style="width:30%" v-if="info.hosp_lv == '4'">医院等级：三级丙等</div>-->
+            <!--<div style="width:30%" v-if="info.hosp_lv == '5'">医院等级：二级甲等</div>-->
+            <!--<div style="width:30%" v-if="info.hosp_lv == '6'">医院等级：二级乙等</div>-->
+            <!--<div style="width:30%" v-if="info.hosp_lv == '7'">医院等级：二级丙等</div>-->
+            <!--<div style="width:30%" v-if="info.hosp_lv == '8'">医院等级：一级甲等</div>-->
+            <!--<div style="width:30%" v-if="info.hosp_lv == '9'">医院等级：一级乙等</div>-->
+            <!--<div style="width:30%" v-if="info.hosp_lv == '10'">医院等级：一级丙等</div>-->
+            <!--<div style="width:30%" v-if="info.hosp_lv == '11'">医院等级：无等级</div>-->
+
+        </div>
+        <div style="display:flex;justify-content: space-between;border-bottom:1px solid #000;padding-bottom:10px;">
+            <div style="flex:1;">单据编码：{{info.number}}</div>
+            <div style="width:33%">就诊时间：{{getTime(info.date)}}</div>
+            <div>金额单位：元</div>
+        </div>
+        <div style="display:flex">
+            <div style="width:50%">姓名：{{info.name}}</div>
+            <!--<div style="width:50%">个人电脑号：{{info.psn_no}}</div>-->
+        </div>
+        <div style="display:flex">
+            <div style="width:50%">社保卡号</div>
+            <div style="width:50%">诊断：慢性肾脏病5期</div>
+        </div>
+        <!--<div style="display:flex">-->
+            <!--<div style="width:50%" v-if="info.psn_type == '11'">人员类别:在职</div>-->
+            <!--<div style="width:50%" v-if="info.psn_type == '1101'">人员类别:职工在职</div>-->
+            <!--<div style="width:50%" v-if="info.psn_type == '1102'">人员类别:公务员在职</div>-->
+            <!--<div style="width:50%" v-if="info.psn_type == '1103'">人员类别:灵活就业人员在职</div>-->
+            <!--<div style="width:50%" v-if="info.psn_type == '1160'">人员类别:地方其他扩展人员</div>-->
+            <!--<div style="width:50%" v-if="info.psn_type == '12'">人员类别:退休人员</div>-->
+            <!--<div style="width:50%" v-if="info.psn_type == '1201'">人员类别:职工退休</div>-->
+            <!--<div style="width:50%" v-if="info.psn_type == '1202'">人员类别:公务员退休</div>-->
+            <!--<div style="width:50%" v-if="info.psn_type == '1203'">人员类别:灵活就业人员退休</div>-->
+            <!--<div style="width:50%" v-if="info.psn_type == '1260'">人员类别:地方其他扩展人员</div>-->
+            <!--<div style="width:50%" v-if="info.psn_type == '13'">人员类别:离休</div>-->
+            <!--<div style="width:50%" v-if="info.psn_type == '1300'">人员类别:离休人员</div>-->
+            <!--<div style="width:50%" v-if="info.psn_type == '1360'">人员类别:地方其他扩展人员</div>-->
+            <!--<div style="width:50%" v-if="info.psn_type == '14'">人员类别:居民(未成年)</div>-->
+            <!--<div style="width:50%" v-if="info.psn_type == '1401'">人员类别:新生儿</div>-->
+            <!--<div style="width:50%" v-if="info.psn_type == '1402'">人员类别:学龄前儿童</div>-->
+            <!--<div style="width:50%" v-if="info.psn_type == '1403'">人员类别:中小学生</div>-->
+            <!--<div style="width:50%" v-if="info.psn_type == '1404'">人员类别:大学生</div>-->
+            <!--<div style="width:50%" v-if="info.psn_type == '1405'">人员类别:未成年(未入学)</div>-->
+            <!--<div style="width:50%" v-if="info.psn_type == '15'">人员类别:居民(成年)</div>-->
+            <!--<div style="width:50%" v-if="info.psn_type == '1501'">人员类别:普通居民(成年)</div>-->
+            <!--<div style="width:50%" v-if="info.psn_type == '1560'">人员类别:地方其他扩展身份</div>-->
+            <!--<div style="width:50%" v-if="info.psn_type == '16'">人员类别:居民(老年)</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:20%;text-align:center;">医保编码</div>
+            <div style="width:20%;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 style="width:10%;text-align:center;">自费比例</div>
+        </div>
+        <div v-for="(newItem,index) in Object.keys(obj)" :key="index">
+            <div v-if="Object.values(obj)[index].length > 0"  style="border-bottom:1px solid #000;padding:10px 0;">
+                <span v-if="Object.keys(obj)[index] == 'med_chrgitm_type01'">床位费<span>小记：{{ price01 }}</span></span>
+                <span v-if="Object.keys(obj)[index] == 'med_chrgitm_type03'">检查费<span>小记：{{ price03 }}</span></span>
+                <span v-if="Object.keys(obj)[index] == 'med_chrgitm_type04'">化验费<span>小记：{{ price04 }}</span></span>
+                <span v-if="Object.keys(obj)[index] == 'med_chrgitm_type05'">治疗费<span>小记：{{ price05 }}</span></span>
+                <span v-if="Object.keys(obj)[index] == 'med_chrgitm_type06'">手术费<span>小记：{{ price06 }}</span></span>
+                <span v-if="Object.keys(obj)[index] == 'med_chrgitm_type08'">材料费<span>小记：{{ price08 }}</span></span>
+                <span v-if="Object.keys(obj)[index] == 'med_chrgitm_type09'">西药费<span>小记：{{ price09 }}</span></span>
+                <span v-if="Object.keys(obj)[index] == 'med_chrgitm_type11'">中成费<span>小记：{{ price11 }}</span></span>
+                <span v-if="Object.keys(obj)[index] == 'med_chrgitm_type14'">其他费<span>小记：{{ price14 }}</span></span>
+            </div>
+            <div>
+                <div v-if="Object.values(obj)[index].length > 0" v-for="(item,itemIndex) in Object.values(obj)[index]" :key="itemIndex" style="border-bottom:1px solid #000;padding:10px 0;display:flex;" >
+                    <div style="width:20%;text-align:center;" v-if="item.advice_id > 0">{{ item.advice.drug.medical_insurance_number }}</div>
+                    <div style="width:20%;text-align:center;" v-if="item.project_id > 0">{{item.project.type == 2?item.project.project.medical_code: item.project.good_info.medical_insurance_number}}</div>
+                    <div style="width:20%;text-align:center;" v-if="item.advice_id > 0">{{item.advice.drug.drug_name}}</div>
+                    <div style="width:20%;text-align:center;" v-if="item.project_id > 0">{{item.project.type == 2?item.project.project.project_name:item.project.good_info.good_name}}</div>
+
+                    <div style="width:10%;text-align:center;">{{item.pric}}</div>
+                    <div style="width:10%;text-align:center;">{{item.cnt}}</div>
+                    <div style="width:10%;text-align:center;">{{item.det_item_fee_sumamt}}</div>
+                    <div style="width:10%;text-align:center;">{{item.preselfpay_amt}}</div>
+                    <div style="width:10%;text-align:center;">{{item.fulamt_ownpay_amt}}</div>
+                    <div style="width:10%;text-align:center;">{{item.selfpay_prop}}</div>
+                </div>
+            </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;">{{info.medfee_sumamt}}</div>
+            <div style="width:20%;"></div>
+        </div>
+        <div>医保基金支付金额：{{''}}</div>
+        <div>个人现金支付金额：{{info.medfee_sumamt}}</div>
+        <div>其中</div>
+        <div style="display:flex;border-bottom:1px solid #000;padding-bottom:10px;">
+            <div>个人自付：</div>
+            <div>其中：1.乙类自付 {{''}}</div>
+            <div style="margin-left:20px;">2.自费 {{info.medfee_sumamt}}</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>
+    <!-- <div>
+        123
+    <div v-for='(item,index) in Object.values(obj)' :key="index">
+        <div>{{Object.keys(obj)[index]}}</div>
+        <div v-for="it in Object.values(obj)[index]">{{ it.name }}</div>
+    </div>
+    </div> -->
+</template>
+<script>
+  import {uParseTime} from '@/utils/tools'
+  export default {
+    props: {
+      info: {
+        type: Object,
+        default: function () {
+          return {}
+        }
+      },
+      order_infos: {
+        type: Object,
+        default: function () {
+          return {}
+        }
+      },
+      p_admin: {
+        type: Object,
+        default: function () {
+          return {}
+        }
+      }, charge_admin: {
+        type: Object,
+        default: function () {
+          return {}
+        }
+      }
+    },
+    data(){
+      return{
+        obj:{},
+        price01: 0,
+        price03: 0,
+        price04: 0,
+        price05: 0,
+        price06: 0,
+        price08: 0,
+        price09: 0,
+        price11: 0,
+        price14: 0,
+      }
+    },
+    created(){
+      // let obj = {
+      //     med_chrgitm_type01:[{name:1,age:2},{name:'张三',age:41}],
+      //     med_chrgitm_type03:[{name:3,age:4}],
+      //     med_chrgitm_type04:[{name:5,age:6}],
+      // }
+      // this.obj = obj
+      // console.log(1111,Object.values(obj))
+      // obj.map(item => {
+      //     console.log(111,item)
+
+
+      // })
+    },
+    methods: {
+      getTime(val) {
+        if (val < 0) {
+          return ""
+        }
+        if (val == "") {
+          return ""
+        } else {
+          return uParseTime(val, '{y}-{m}-{d}')
+        }
+      },
+      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
+      },
+
+    },
+    watch:{
+      "order_infos.order_infos":{
+        handler(newVal){
+          let obj = {
+            'med_chrgitm_type01':[],
+            'med_chrgitm_type03':[],
+            'med_chrgitm_type04':[],
+            'med_chrgitm_type05':[],
+            'med_chrgitm_type06':[],
+            'med_chrgitm_type08':[],
+            'med_chrgitm_type09':[],
+            'med_chrgitm_type11':[],
+            'med_chrgitm_type14':[],
+          }
+
+          newVal.map(item => {
+
+            if(item.med_chrgitm_type == '01'){
+              obj.med_chrgitm_type01.push(item)
+              this.price01 += item.det_item_fee_sumamt
+            }else if(item.med_chrgitm_type == '03'){
+              obj.med_chrgitm_type03.push(item)
+              this.price03 += item.det_item_fee_sumamt
+            }else if(item.med_chrgitm_type == '04'){
+              obj.med_chrgitm_type04.push(item)
+              this.price04 += item.det_item_fee_sumamt
+            }else if(item.med_chrgitm_type == '05'){
+              obj.med_chrgitm_type05.push(item)
+              this.price05 += item.det_item_fee_sumamt
+            }else if(item.med_chrgitm_type == '06'){
+              obj.med_chrgitm_type06.push(item)
+              this.price06 += item.det_item_fee_sumamt
+            }else if(item.med_chrgitm_type == '08'){
+              obj.med_chrgitm_type08.push(item)
+              this.price08 += item.det_item_fee_sumamt
+            }else if(item.med_chrgitm_type == '09'){
+              obj.med_chrgitm_type09.push(item)
+              this.price09 += item.det_item_fee_sumamt
+            }else if(item.med_chrgitm_type == '11'){
+              obj.med_chrgitm_type11.push(item)
+              this.price11 += item.det_item_fee_sumamt
+            }else if(item.med_chrgitm_type == '14'){
+              obj.med_chrgitm_type14.push(item)
+              this.price14 += item.det_item_fee_sumamt
+            }
+
+          })
+          this.obj = obj
+          console.log('this.obj',this.obj)
+        },
+        deep:true
+      }
+    }
+  }
+
+
+
+</script>
+
+
+<style lang="scss" scoped>
+    #statement-print{
+        width: 800px;
+        margin: 0 auto;
+    }
+    .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: 22px;
+        text-align: center;
+        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/outpatientCharges/listTemplate/printTwo.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="statement-print" class="statement-print">
-    <div class="statementTitle" style="margin-top:20px;" v-if="info.insutype == '310'">医保费用明细清单</div>
-    <div class="statementTitle" style="margin-top:20px;" v-if="info.insutype == '390'">医保费用明细清单</div>
+    <div class="statementTitle" style="margin-top:20px;" >医保费用明细清单</div>
+    <!--<div class="statementTitle" style="margin-top:20px;" v-if="info.insutype == '390'">医保费用明细清单</div>-->
 
     <div style="display:flex">
       <div style="width:70%">医疗机构名称：{{info.fixmedins_name}}</div>

src/xt_pages/outpatientCharges/summaryDetail.vue

@@ -173,7 +173,8 @@ export default {
           listVisible:false,
           allListVisible:false,
           paramsObj:{
-            id:this.$route.query.id
+            id:this.$route.query.id,
+            balance_accounts_type:0
           },
             crumbs: [
                 { path: false, name: '门诊收费' },
@@ -213,10 +214,13 @@ export default {
       open(val){
         if(val == 1){
           this.paramsObj.id == this.$route.query.id
+          this.paramsObj.balance_accounts_type = this.hisPatientInfo.balance_accounts_type
           this.listVisible = true
 
         }else if(val == 2){
           this.paramsObj.id == this.$route.query.id
+          this.paramsObj.balance_accounts_type = this.hisPatientInfo.balance_accounts_type
+
           this.allListVisible = true
         }
       },

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -2700,7 +2700,7 @@
                   delivery_way: temp2[b].delivery_way,
                   execution_frequency: temp2[b].execution_frequency,
                   number_days: temp2[b].number_days.toString(),
-                  total: 1,
+                  total:  temp2[b].cus_total,
                   price: temp2[b].price,
                   remark: '',
                   medical_code: temp2[b].medical_code,
@@ -2752,6 +2752,7 @@
                 number_days: project[i].number_days,
                 price: project[i].price,
                 medical_code: project[i].medical_code,
+                cus_total:1,
                 unit: project[i].unit,
                 type: 2,
                 total:project[i].total
@@ -2771,6 +2772,7 @@
                 delivery_way: '',
                 execution_frequency: '',
                 number_days: 1,
+                cus_total:1,
                 price: good_info[i].packing_price,
                 medical_code: good_info[i].medical_insurance_number,
                 unit: this.getGoodUnit(good_info[i].good_unit),
@@ -2864,7 +2866,7 @@
                   delivery_way: project[i].project.delivery_way,
                   execution_frequency: project[i].project.execution_frequency,
                   number_days: project[i].project.number_days,
-                  total: project[i].number,
+                  cus_total:project[i].number,
                   price: project[i].project.price,
                   remark: '',
                   medical_code: project[i].project.medical_code,
@@ -2885,15 +2887,15 @@
                   delivery_way: '',
                   execution_frequency: '',
                   number_days: '',
-                  total: project[i].number,
+                  cus_total: project[i].number,
                   price: project[i].good_info.retail_price,
                   remark: '',
                   medical_code: project[i].good_info.medical_insurance_number,
                   unit: project[i].good_info.unit,
                   type: project[i].type
                 }
-                if (obj.total == 0 || obj.total == undefined) {
-                  obj.total = 1
+                if (obj.cus_total == 0 || obj.cus_total == undefined) {
+                  obj.cus_total = 1
                 }
                 this.teamList.push(obj)
 

src/xt_pages/stock/cancelStockOrder.vue

@@ -148,8 +148,8 @@
         <el-pagination
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
-          :page-sizes="[10, 50, 100]"
-          :page-size="10"
+          :page-sizes="[5,10, 50, 100]"
+          :page-size="5"
           background
           style="margin-top:20px;float: right"
           layout="total, sizes, prev, pager, next, jumper"
@@ -296,7 +296,7 @@ export default {
       searchKey: "",
       type: 1,
       page: 1,
-      limit: 10,
+      limit: 5,
       checked: false,
       total: 0,
       pageTotal: 0,
@@ -480,7 +480,7 @@ export default {
         ids: idStr
       };
 
-      this.$confirm("确认删除出库退库单记录?", "删除出库退库单记录", {
+      this.$confirm("确认删除退库单记录?", "删除退库单记录", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
@@ -539,7 +539,7 @@ export default {
       const params = {
         ids: idStr
       };
-      this.$confirm("确认删除出库退库单记录?", "删除出库退库单记录", {
+      this.$confirm("确认删除退库单记录?", "删除退库单记录", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"

src/xt_pages/stock/cancelStockOrderAdd.vue

@@ -589,6 +589,9 @@ export default {
               if(msg == 4){
                this.$message.error("该批次退库数量大于入库数量")
              }
+             if(msg == 5){
+              this.$message.error("该批次退库数量大于入库数量")
+             }
              if(msg == 3){
                this.$notify({
                 title: "成功",

src/xt_pages/stock/cancelStockOrderEdit.vue

@@ -545,7 +545,10 @@
                 if(msg == 2){
                   this.$message.error("退库数量大于出库数量")
                 }
-                  if(msg == 4){
+                if(msg == 4){
+                  this.$message.error("该批次退库数量大于入库数量")
+                }
+                 if(msg == 5){
                   this.$message.error("该批次退库数量大于入库数量")
                 }
                 if(msg == 3){

src/xt_pages/stock/drugs/cancelDrugStockOrder.vue

@@ -147,8 +147,8 @@
       <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
-        :page-sizes="[10, 50, 100]"
-        :page-size="10"
+        :page-sizes="[5,10, 15, 100]"
+        :page-size="5"
         background
         style="margin-top:20px;float: right;margin-bottom:10px;"
         layout="total, sizes, prev, pager, next, jumper"
@@ -547,7 +547,7 @@ export default {
       const params = {
         ids: idStr
       };
-      this.$confirm("确认删除出库退库单记录?", "删除出库退库单记录", {
+      this.$confirm("确认删除退库单记录?", "删除退库单记录", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"

src/xt_pages/stock/drugs/cancelDrugStockOrderAdd.vue

@@ -635,7 +635,7 @@ export default {
                 this.$router.back(-1);
               }
               if(response.data.data.msg == 2){
-                this.$message.error("退库数量大于入库数量")
+                this.$message.error("退库数量大于出库数量")
               }
             }
           });

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -525,7 +525,8 @@ export default {
       outList:[],
       userListOne:[],
       exportList:[],
-      batchNumberList:[]
+      batchNumberList:[],
+      drugFlowList:[],
     };
   },
   methods: {
@@ -954,16 +955,13 @@ export default {
           var list =  response.data.data.list
           console.log("list2323232",list)
           var outList = response.data.data.outList
-          // for(let i=0;i<outList.length;i++){
-          //     //如果都是最大单位,把最数量转为最小数量
-          //    if(outList[i].count_unit == outList[i].max_unit){
-          //       outList[i].count = outList[i].min_number * outList[i].count 
-          //    }
-          // }
           this.outList = outList
          console.log("outList222",outList)
          this.manufacturerList = response.data.data.manufacturerList
          this.dealerList = response.data.data.dealerList
+         var drugFlowList = response.data.data.drugFlowList
+         this.drugFlowList = drugFlowList
+         console.log("23232323232323",drugFlowList)
          for(let i=0;i<list.length;i++){
            if(list[i].batch_number == "0" || list[i].batch_number == 0){
               list[i].batch_number = ""
@@ -1081,57 +1079,84 @@ export default {
          return str + min_str
       },
       getTotalCountOne(id,min_number,max_unit,min_unit){
-       
-        for(let i=0;i<this.outList.length;i++){
-          if(this.outList[i].count_unit == this.outList[i].max_unit){
-            this.outList[i].total_count = this.outList[i].count * this.outList[i].min_number
-          }
-
-         if(this.outList[i].count_unit == this.outList[i].min_unit){
-            this.outList[i].total_count = this.outList[i].count
+        var arr = []
+        for(let i=0;i<this.drugFlowList.length;i++){
+          if(id == this.drugFlowList[i].drug_id){
+             arr.push(this.drugFlowList[i])
           }
-       
         }
-        console.log("我的",this.outList)
-          let dataInfo = {};
-          this.outList.forEach((item, index) => {
-            let { drug_id } = item;
-            if (!dataInfo[drug_id]) {
-              dataInfo[drug_id] = {
-                drug_id,
-                child: [],
-                total:0,
-              };
-            }
-          });
-        let list = Object.values(dataInfo);
-        console.log("drug_id22222",list)
-        for(let i=0;i<list.length;i++){
-          for(let j=0;j<this.outList.length;j++){
-            if(list[i].drug_id == this.outList[j].drug_id){
-              list[i].child.push(this.outList[j])
-            }
+        var total = 0
+        for(let i=0;i<arr.length;i++){
+          if(arr[i].max_unit == max_unit){
+             arr[i].count = arr[i].count * arr[i].min_number
           }
+          if(arr[i].max_unit == min_unit){
+            arr[i].count = arr[i].count
+          }
+          total += arr[i].count
         }
-       var total = 0
-       for(let i=0;i<list.length;i++){
-        for(let j=0;j<list[i].child.length;j++){
-           if(id == list[i].child[j].drug_id){
-             total+= list[i].child[j].total_count
-           }
-        }
-       }
+
+        var str = ""
+        var min_str = ""
+        
+        str = parseInt(total/min_number)+ max_unit
+        min_str =  total%min_number + min_unit
+
+        return str + min_str 
+
+      },
+    //   getTotalCountOne(id,min_number,max_unit,min_unit){
+       
+    //     for(let i=0;i<this.outList.length;i++){
+    //       if(this.outList[i].count_unit == this.outList[i].max_unit){
+    //         this.outList[i].total_count = this.outList[i].count * this.outList[i].min_number
+    //       }
+
+    //      if(this.outList[i].count_unit == this.outList[i].min_unit){
+    //         this.outList[i].total_count = this.outList[i].count
+    //       }
+       
+    //     }
+    //     console.log("我的",this.outList)
+    //       let dataInfo = {};
+    //       this.outList.forEach((item, index) => {
+    //         let { drug_id } = item;
+    //         if (!dataInfo[drug_id]) {
+    //           dataInfo[drug_id] = {
+    //             drug_id,
+    //             child: [],
+    //             total:0,
+    //           };
+    //         }
+    //       });
+    //     let list = Object.values(dataInfo);
+    //     console.log("drug_id22222",list)
+    //     for(let i=0;i<list.length;i++){
+    //       for(let j=0;j<this.outList.length;j++){
+    //         if(list[i].drug_id == this.outList[j].drug_id){
+    //           list[i].child.push(this.outList[j])
+    //         }
+    //       }
+    //     }
+    //    var total = 0
+    //    for(let i=0;i<list.length;i++){
+    //     for(let j=0;j<list[i].child.length;j++){
+    //        if(id == list[i].child[j].drug_id){
+    //          total+= list[i].child[j].total_count
+    //        }
+    //     }
+    //    }
       
-      var str = ""
-      var min_str = ""
+    //   var str = ""
+    //   var min_str = ""
       
-      str = parseInt(total/min_number)+ max_unit
-      min_str =  total%min_number + min_unit
+    //   str = parseInt(total/min_number)+ max_unit
+    //   min_str =  total%min_number + min_unit
 
-     return str + min_str
+    //  return str + min_str
       
        
-     },
+    //  },
       getAllPrice(drug_id,price,min_price){
          var strprice = 0
          var minstrprice = 0

src/xt_pages/stock/drugs/drugStockOutOrderAdd.vue

@@ -131,7 +131,7 @@
                         v-for="(item,index) in numberList"
                         :key="index"
                         :label="item.batch_number"
-                        :value="item.batch_number">
+                        :value="item.id">
                       </el-option>
                     </el-select>
                   </el-form-item>
@@ -448,6 +448,7 @@ export default {
       tempObj["number"] = ""
       tempObj["batch_number"] = ""
       tempObj["max_unit"] = ""
+      tempObj["warehouse_info_id"] = 0
       this.recordInfo.recordData.push(tempObj);
     },
     handleDelete: function(index, row) {
@@ -566,12 +567,19 @@ export default {
                   this.recordInfo.recordData[i].dealer = this.dealerList[z].id
               }
             }
+
+            for(let y=0;y<this.numberList.length;y++){
+              if(this.recordInfo.recordData[i].batch_number == this.numberList[y].id){
+                this.recordInfo.recordData[i].batch_number = this.numberList[y].batch_number
+                this.recordInfo.recordData[i].warehouse_info_id = this.numberList[y].id
+              }
+            }
           }
           const params = {
             stockOut: this.recordInfo.recordData
           };
           console.log("params222222",params)
-         
+        
           postDrugWarehouseOut(
             params,
             this.warehouse_out_time,
@@ -740,6 +748,7 @@ export default {
     tempObj["min_number"] = ""
     tempObj["dealer"] = ""
     tempObj["number"] = ""
+    tempObj["warehouse_info_id"] = 0
     this.recordInfo.recordData.push(tempObj);
     this.GetConfigInfo();
     this.propForm.goodUnit = this.$store.getters.good_unit;

src/xt_pages/stock/drugs/drugStockOutOrderEdit.vue

@@ -100,7 +100,7 @@
                         v-for="(item,index) in numberList"
                         :key="index"
                         :label="item.batch_number"
-                        :value="item.batch_number">
+                        :value="item.id">
                       </el-option>
                     </el-select>
                   </el-form-item>
@@ -451,6 +451,7 @@
         tempObj['count_unit'] = ""
         tempObj['dealer'] = 0
         tempObj['manufacturer'] = 0
+        tempObj['warehouse_info_id'] = 0
         this.recordInfo.recordData.push(tempObj)
       }, handleDelete: function(index, row) {
         if(this.drug_show == true){
@@ -574,12 +575,23 @@
                     this.recordInfo.recordData[i].dealer = this.dealerList[z].id
                  }
                }
+               
+               for(let y=0;y<this.numberList.length;y++){
+                  if(this.recordInfo.recordData[i].batch_number == this.numberList[y].id){
+                     this.recordInfo.recordData[i].batch_number = this.numberList[y].batch_number
+                     this.recordInfo.recordData[i].warehouse_info_id =  this.numberList[y].id
+                  }
+                  if(this.recordInfo.recordData[i].batch_number == this.numberList[y].batch_number){
+                     this.recordInfo.recordData[i].warehouse_info_id =  this.numberList[y].id
+                  }
+               }
+
             }
             const params = {
               'stockOut': this.recordInfo.recordData
             }
             console.log("params----",params)
-           
+            
             editDrugWarehouseoutInfo(params, this.warehouse_out_time, this.$route.query.id, this.$route.query.type, this.form.manufacturer, this.form.dealer).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)

src/xt_pages/stock/stockBatchNumber.vue

@@ -150,7 +150,7 @@
       return {
         crumbs: [
           { path: false, name: '库存管理' },
-          { path: '/stock/drugs/stock/query', name: '药品库存查询' },
+          { path: '/stock/drugs/stock/query', name: '耗材库存查询' },
           { path:'/drugstock/in/drugstockflow',name:'库存流水'}
         ],
         keywords: '',

src/xt_pages/user/components/PatientSidebar.vue

@@ -102,10 +102,10 @@ export default {
               name: '1-2',
               label: '病程管理'
             },
-            // {
-            //   name: '1-9',
-            //   label: '阶段小结'
-            // },
+            {
+              name: '1-9',
+              label: '阶段小结'
+            },
             {
               name: '1-3',
               label: '检验检查'
@@ -188,7 +188,7 @@ export default {
       }else if (name == '1-8'){
         this.$router.push({path:'/patients/patients/'+this.id+'/inspectionInfectious'})
       }else if (name == '1-9'){
-        this.$router.push({path:'/patients/patients/'+6092+'/templateSummary'})
+        this.$router.push({path:'/patients/patients/'+2448+'/templateSummary'})
       }
     },
     changePatient(value) {
@@ -334,7 +334,7 @@ export default {
           path: '/patients/patient/' + this.id + '/proeducation'
         })
       }else if (patientKey == '1-9'){
-        this.$router.push({path:'/patients/patients/'+this.id+'/templateSummary'})
+        this.$router.push({path:'/patients/patients/'+2448+'/templateSummary'})
       }
     
      }else{

src/xt_pages/user/doctorAdvice.vue

@@ -2235,7 +2235,8 @@ export default {
               this.adviceForm.advice_name = arr[0]
           }
 
-       
+          console.log("2323223",this.adviceForm)
+        
           EditNewDoctorAdvice(
             this.patientID,
             this.adviceForm.id,
@@ -4059,6 +4060,7 @@ export default {
           this.nameForm.advice_name = arr[0]
        }
       console.log("医嘱2222",this.nameForm)
+     
       var _this = this;
       this.$refs[formName].validate(valid => {
         if (valid) {
@@ -4453,6 +4455,7 @@ export default {
                   type: "",
                   custom_id: "",
                   drug_specs: [],
+                  drug_id:"",
                 }
 
                 medicalList[i].drug_name = medicalList[i].drug_name + "(自备药)"
@@ -4465,6 +4468,7 @@ export default {
                 obj.type = 2
                 obj.custom_id = this.rand(10000000, 99999999)
                 obj.drug_specs = medicalList[i].drug_specs
+                obj.drug_id = medicalList[i].id
                 this.all_drug.push(obj)
               }
             }
@@ -4489,6 +4493,7 @@ export default {
                   type: "",
                   custom_id: "",
                   drug_specs: [],
+                  drug_id:"",
                 }
 
                 obj.drug_name = base_drug_list[i].drug_name
@@ -4500,6 +4505,7 @@ export default {
                 obj.type = 1
                 obj.custom_id = this.rand(10000000, 99999999)
                 obj.drug_specs = base_drug_list[i].drug_specs
+                obj.drug_id = base_drug_list[i].id
                 this.all_drug.push(obj)
               }
             }
@@ -4613,11 +4619,16 @@ export default {
         cb(results);
       },
 
-      handleSelect1(){
-
+      handleSelect1(val){
+        this.drug_id = val.drug_id
+        
       },
-      handleSelect(){
-
+      handleSelect(val){
+        this.src_type = 1
+        this.drug_id = val.drug_id
+        this.nameForm.drug_id = val.drug_id
+        this.nameForm.way = 1
+        this.nameForm.drug_name_id = val.drug_id
       }
   },
   watch: {

src/xt_pages/user/templateSummary.vue

@@ -44,17 +44,17 @@
                 <el-table-column type="selection" width="40" align="center"></el-table-column>
                 <el-table-column label="阶段小结名称" align="center">
                   <template slot-scope="scope">
-                    {{ scope.row.title}}
+                    <!-- {{ scope.row.title}} -->
                   </template>
                 </el-table-column>
                 <el-table-column label="记录时间" align="center">
                   <template slot-scope="scope">
-                    {{ recordTime(scope.row.record_time) }}
+                    <!-- {{ recordTime(scope.row.record_time) }} -->
                   </template>
                 </el-table-column>
                 <el-table-column label="记录医生" align="center">
                   <template slot-scope="scope">
-                    {{ doctorName(scope.row.recorder) }}
+                    <!-- {{ doctorName(scope.row.recorder) }} -->
                   </template>
                 </el-table-column>
               </el-table>
@@ -76,36 +76,55 @@
         <div>
           <div class="new_record_form">
             <div class="cell clearfix">
-              <label class="title"><span class="name">阶段小结时间</span> : </label>
               <el-form>
+                <el-row :gutter="24">
+                  <el-col :span="20">
+                    <el-form-item label="阶段小结名称:">
+                      <el-input v-model="form.title"></el-input>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
                  <el-row :gutter="24">
                   <el-col :span="8">
-                    <el-form-item>
+                    <el-form-item label="阶段小结时间:">
                         <el-date-picker
-                            v-model="value"
+                            v-model="form.start_year"
                             type="year"
+                            value-format="yyyy-MM-dd"
                             placeholder="选择年">
                         </el-date-picker>
                     </el-form-item> 
                   </el-col>
                   <el-col :span="8">
                     <el-form-item>
-                      <el-radio-group v-model="radio">
+                      <el-radio-group v-model="form.radio">
                         <el-radio :label="1" >月份</el-radio>
                         <el-radio :label="2" >季度</el-radio>
                      </el-radio-group>
                     </el-form-item> 
                   </el-col>
-                  <el-col :span="8">
+                  <el-col :span="8" v-if="form.radio == 1">
                     <el-form-item>
                       <el-date-picker
-                        v-model="value"
+                        value-format="MM"
+                        v-model="form.start_month"
                         type="month"
                         placeholder="选择月">
                       </el-date-picker>
                     </el-form-item> 
                   </el-col>
-                   
+                  <el-col :span="8" v-if="form.radio == 2">
+                    <el-form-item>
+                       <el-select v-model="form.quarter" placeholder="请选择">
+                        <el-option
+                          v-for="item in timeType"
+                          :key="item.id"
+                          :label="item.name"
+                          :value="item.id">
+                        </el-option>
+                      </el-select>
+                    </el-form-item> 
+                  </el-col> 
                  </el-row>  
                 
               </el-form>
@@ -117,46 +136,52 @@
                   <el-row :gutter="24">
                     <el-col :span="8">
                      <el-form-item label="干体重">
-                      <el-input></el-input>
+                      <el-input v-model="form.dry_weight"></el-input>
                      </el-form-item>  
                     </el-col>
                     <el-col :span="8">
                      <el-form-item label="共透析(次)">
-                      <el-input></el-input>
+                      <el-input v-model="form.dialysis_count"></el-input>
                      </el-form-item>  
                     </el-col>
                     <el-col :span="8">
                      <el-form-item label="HD(次)">
-                      <el-input></el-input>
+                      <el-input v-model="form.hd_count"></el-input>
                      </el-form-item>  
                     </el-col>
                   </el-row>
                   <el-row :gutter="24">
                     <el-col :span="8">
                      <el-form-item label="HDF(次)">
-                      <el-input></el-input>
+                      <el-input v-model="form.hdf_count"></el-input>
                      </el-form-item>  
                     </el-col>
                     <el-col :span="8">
                      <el-form-item label="HP(次)">
-                      <el-input></el-input>
+                      <el-input v-model="form.hp_count"></el-input>
                      </el-form-item>  
                     </el-col>
                     <el-col :span="8">
                      <el-form-item label="其他(次)">
-                      <el-input></el-input>
+                      <el-input v-model="form.other_count"></el-input>
                      </el-form-item>  
                     </el-col>
                   </el-row>
                    <el-row :gutter="24">
                     <el-col :span="8">
                      <el-form-item label="透析器">
-                      <el-input></el-input>
+                      <el-input v-model="form.dialzer_apparatus"></el-input>
                      </el-form-item>  
                     </el-col>
+                    <el-col :span="8">
+                      <el-form-item label="灌流器">
+                        <el-input v-model="form.perfusion_apparatus"></el-input>
+                      </el-form-item>  
+                    </el-col>
+
                     <el-col :span="8">
                      <el-form-item label="抗凝剂">
-                      <el-input></el-input>
+                      <el-input v-model="form.anticoagulant"></el-input>
                      </el-form-item>  
                     </el-col>
                   </el-row>
@@ -164,17 +189,17 @@
                    <el-row :gutter="24">
                     <el-col :span="8">
                      <el-form-item label="钾">
-                      <el-input></el-input>
+                      <el-input v-model="form.kalium"></el-input>
                      </el-form-item>  
                     </el-col>
                     <el-col :span="8">
                      <el-form-item label="钙">
-                      <el-input></el-input>
+                      <el-input v-model="form.autunite"></el-input>
                      </el-form-item>  
                     </el-col>
                     <el-col :span="8">
                      <el-form-item label="钠">
-                      <el-input></el-input>
+                      <el-input v-model="form.natrium"></el-input>
                      </el-form-item>  
                     </el-col>
                   </el-row>
@@ -182,43 +207,43 @@
                    <el-row :gutter="24">
                     <el-col :span="8">
                      <el-form-item label="时">
-                      <el-input></el-input>
+                      <el-input v-model="form.hour"></el-input>
                      </el-form-item>  
                     </el-col>
                     <el-col :span="8">
                      <el-form-item label="分">
-                      <el-input></el-input>
+                      <el-input v-model="form.minute"></el-input>
                      </el-form-item>  
                     </el-col>
                   </el-row>
                   <el-row :gutter="24">
                     <el-col :span="8">
                      <el-form-item label="透前体重(kg)">
-                      <el-input></el-input>
+                      <el-input v-model="form.befor_weight"></el-input>
                      </el-form-item>  
                     </el-col>
                     <el-col :span="8">
                      <el-form-item label="透后体重(kg)">
-                      <el-input></el-input>
+                      <el-input v-model="form.after_weight"></el-input>
                      </el-form-item>  
                     </el-col>
                   </el-row>
                    <el-row :gutter="24">
                     <el-col :span="8">
                      <el-form-item label="透前血压(mmHg)">
-                      <el-input></el-input>
+                      <el-input v-model="form.befor_pressure"></el-input>
                      </el-form-item>  
                     </el-col>
                     <el-col :span="8">
                      <el-form-item label="透后血压(mmHg)">
-                      <el-input></el-input>
+                      <el-input v-model="form.after_pressure"></el-input>
                      </el-form-item>  
                     </el-col>
                   </el-row>
                  
                   <el-row>
                     <label class="title"><span class="name">阶段小结总结</span> : </label>
-                     <el-select v-model="value" placeholder="请选择">
+                     <el-select v-model="form.template_summary_id" placeholder="请选择">
                         <el-option
                         v-for="item in options"
                         :key="item.value"
@@ -226,11 +251,11 @@
                         :value="item.value">
                         </el-option>
                      </el-select>
-                     <el-input tyep="text"></el-input>
+                     <el-input tyep="text" v-model="form.template_summary_content"></el-input>
                   </el-row>
                   <el-row>
                     <label class="title"><span class="name">阶段小结个体化透析方案</span> : </label>
-                     <el-select v-model="value" placeholder="请选择">
+                     <el-select v-model="form.template_plan_id" placeholder="请选择">
                         <el-option
                         v-for="item in options"
                         :key="item.value"
@@ -238,11 +263,11 @@
                         :value="item.value">
                         </el-option>
                      </el-select>
-                     <el-input tyep="text"></el-input>
+                     <el-input tyep="text" v-model="form.template_plan_content"></el-input>
                   </el-row>
                   <el-row>
                     <label class="title"><span class="name">阶段小结化验结果</span> : </label>
-                     <el-select v-model="value" placeholder="请选择">
+                     <el-select v-model="form.template_inspection_id" placeholder="请选择">
                         <el-option
                         v-for="item in options"
                         :key="item.value"
@@ -250,12 +275,12 @@
                         :value="item.value">
                         </el-option>
                      </el-select>
-                     <el-input tyep="text"></el-input>
+                     <el-input tyep="text" v-model="form.template_inspection_content"></el-input>
                   </el-row>
                   <el-row>
                     <el-col :span="8">
                       <el-form-item label="记录医生">
-                        <el-select v-model="value" placeholder="请选择">
+                        <el-select v-model="form.admin_user_id" placeholder="请选择">
                             <el-option
                             v-for="item in options"
                             :key="item.value"
@@ -268,7 +293,7 @@
                     <el-col :span="8">
                       <el-form-item label="记录时间">
                          <el-date-picker
-                            v-model="value1"
+                            v-model="form.record_time"
                             type="datetime"
                             placeholder="选择日期时间">
                         </el-date-picker>
@@ -282,8 +307,7 @@
           
             <div style="text-align: right; padding-right: 0px; padding-top: 10px; padding-bottom: 10px;">
               <el-button @click="show_dialog = false">取消</el-button>
-              <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" type="primary"
-                         @click="createAction" :loading="uploading_new_record">保存
+              <el-button type="primary" @click="createAction">保存
               </el-button>
             </div>
           </div>
@@ -291,50 +315,7 @@
       </el-dialog>
 
 
-      <el-dialog title="修改病程记录" width="50%" top="5vh" :visible.sync="show_edit_dialog">
-        <div>
-          <div class="new_record_form">
-            <div class="cell clearfix">
-              <label class="title"><span class="name">病程日期</span> : </label>
-              <el-date-picker v-model="edit_course_of_disease_time" prefix-icon="el-icon-date" :editable="false"
-                              style="width: 200px;"
-                              type="datetime"
-                              placeholder="选择日期时间" align="right" format="yyyy-MM-dd HH:mm"
-                              value-format="yyyy-MM-dd HH:mm"></el-date-picker>
-
-              <label class="title"><span class="name">日常病程</span> : </label>
-              <el-select v-model="select_template" placeholder="可选择病程模板" @change="didEditSelectTemplate">
-                <el-option v-for="(option, index) in templates" :key="index" :label="option.title"
-                           :value="option.content"></el-option>
-              </el-select>
-            </div>
-
-
-            <div class="cell clearfix" style="margin-top: 10px">
-              <label class="title"><span class="name">病程标题</span> : </label>
-              <el-input v-model="edit_title" style="width: 420px"></el-input>
-            </div>
-
-            <div class="textarea_panel">
-              <!--<el-input v-model="edit_new_content" type="textarea" rows="6" resize="none"></el-input>-->
-              <keep-alive>
-                <editor ref="edit_neditor"
-                        id="edit_editor"
-                        style="width: 600px"
-                        v-bind:r_content="edit_new_content">
-                </editor>
-              </keep-alive>
-            </div>
-
-            <div style="text-align: right; padding-right: 0px; padding-top: 10px; padding-bottom: 10px;">
-              <el-button @click="show_edit_dialog = false">取消</el-button>
-              <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" type="primary"
-                         @click="modifyAction" :loading="uploading_new_record">保存
-              </el-button>
-            </div>
-          </div>
-        </div>
-      </el-dialog>
+  
     </div>
   </div>
 
@@ -345,16 +326,11 @@
   import PatientSidebar from './components/PatientSidebar'
   import Editor from '@/components/Editor'
 
-  import {
-    createCourseOfDiseaseRecord,
-    deleteCourseOfDiseaseRecords,
-    getCourseOfDiseaseRecords,
-    modifyCourseOfDiseaseRecord,
-    GetCoursePrintData
-  } from '@/api/patient'
+  import { getInitDataList } from '@/api/patient'
   import { parseTime } from '@/utils'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
-
+  import { uParseTime } from '@/utils/tools'
+  const moment = require('moment')
   export default {
     name: 'templateSummary',
     components: {
@@ -386,8 +362,50 @@
         table_current_index: -1,
         edit_current_id: 0,
         edit_title: '',
-        radio:1,
-        value:''
+        value:'',
+        form:{
+          title:"",
+          start_year:new Date(),
+          start_month:new Date(),
+          radio:1,
+          quarter:1,
+          dry_weight:"",
+          dialysis_count:"",
+          hd_count:"",
+          hdf_count:"",
+          hp_count:"",
+          other_count:"",
+          dialzer_apparatus:"",
+          perfusion_apparatus:"",
+          anticoagulant:"",
+          kalium:"",
+          autunite:"",
+          natrium:"",
+          houer:"",
+          minute:"",
+          befor_weight:"",
+          after_weight:"",
+          befor_pressure:"",
+          after_pressure:"",
+          template_summary_id:"",
+          template_summary_content:"",
+          template_plan_id:"",
+          template_summary_content:"",
+          template_inspection_id:"",
+          template_inspection_content:"",
+          admin_user_id:"",
+          record_time:"",
+          patient_id:"",
+          start_time:"",
+          end_time:"",
+        },
+        timeType:[
+          {id:1,name:"第一季度"},
+          {id:2,name:"第二季度"},
+          {id:3,name:"第三季度"},
+          {id:4,name:"第四季度"},
+        ],
+        options:[],
       }
     },
     created() {
@@ -423,179 +441,79 @@
         (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
         '-' +
         (nowDay < 10 ? '0' + nowDay : nowDay)
-
-      this.requestCourseRecords()
-
+      this.getlist()
     },
     methods: {
-      requestCourseRecords: function() {
-        this.loading = true
-        getCourseOfDiseaseRecords(this.patient_id, this.start_time, this.end_time).then(rs => {
-          this.loading = false
-          var resp = rs.data
-          if (resp.state == 1) {
-            this.current_select_record = null
-            this.records = resp.data.records
-            this.doctors = resp.data.doctors
-
-          } else {
-            this.$message.error(resp.msg)
-          }
-        }).catch(error => {
-          this.loading = false
-          this.$message.error(error)
-        })
+      getTime(val) {
+         if(val < 0){
+           return ""
+         }
+         if(val == ""){
+          return ""
+         }else {
+          return uParseTime(val, '{y}-{m}-{d}')
+         }
       },
+      showEdit(){
 
-      didChangeCurrentRecord: function(record) {
-        this.current_select_record = record
       },
-      recordTime: function(timestamp) {
-        var time = new Date(timestamp * 1000)
-        return parseTime(time, '{y}-{m}-{d} {h}:{m}')
+      deleteAction(){
+
       },
-      doctorName: function(doctor_id) {
-        for (let index = 0; index < this.doctors.length; index++) {
-          const doctor = this.doctors[index]
-          if (doctor.id == doctor_id) {
-            return doctor.name
-          }
-        }
-        return ''
+      onRowClick(){
+
       },
-      modifyAction: function() {
+      createAction(){
 
-        this.edit_new_content = this.$refs.edit_neditor.content
-        if (this.edit_new_content.length == 0) {
-          this.$message.error('请填写病程内容')
-          return
-        }
-        this.uploading_new_record = true
-        modifyCourseOfDiseaseRecord(this.patient_id, this.edit_new_content, this.edit_course_of_disease_time, this.edit_current_id, this.edit_title).then(rs => {
-          this.uploading_new_record = false
-          var resp = rs.data
-          if (resp.state == 1) {
-            this.records[this.table_current_index].content = resp.data.record.content
-            this.records[this.table_current_index].record_time = resp.data.record.record_time
-            this.records[this.table_current_index].recorder = resp.data.record.recorder
-            this.records[this.table_current_index].title = resp.data.record.title
-
-            this.show_edit_dialog = false
-            this.edit_new_content = ''
-            this.table_current_index = -1
-
-          } else {
-            this.table_current_index = -1
-            this.$message.error(resp.msg)
-          }
-
-        }).catch(error => {
-          this.table_current_index = -1
-          this.uploading_new_record = false
-          this.$message.error(error)
-        })
+      },
+      didChangeCurrentRecord(){
 
       },
+      startTimeChange(){
 
-      createAction: function() {
-        this.new_content = this.$refs.editor.content
-        if (this.new_content.length == 0) {
-          this.$message.error('请填写病程内容')
-          return
-        }
-        this.uploading_new_record = true
-        
-        createCourseOfDiseaseRecord(this.patient_id, this.new_content, this.course_of_disease_time, this.title).then(rs => {
-          this.uploading_new_record = false
-          var resp = rs.data
-          if (resp.state == 1) {
-            this.records.unshift(resp.data.record)
-            // this.$refs.record_table.setCurrentRow()
-            // this.$refs.record_table.setCurrentRow(this.records[0])
-            // this.current_select_record = this.records[0]
-            this.show_dialog = false
-            this.new_content = ''
-            this.title = ''
-
-          } else {
-            this.$message.error(resp.msg)
-          }
-
-        }).catch(error => {
-          this.uploading_new_record = false
-          this.$message.error(error)
-        })
       },
-      didSelectTemplate: function(templateContent) {
-        this.new_content = this.new_content.length > 0 ? (this.new_content + templateContent) : templateContent
+      endTimeChange(){
 
-      }, didEditSelectTemplate: function(templateContent) {
-        this.edit_new_content = this.edit_new_content.length > 0 ? (this.edit_new_content + templateContent) : templateContent
       },
+      print(){
 
-      didSelectionChange: function(selectRows) {
-        this.selectingRows = selectRows
       },
-      deleteAction: function() {
-        if (this.selectingRows.length == 0) {
-          return
-        }
-        var ids = []
-        for (let index = 0; index < this.selectingRows.length; index++) {
-          const row = this.selectingRows[index]
-          ids.push(row.id)
+      getQuarter(year,quarter){
+        var start_time = ""
+        if(quarter == 1){
+           
         }
-        var ids_str = ids.join(',')
-        this.loading = true
-        deleteCourseOfDiseaseRecords(this.patient_id, ids_str).then(rs => {
-          var resp = rs.data
-          if (resp.state == 1) {
-            for (let id_index = 0; id_index < ids.length; id_index++) {
-              for (let record_index = 0; record_index < this.records.length; record_index++) {
-                if (ids[id_index] == this.records[record_index].id) {
-                  this.records.splice(record_index, 1)
-                  break
-                }
-              }
-            }
-            this.selectingRows = []
-            this.$message.success('已删除')
-
-          } else {
-            this.$message.error(resp.msg)
-          }
-          this.loading = false
-        }).catch(err => {
-          this.loading = false
-          this.$message.error(err)
-        })
-      }, startTimeChange(val) {
-        this.requestCourseRecords()
-      }, endTimeChange(val) {
-        this.requestCourseRecords()
-      }, showEdit() {
-        if (this.table_current_index == -1) {
-          this.$message.error('请选择要修改的病程内容')
-          return
-        }
-        this.show_edit_dialog = true
-        this.edit_course_of_disease_time = this.recordTime(this.records[this.table_current_index].record_time)
-        this.edit_new_content = this.records[this.table_current_index].content
-        this.edit_current_id = this.records[this.table_current_index].id
-        this.edit_title = this.records[this.table_current_index].title
-        this.$refs.record_table.setCurrentRow(null)
-
-      }, tableRow({ row, rowIndex }) {
-        // 把每一行的索引放进row
-        row.index = rowIndex
-      }, onRowClick(row, event, column) {
-        this.table_current_index = row.index
-      },print(){
-        if (this.table_current_index == -1) {
-          this.$message.error('请选择要打印的病程')
-          return
+
+        // DateTime dt = new DateTime();
+        // switch (quarter)
+        // {
+        //     case "第一季度":
+        //         dt = new DateTime(year, 1, 1);
+        //         break;
+        //     case "第二季度":
+        //         dt = new DateTime(year, 4, 1);         
+        //         break;
+        //     case "第三季度":
+        //         dt = new DateTime(year, 7, 1);           
+        //         break;
+        //     case "第四季度":
+        //         dt = new DateTime(year, 10, 1);             
+        //         break;
+
+        // }
+
+      },
+      getlist(){
+        var params={
+        start_year:this.getTime(this.form.start_year),
+        start_month:this.getTime(this.form.start_month),
+        quarter:this.form.quarter,
         }
-        this.$router.push({ path: "/course/print?id="+this.records[this.table_current_index].id});
+        console.log("param222222",params)
+        console.log(moment(moment(2020 + '-01-01').toDate()).quarter(2).format("YYYY-MM-DD"))
+      getInitDataList(params).then(response=>{
+
+      })
       }
     }
   }