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

src/lang/zh.js

@@ -368,8 +368,12 @@ export default {
     nursing_record: '透析护理记录',
     special_record: '特殊记录',
     template_summary: '治疗小结',
-    template_plan: '个性化方案'
-    // admitting_diagnosis: '入院诊断',
-    // discharge_diagnosis: '出院诊断'
+    template_plan: '个性化方案',
+    admitting_diagnosis: '入院诊断',
+    discharge_diagnosis: '出院诊断',
+    diagnosis_admission: '入院时病情',
+    treatment: '诊疗经过',
+    illness_discharge: '出院时病情',
+    discharge_advice: '出院医嘱'
   }
 }

src/xt_pages/data/template.vue

@@ -48,7 +48,11 @@ export default {
         { label: this.$t("data_config.rescue_record"), key: "rescue_record" },
         { label: this.$t("data_config.template_summary"), key: "template_summary" },
         { label: this.$t("data_config.template_plan"), key: "template_plan" },
-        // { label: this.$t("data_config.admitting_diagnosis"), key: "admitting_diagnosis" }
+        { label: this.$t("data_config.admitting_diagnosis"), key: "admitting_diagnosis" },
+        { label: this.$t("data_config.discharge_diagnosis"), key:"discharge_diagnosis"},
+        { label: this.$t("data_config.diagnosis_admission"), key:"diagnosis_admission"},
+        { label: this.$t("data_config.treatment"), key:"treatment"},
+        { label: this.$t("data_config.illness_discharge"), key:"illness_discharge"},
       ],
       activeName: "education",
       createdTimes: 0

src/xt_pages/hospitalStation/components/deskPrescription.vue

@@ -1705,7 +1705,7 @@
           }
         }
 
-        return total.toFixed(24)
+        return total.toFixed(2)
       },
       createFilter(queryString) {
         return (restaurant) => {

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -461,8 +461,8 @@
             scanStyles: false
           })
         }
-        
-        
+
+
         this.innerVisible = false
         // this.$nextTick(() => {
         //   this.$refs.print.printThisPage()

src/xt_pages/outpatientDoctorStation/prescriptionTemplate.vue

@@ -179,6 +179,7 @@
         this.limit = 10
         this.patient_id = val.id
         this.patient_name = val.name
+
         let params = {
           patient_id: val.id,
           page: this.page,

src/xt_pages/outpatientTool/components/settle.vue

@@ -91,6 +91,18 @@
           <el-table-column align="center" prop="item_name" label="个人支付金额">
               <template slot-scope="scope">{{scope.row.psn_cash_pay.toFixed(2)}}</template>
           </el-table-column>
+          <el-table-column align="center" prop="item_name" label="基金统筹金额">
+              <template slot-scope="scope">{{scope.row.hifp_pay.toFixed(2)}}</template>
+          </el-table-column>
+
+          <el-table-column align="center" prop="item_name" label="大额基金支付">
+              <template slot-scope="scope">{{scope.row.hifob_pay.toFixed(2)}}</template>
+          </el-table-column>
+
+
+          <el-table-column align="center" prop="item_name" label="医疗救助基金">
+              <template slot-scope="scope">{{scope.row.maf_pay.toFixed(2)}}</template>
+          </el-table-column>
 
           <el-table-column align="center" prop="item_name" label="企业补充医疗保险基金支出">
               <template slot-scope="scope">{{scope.row.hifes_pay.toFixed(2)}}</template>
@@ -101,6 +113,8 @@
               <template slot-scope="scope">{{scope.row.hifmi_pay.toFixed(2)}}</template>
           </el-table-column>
 
+
+
           <el-table-column align="center" prop="total" label="费用总额">
               <template slot-scope="scope">
                   <div>{{scope.row.total.toFixed(2)}}</div>
@@ -347,6 +361,11 @@
           let psn_cash_pay = ""
           let hifes_pay = ""
           let hifmi_pay = ""
+          let hifp_pay = ""
+          let hifob_pay = ""
+          let maf_pay = ""
+
+
           let total = ""
 
           if(order.setl_time.length == 0){
@@ -377,10 +396,15 @@
 
           medfee_sumamt = order.medfee_sumamt
           fund_pay_sumamt = order.fund_pay_sumamt
+
           acct_pay = order.acct_pay
+
           psn_cash_pay = order.psn_cash_pay
           hifes_pay = order.hifes_pay
           hifmi_pay = order.hifmi_pay
+          hifp_pay = order.hifp_pay
+          hifob_pay = order.hifob_pay
+          maf_pay = order.maf_pay
           total = order.total
 
 
@@ -391,6 +415,9 @@
             '处方类型': med_type,
             '医疗费总额': medfee_sumamt,
             '基金支付金额': fund_pay_sumamt,
+            '基金统筹金额': hifp_pay,
+            '大额基金支付':hifob_pay,
+            '医疗救助基金':maf_pay,
             '个人账户支付金额': acct_pay,
             '个人支付基金': psn_cash_pay,
             '企业补充医疗保险基金支出': hifes_pay,

src/xt_pages/qcd/workAnalysis/nurse.vue

@@ -155,7 +155,7 @@
                 <span v-if="getTotalCount(scope.row.admin_user_id)!=''">({{getTotalCount(scope.row.admin_user_id)}})</span>
               </template>
             </el-table-column>
-            
+
              <el-table-column label="下机" align="center">
               <template slot-scope="scope">
                 {{scope.row.finish_nuser_count?scope.row.finish_nuser_count:''}}
@@ -164,7 +164,7 @@
 
             <el-table-column label="冲管" align="center">
               <template slot-scope="scope">
-                {{scope.row.finish_nuser_count?scope.row.finish_nuser_count:''}}
+                {{scope.row.washpipe_nuser_count?scope.row.washpipe_nuser_count:''}}
               </template>
             </el-table-column>
 

src/xt_pages/stock/drugs/components/drugCancelDetail.vue

@@ -70,46 +70,6 @@
       </div>
     </div>
 
-    
-
-    <!-- <div class="cell clearfix">
-      <label class="title"><span class="name">单据类型</span> : </label>
-      <el-select
-        size="small"
-        v-model="order_type"
-        clearable
-        placeholder="单据类型"
-        @change="changeType"
-      >
-        <el-option
-          v-for="item in orderTypeArr"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"
-        >
-        </el-option>
-      </el-select>
-    </div> -->
-<!-- 
-    <div class="cell clearfix">
-      <label class="title"><span class="name">其它</span> : </label>
-      <el-select
-        size="small"
-        v-model="manufacturer_id"
-        clearable
-        placeholder="厂商"
-        @change="changeManufacturer"
-      >
-        <el-option
-          v-for="item in manufacturer"
-          :key="item.id"
-          :label="item.manufacturer_name"
-          :value="item.id"
-        >
-        </el-option>
-      </el-select>
-    </div> -->
-
     <el-row :gutter="12" style="margin-top: 10px">
       <el-table
         :data="tableData"
@@ -135,6 +95,7 @@
             <span v-if="scope.row.drug_type == 1">西药</span>
             <span v-if="scope.row.drug_type == 2">草药</span>
             <span v-if="scope.row.drug_type == 3">成药</span>
+            <!-- {{getTypeList(scope.row.drug_type)}} -->
           </template>
         </el-table-column>
 
@@ -273,6 +234,7 @@ export default {
       tableData:[],
       tableList:[],
       tableDataList:[],
+      drugTypeList:[],
     };
   },
   methods: {
@@ -386,6 +348,7 @@ export default {
          if(response.data.state == 1){
            var order =  response.data.data.order
            var list = response.data.data.orderPrint
+           //this.drugTypeList = response.data.data.drugTypeList
            for(let i=0;i<list.length;i++){
              list[i].child = []
             for(let j=0;j<order.length;j++){
@@ -436,15 +399,16 @@ export default {
     },
     exportList(){
        for(let i=0;i<this.tableDataList.length;i++){
-          if(this.tableDataList[i].drug_type == 1){
-            this.tableDataList[i].drug_type == "西药"
-          }
-          if(this.tableDataList[i].drug_type == 2){
-            this.tableDataList[i].drug_type == "草药"
-          }
-         if(this.tableDataList[i].drug_type == 3){
-            this.tableDataList[i].drug_type == "成药"
-          }
+        //   if(this.tableDataList[i].drug_type == 1){
+        //     this.tableDataList[i].drug_type == "西药"
+        //   }
+        //   if(this.tableDataList[i].drug_type == 2){
+        //     this.tableDataList[i].drug_type == "草药"
+        //   }
+        //  if(this.tableDataList[i].drug_type == 3){
+        //     this.tableDataList[i].drug_type == "成药"
+        //   }
+          this.tableList[i].drug_type = this.getTypeList(scope.row.drug_type)
           this.tableDataList[i].index = i+1
           this.tableDataList[i].unit = this.tableDataList[i].dose + this.tableDataList[i].dose_unit + "*"+this.tableDataList[i].min_number + this.tableDataList[i].min_unit+"/"+this.tableDataList[i].max_unit
           this.tableDataList[i].user_name = this.getAdminUser(this.tableDataList[i].creater)
@@ -516,7 +480,16 @@ export default {
          }
       }
       return total
-    }
+    },
+    getTypeList(id){
+      var name = ""
+      for(let i=0;i<this.drugTypeList.length;i++){
+        if(id == this.drugTypeList[i].value){
+          name = this.drugTypeList[i].name
+        }
+      }
+      return name
+    } 
   }
 };
 </script>

src/xt_pages/stock/drugs/components/drugInOrder.vue

@@ -98,6 +98,7 @@
             <span v-if="scope.row.drug_type == 1">西药</span>
             <span v-if="scope.row.drug_type == 2">草药</span>
             <span v-if="scope.row.drug_type == 3">成药</span>
+            <!-- {{getTypeList(scope.row.drug_type)}} -->
           </template>
         </el-table-column>
 
@@ -236,6 +237,7 @@ export default {
       dealer: [],
       tableList:[],
       tabelePrintList:[],
+      drugTypeList:[],
     };
   },
   methods: {
@@ -344,6 +346,9 @@ export default {
       getDrugIndetail(params).then(response=>{
         if(response.data.state == 1){
           var drugInOrder = response.data.data.detail
+          var drugTypeParent = response.data.data.drugTypeParent
+          console.log("药品类型",drugTypeParent)
+        //  this.drugTypeList = drugTypeParent
           var total_price = 0
           for(let i=0;i<drugInOrder.length;i++){
              drugInOrder[i].specification_name  = drugInOrder[i].dose + drugInOrder[i].dose_unit + "*" + drugInOrder[i].min_number +  drugInOrder[i].min_unit + "/" + drugInOrder[i].max_unit
@@ -483,16 +488,7 @@ export default {
        for(let i=0;i<newArr.length;i++){
           newArr.specification_name = ""
           newArr.index = i+1
-          if(newArr[i].drug_type == 1){
-             newArr[i].drugtype = "西药"
-          }
-          if(newArr[i].drug_type == 2){
-             newArr[i].drugtype = "草药"
-          }
-          if(newArr[i].drug_type == 3){
-             newArr[i].drugtype = "成药"
-          }
-        
+         newArr[i].drugtype = this.getTypeList(newArr[i].drug_type)
          newArr[i].specification_name = newArr[i].dose + newArr[i].dose_unit +"*" + newArr[i].min_number + newArr[i].min_unit +  "/" + newArr[i].max_unit
 
          newArr[i].time = this.getTime(newArr[i].ctime)
@@ -513,7 +509,15 @@ export default {
         })
 
      },
-    
+    getTypeList(id){
+      var name = ""
+      for(let i=0;i<this.drugTypeList.length;i++){
+        if(id == this.drugTypeList[i].value){
+           name = this.drugTypeList[i].name
+        }
+      }
+      return name
+    }
   }
 };
 </script>

src/xt_pages/stock/drugs/components/drugOutDetail.vue

@@ -136,6 +136,7 @@
             <span v-if="scope.row.drug_type == 1">西药</span>
             <span v-if="scope.row.drug_type == 2">草药</span>
             <span v-if="scope.row.drug_type == 3">成药</span>
+            <!-- {{getTypeList(scope.row.drug_type)}} -->
           </template>
         </el-table-column>
 
@@ -285,6 +286,7 @@ export default {
       drugList:[],
       tablePrint:[],
       org_id:0,
+      drugTypeList:[],
     };
   },
   methods: {
@@ -441,6 +443,8 @@ export default {
           for(let i=0;i<order.length;i++){
             order[i].total_price = order[i].total_price.toFixed(2)
           }
+        //  this.drugTypeList = response.data.data.drugTypeList
+          
           this.tableData = order
            let objInfo = {}
           order.forEach((item,index)=>{
@@ -558,15 +562,8 @@ export default {
        const filterVal = ['index','warehouse_out_order_number', 'drugtype', 'drug_name','specification_name','time','user_name','price','count','total_price']
        for(let i=0;i<this.tableData.length;i++){
          this.tableData[i].index = i+1
-         if(this.tableData[i].drug_type == 1){
-            this.tableData[i].drugtype = "西药"
-         }
-         if(this.tableData[i].drug_type == 2){
-            this.tableData[i].drugtype = "草药"
-         }
-         if(this.tableData[i].drug_type == 3){
-            this.tableData[i].drugtype = "成药"
-         }
+   
+        this.tableData[i].drugtype = this.getTypeList(this.tableData[i].drugtype)
         this.tableData[i].specification_name = this.tableData[i].dose + this.tableData[i].dose_unit +"*" + this.tableData[i].min_number + this.tableData[i].min_unit +  "/" + this.tableData[i].max_unit
         this.tableData[i].time = this.getTime(this.tableData[i].ctime)
         this.tableData[i].user_name = this.getAdminUser(this.tableData[i].creater)
@@ -744,6 +741,15 @@ export default {
         }
         return (count*price)
       },
+      getTypeList(id){
+        var name = ""
+        for(let i=0;i<this.drugTypeList.length;i++){
+          if(id == this.drugTypeList[i].value){
+            name = this.drugTypeList[i].name
+          }
+        }
+        return name
+      } 
   }
 };
 </script>

src/xt_pages/stock/stockPrint.vue

@@ -41,19 +41,29 @@
                                    <td>
                                       <span v-if="getWareInfo(item.xt_warehouse_info)>0">{{getWareInfo(item.xt_warehouse_info)}}{{item.packing_unit}}</span>
                                    </td>
-                                   <td>
+                                   <td v-if="end_time == ''">
                                       <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id== 10245 || org_id == 9779">
                                         <span>
-                                          {{getWareInfo(item.xt_warehouse_info) - getOverFlushInfo(item.xt_warehouse_info) + getCancelSotckInfo(item.cancel_stock_info) }}
-                                          </span>
+                                          {{getWareInfo(item.xt_warehouse_info) - getOverFlushInfo(item.xt_warehouse_info) + getCancelSotckInfo(item.cancel_stock_info)}}
                                         </span>
-                                        <span v-else>{{getAutoCount(item.id) + getOutCount(item.id)}} </span>
+                                      </span>
+                                      <span v-else>{{getAutoCount(item.id) + getOutCount(item.id)}} </span>
+                                   </td>
+
+                                   <td v-if="end_time!=''">
+                                    {{getAutoCount(item.id) + getOutCount(item.id)}} 
                                    </td>
                                   
-                                   <td>
-                                     <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9779">{{getOverFlushInfo(item.xt_warehouse_info)}}</span>
-                                     <span v-else>{{getWareInfo(item.xt_warehouse_info) - getAutoCount(item.id) - getOutCount(item.id) + getCancelCount(item.id) }}</span>
-                                    
+                                   <td v-if="end_time == ''">
+                                     <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9779">
+                                        {{getOverFlushInfo(item.xt_warehouse_info)}}
+                                     </span>
+                                     <span v-else>
+                                       {{getWareInfo(item.xt_warehouse_info) - getAutoCount(item.id) - getOutCount(item.id) + getCancelCount(item.id) }}
+                                     </span>
+                                   </td>
+                                   <td v-if="end_time!=''">
+                                    {{getWareInfo(item.xt_warehouse_info) - getAutoCount(item.id) - getOutCount(item.id) + getCancelCount(item.id) }}
                                    </td>
                                 </tr>
                             </tbody>
@@ -120,18 +130,17 @@ export default {
         const params = {
           page: this.page,
           limit: this.limit,
-          keywords: this.keywords,
+          keywords:this.keyword,
           start_time:this.start_time,
           end_time:this.end_time,
           type:this.type_name,
         }
+        console.log("打印",params)
         getAllStockList(params).then(response=>{
          if(response.data.state == 1){
            var list = response.data.data.list
-          //  console.log("list22222",list)
            this.tableList = list
            var total = response.data.data.total
-          //  console.log("total",total)
            this.total = total
            var manufacturerList = response.data.data.manufacturerList
            this.manufacturerList = manufacturerList
@@ -198,23 +207,20 @@ export default {
      },
      getStockDrugCount(){
         var params ={
-          keywords: this.keywords,
+          keywords: this.keyword,
           start_time:this.start_time,
           end_time:this.end_time,
         }
+      console.log("打印按钮",params)
       getStockDrugCount(params).then(response=>{
          if(response.data.state == 1){
            var count = response.data.data.count
-          //  console.log("入库统计",count)
            this.countList = count
            var outlist = response.data.data.outList
-          //  console.log("出库数量",outlist)
            this.outCountList = outlist
            var autoCount = response.data.data.autoCount
-          //  console.log("autoCount",autoCount)
            this.autoCountList = autoCount
            var totalCount = response.data.data.totalCount
-          //  console.log("totalcount",totalCount)
            this.cancelCountList = totalCount
          }
       })
@@ -304,33 +310,32 @@ export default {
         total += arr[i].stock_count
       }
      }
+     console.log("totla23323232",total)
      return total
    },
    getCancelSotckInfo(arr){
-     console.log("2332323232322332",arr)
      var cancle_toal = 0
      if(arr.length >0){
       for(let z=0;z<arr.length;z++){
         cancle_toal += arr[z].count
       }
      }
-     console.log("total",cancle_toal)
      return cancle_toal
    }
    },
     created(){
       this.org_id =  this.$store.getters.xt_user.org_id
-      console.log("机构ID232323323233232",this.org_id)
+     
       var starttime =  this.$route.query.start_time
       this.start_time = starttime
       var endtime =  this.$route.query.end_time
       this.end_time = endtime
-      var type_name = this.$route.query.type_name
+      var type_name = parseInt(this.$route.query.type_name)
       this.type_name = type_name
       var keyword = this.$route.query.keyword
       this.keyword = keyword
-      this.page = this.$route.query.page
-      this.limit = this.$route.query.limit
+      this.page = parseInt(this.$route.query.page)
+      this.limit = parseInt(this.$route.query.limit)
       this.getlist()
       this.GetAllGoodType()
       this.getStockDrugCount()

src/xt_pages/stock/stockQuery.vue

@@ -125,7 +125,9 @@
 
        <el-table-column label="剩余库存量" align="center" v-if="showThree">
          <template slot-scope="scope">
-          <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9779 || org_id == 10106 || org_id == 9504 || org_id ==  10215 || org_id == 10088 || org_id == 10191">{{getOverFlushInfo(scope.row.xt_warehouse_info)}}</span>
+          <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9779 || org_id == 10106 || org_id == 9504 || org_id ==  10215 || org_id == 10088 || org_id == 10191">
+            {{getOverFlushInfo(scope.row.xt_warehouse_info)}}
+          </span>
           <span v-else>{{getWareInfo(scope.row.xt_warehouse_info) - getAutoCount(scope.row.id) - getOutCount(scope.row.id) + getCancelCount(scope.row.id) }}</span>
          </template>
        </el-table-column>
@@ -431,19 +433,23 @@ export default {
         end_time:this.end_time,
         type:this.type_name,
       };
+     console.log("params232322323",params)
     getAllStockList(params).then(response=>{
          if(response.data.state == 1){
          
           if(this.end_time == ""){
-             this.showOne = true
              this.showTwo = false
-             this.showThree = true
              this.showFour = false
+             this.showThree = true
+             this.showOne = true
+            
+            
           }
           if(this.end_time !=""){
-            this.showOne = false
-            this.showTwo = true
             this.showThree = false
+            this.showTwo = true
+            console.log("hh3223322323",this.showTwo)
+            this.showOne = false
             this.showFour = true
           }
           var list = response.data.data.list
@@ -495,10 +501,11 @@ export default {
     },
     getStockDrugCount(){
         var params ={
-           keywords: this.$route.query.keywords,
+           keywords: this.keywords,
            start_time:this.start_time,
            end_time:this.end_time,
         }
+      console.log("参数23233223",params)
       getStockDrugCount(params).then(response=>{
          if(response.data.state == 1){
            var outlist = response.data.data.outList

src/xt_pages/user/hospitalSummary.vue

@@ -94,40 +94,97 @@
         </div>
       </div>
 
-      <el-dialog title="新增阶段小结" width="80%" top="5vh" :visible.sync="show_dialog">
+      <!-- <el-dialog title="新增住院小结" width="50%" :visible.sync="show_dialog">
         <div>
           <div class="new_record_form">
             <div class="cell clearfix">
-             <el-form-item lable="入院时间:">
-                <el-date-picker v-model="form.admission_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
-                          type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
-                          value-format="yyyy-MM-dd" @change="startTimeChange">
-                </el-date-picker> 
-             </el-form-item>
-             <el-form-item lable="出院时间:">
-                <el-date-picker v-model="form.admission_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
-                          type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
-                          value-format="yyyy-MM-dd" @change="startTimeChange">
-                </el-date-picker> 
-             </el-form-item>
-             <el-form-item label="病案号:">
-                 <el-input v-model="form.sick_personnel"></el-input>
-             </el-form-item>
-              <el-form-item label="X线:">
-                 <el-input v-model="form.xray"></el-input>
-             </el-form-item>
-              <el-form-item label="CT:">
-                 <el-input v-model="form.connecticut"></el-input>
-             </el-form-item>
-             <el-form-item label="MRI:">
-                 <el-input v-model="form.nuclear_magnetic_resonance"></el-input>
-             </el-form-item>
-             <el-form-item label="超声:">
-                 <el-input v-model="form.ultrasound"></el-input>
-             </el-form-item>
-            <el-form-item label="病理:">
-                 <el-input v-model="form.pathology"></el-input>
-             </el-form-item>
+          <el-form  :model="form" ref="form">
+            <el-row :gutter="24">
+              <el-col :span="20">
+                <el-form-item label="入院时间:">
+                    <el-date-picker v-model="form.admission_time" prefix-icon="el-icon-date" style="width: 196px;"
+                              type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
+                              value-format="yyyy-MM-dd" @change="startTimeChange">
+                    </el-date-picker> 
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="20">
+                <el-form-item label="出院时间:">
+                    <el-date-picker v-model="form.discharge_time" prefix-icon="el-icon-date" style="width: 196px;"
+                              type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
+                              value-format="yyyy-MM-dd" @change="startTimeChange">
+                    </el-date-picker> 
+                </el-form-item>
+             </el-col>
+            </el-row>
+            <el-row :gutter="24">
+              <el-col :span="8">
+                <el-form-item label="病案号:">
+                    <el-input v-model="form.sick_personnel" style="width:200px"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="X线:">
+                  <el-input v-model="form.xray" style="width:200px"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="CT:">
+                  <el-input v-model="form.connecticut" style="width:200px"></el-input>
+                </el-form-item>
+              </el-col>
+             </el-row>
+             <el-row :gutter="24">
+               <el-col :span= "8">
+                <el-form-item label="MRI:">
+                    <el-input v-model="form.nuclear_magnetic_resonance" style="width:200px"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="超声:">
+                    <el-input v-model="form.ultrasound" style="width:200px"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="病理:">
+                    <el-input v-model="form.pathology" style="width:200px"></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24">
+              <el-form-item label="病理:">
+                  <el-input v-model="form.pathology" style="width:200px"></el-input>
+              </el-form-item>
+             </el-row>
+
+             <el-row>
+               <el-form-item label="入院诊断:">
+                <el-select
+                      v-model="form.admitting_diagnosis_id"
+                      clearable
+                      allow-create
+                      filterable
+                      placeholder="选择(输入可搜索)"
+                    >
+                      <el-option
+                        v-for="item in monthType"
+                        :key="item.id"
+                        :label="item.name "
+                        :value="item.name"
+                      ></el-option>
+                  </el-select>
+                  <el-input
+                      type="textarea"
+                      :rows="2"
+                      placeholder="请输入内容"
+                      v-model="form.admitting_diagnosis">
+                  </el-input>
+                </el-form-item>
+             
+             </el-row>
+             </el-form>
             </div>
 
             <div style="text-align: right; padding-right: 0px; padding-top: 10px; padding-bottom: 10px;">
@@ -137,8 +194,171 @@
             </div>
           </div>
         </div>
-      </el-dialog>
+      </el-dialog> -->
+     
+        <el-dialog title="新增住院小结" width="60%" top="5vh" :visible.sync="show_dialog">
+        <div>
+          <div class="new_record_form">
+            <div class="cell clearfix">
+              <label class="title"><span class="name">入院时间</span> : </label>
+              <el-date-picker v-model="form.admission_time" 
+                    prefix-icon="el-icon-date" 
+                    style="width: 200px;"
+                    type="datetime" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
+                    value-format="yyyy-MM-dd">
+              </el-date-picker>
+            
+              <label class="title"><span class="name">出院时间</span> : </label>
+              <el-date-picker v-model="form.discharge_time"
+                    prefix-icon="el-icon-date" 
+                    style="width: 200px;"
+                    type="datetime" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
+                    value-format="yyyy-MM-dd">
+              </el-date-picker>
+
+            
+            </div>
+            <div class="cell clearfix" style="margin-top:10px">
+              <label class="title"><span class="name">病案号:</span> : </label>
+              <el-input v-model="form.sick_personnel" style="width:200px"></el-input>
+            
+              <label class="title"><span class="name">X线</span> : </label>
+              <el-input v-model="form.xray" style="width:200px"></el-input>
+
+              <label class="title"><span class="name">CT</span> : </label>
+              <el-input v-model="form.connecticut" style="width:200px"></el-input>
+            </div>
 
+            <div class="cell clearfix" style="margin-top:10px">
+              <label class="title"><span class="name">MRI</span> : </label>
+              <el-input v-model="form.nuclear_magnetic_resonance" style="width:200px"></el-input>
+            
+              <label class="title"><span class="name">超声</span> : </label>
+              <el-input v-model="form.ultrasound" style="width:200px"></el-input>
+
+              <label class="title"><span class="name">病理</span> : </label>
+              <el-input v-model="form.pathology" style="width:200px"></el-input>
+            </div>
+            
+            <div class="cell clearfix" style="margin-top:10px">
+              <label class="title"><span class="name">入院诊断</span> : </label>
+                <el-select v-model="select_template" placeholder="可选择病程模板" @change="didSelectTemplate">
+                  <el-option v-for="(option, index) in templates" :key="index" :label="option.title"
+                            :value="option.content"></el-option>
+                </el-select>
+                
+                 <div class="textarea_panel">
+                    <keep-alive>
+                      <editor ref="editor"
+                              id="editors"
+                              style="width: 800px"
+                              v-bind:r_content="form.admitting_diagnosis">
+                      </editor>
+                    </keep-alive>
+                </div>
+            </div>
+
+            <div class="cell clearfix" style="margin-top:10px">
+              <label class="title"><span class="name">出院诊断</span> : </label>
+                <el-select v-model="select_template" placeholder="可选择病程模板" @change="didSelectTemplate">
+                  <el-option v-for="(option, index) in templates" :key="index" :label="option.title"
+                            :value="option.content"></el-option>
+                </el-select>
+
+               <div class="textarea_panel">
+                    <keep-alive>
+                      <editor ref="editorOne"
+                              id="editorsOne"
+                              style="width: 800px"
+                              v-bind:r_content="form.discharge_diagnosis">
+                      </editor>
+                    </keep-alive>
+                </div>
+
+            </div>
+
+             <div class="cell clearfix" style="margin-top:10px">
+              <label class="title"><span class="name">入院时诊断</span> : </label>
+                <el-select v-model="select_template" placeholder="可选择病程模板" @change="didSelectTemplate">
+                  <el-option v-for="(option, index) in templates" :key="index" :label="option.title"
+                            :value="option.content"></el-option>
+                </el-select>
+
+                <div class="textarea_panel">
+                    <keep-alive>
+                      <editor ref="editorTwo"
+                              id="editorsTwo"
+                              style="width: 800px"
+                              v-bind:r_content="form.treatment">
+                      </editor>
+                    </keep-alive>
+                </div>
+            </div>
+
+            <div class="cell clearfix" style="margin-top:10px">
+              <label class="title"><span class="name">诊断经过</span> : </label>
+                <el-select v-model="select_template" placeholder="可选择病程模板" @change="didSelectTemplate">
+                  <el-option v-for="(option, index) in templates" :key="index" :label="option.title"
+                            :value="option.content"></el-option>
+                </el-select>
+
+               <div class="textarea_panel">
+                    <keep-alive>
+                      <editor ref="editorFour"
+                              id="editorsFour"
+                              style="width: 800px"
+                              v-bind:r_content="form.treatment">
+                      </editor>
+                    </keep-alive>
+                </div>
+
+            </div>
+
+            <div class="cell clearfix" style="margin-top:10px">
+              <label class="title"><span class="name">出院时病情</span> : </label>
+                <el-select v-model="select_template" placeholder="可选择病程模板" @change="didSelectTemplate">
+                  <el-option v-for="(option, index) in templates" :key="index" :label="option.title"
+                            :value="option.content"></el-option>
+                </el-select>
+
+               <div class="textarea_panel">
+                    <keep-alive>
+                      <editor ref="editorFive"
+                              id="editorsFive"
+                              style="width: 800px"
+                              v-bind:r_content="form.new_content">
+                      </editor>
+                    </keep-alive>
+                </div>
+            </div>
+
+            <div class="cell clearfix" style="margin-top:10px">
+              <label class="title"><span class="name">出院医嘱</span> : </label>
+                <el-select v-model="select_template" placeholder="可选择病程模板" @change="didSelectTemplate">
+                  <el-option v-for="(option, index) in templates" :key="index" :label="option.title"
+                            :value="option.content"></el-option>
+                </el-select>
+
+                <div class="textarea_panel">
+                    <keep-alive>
+                      <editor ref="editorSix"
+                              id="editorsSix"
+                              style="width: 800px"
+                              v-bind:r_content="form.new_content">
+                      </editor>
+                    </keep-alive>
+                </div>
+            </div>
+         
+            <div style="text-align: right; padding-right: 0px; padding-top: 10px; padding-bottom: 10px;">
+              <el-button @click="show_dialog = false">取消</el-button>
+              <el-button type="primary"
+                         @click="createAction" :loading="uploading_new_record">保存
+              </el-button>
+            </div>
+          </div>
+        </div>
+      </el-dialog>
 
       <!-- 编辑阶段小结 -->
        <el-dialog title="编辑阶段小结" width="80%" top="5vh" :visible.sync="edit_show_dialog">
@@ -435,44 +655,49 @@
           start_year:new Date(),
           start_month:new Date(),
           admission_time:"",
+          discharge_time:"",
           sick_personnel:"",
           xray:"",
+          admitting_diagnosis_id:"",
+          admitting_diagnosis:"",
+          discharge_diagnosis_id:"",
+          discharge_diagnosis:"",
           connecticut:"",
           nuclear_magnetic_resonance:"",
           ultrasound:"",
           pathology:"",
-        //   radio:1,
-        //   quarter:1,
-        //   dry_weight:"",
-        //   dialysis_count:"",
-        //   hd_count:"",
-        //   hdf_count:"",
-        //   hp_count:"",
-        //   other_count:"",
-        //   dialzer_apparatus:"",
-        //   perfusion_apparatus:"",
-        //   anticoagulant:"",
-        //   kalium:"",
-        //   autunite:"",
-        //   natrium:"",
-        //   hour:"",
-        //   minute:"",
-        //   befor_weight:"",
-        //   after_weight:"",
-        //   befor_pressure:"",
-        //   after_pressure:"",
-        //   template_summary_id:"",
-        //   template_summary_content:"",
-        //   template_plan_id:"",
-        //   template_inspection_id:0,
-        //   template_inspection_content:"",
-        //   admin_user_id:this.$store.getters.xt_user.user.id,
-        //   record_time: moment().locale('zh-cn').format('YYYY-MM-DD HH:mm:ss'),
-        //   patient_id:"",
-        //   start_time:"",
-        //   end_time:"",
-        //   template_plan_content:"",
-        //   inspect_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:"",
+          hour:"",
+          minute:"",
+          befor_weight:"",
+          after_weight:"",
+          befor_pressure:"",
+          after_pressure:"",
+          template_summary_id:"",
+          template_summary_content:"",
+          template_plan_id:"",
+          template_inspection_id:0,
+          template_inspection_content:"",
+          admin_user_id:this.$store.getters.xt_user.user.id,
+          record_time: moment().locale('zh-cn').format('YYYY-MM-DD HH:mm:ss'),
+          patient_id:"",
+          start_time:"",
+          end_time:"",
+          template_plan_content:"",
+          inspect_date:"",
         },
         timeType:[
           {id:1,name:"第一季度"},