11月14日 库存扣减更新

src/lang/zh.js

@@ -371,7 +371,9 @@ export default {
     template_plan: '个性化方案',
     admitting_diagnosis: '入院诊断',
     discharge_diagnosis: '出院诊断',
+    diagnosis_admission: '入院时病情',
     treatment: '诊疗经过',
-    illness_discharge: '出院时病情'
+    illness_discharge: '出院时病情',
+    discharge_advice: '出院医嘱'
   }
 }

src/xt_pages/data/template.vue

@@ -50,6 +50,7 @@ export default {
         { 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.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"},
       ],

src/xt_pages/outpatientTool/components/settle.vue

@@ -1,113 +1,127 @@
 <template>
   <div>
-      <div style="display: flex;justify-content: space-between;margin-bottom:10px;">
-          <div>
-              <!--<el-button size="small" style="margin-left:10px;" class="filter-item" type="primary"-->
-              <!--@click="Action">-->
-              <!--导出-->
-              <!--</el-button>-->
-              <el-input size="small" style="width:150px;" v-model="keywords" @input="searchAction"
-                        @keyup.enter.native='searchAction'
-                        placeholder="请输入患者姓名"
-
-                        class="filter-item"/>
-              <el-select size="small" v-model="item_type" placeholder="请选择"
-                          style="width:150px;margin-left:10px;" @change="changeItem">
-                  <el-option
-                          label="全部"
-                          value="0">
-                  </el-option>
-                  <el-option
-                          v-for="item,index in items"
-                          :key="index"
-                          :label="item.name"
-                          :value="item.id">
-                  </el-option>
-              </el-select>
-              <el-date-picker
-                      v-model="chargeDate"
-                      type="daterange"
-                      value-format="yyyy-MM-dd"
-                      range-separator="至"
-                      start-placeholder="开始日期"
-                      @change="changeDate"
-                      end-placeholder="结束日期">
-              </el-date-picker>
-              <!--<el-radio v-model="radio" label="1">明细</el-radio>-->
-              <!--<el-radio v-model="radio" label="2">汇总</el-radio>-->
-          </div>
-          <div>
-              <!-- <el-popover
-                placement="bottom"
-                width="210"
-                trigger="click">
-                <el-button size="small" ref="button_two" @click="open(1)">打印清单</el-button>
-                <el-button size="small" ref="button_six" @click="open(2)">打印汇总</el-button>
-                <el-button slot="reference" style="margin:0 10px;" type="primary" size="small">打印</el-button>
-
-              </el-popover> -->
-              <el-button size="small" type="primary" @click="export_detail">报表下载</el-button>
-          </div>
+    <div style="display: flex;justify-content: space-between;margin-bottom:10px;">
+      <div>
+        <!--<el-button size="small" style="margin-left:10px;" class="filter-item" type="primary"-->
+        <!--@click="Action">-->
+        <!--导出-->
+        <!--</el-button>-->
+        <el-input size="small" style="width:150px;" v-model="keywords" @input="searchAction"
+                  @keyup.enter.native='searchAction'
+                  placeholder="请输入患者姓名"
+
+                  class="filter-item"/>
+        <el-select size="small" v-model="item_type" placeholder="请选择"
+                   style="width:150px;margin-left:10px;" @change="changeItem">
+          <el-option
+            label="全部"
+            value="0">
+          </el-option>
+          <el-option
+            v-for="item,index in items"
+            :key="index"
+            :label="item.name"
+            :value="item.id">
+          </el-option>
+        </el-select>
+        <el-date-picker
+          v-model="chargeDate"
+          type="daterange"
+          value-format="yyyy-MM-dd"
+          range-separator="至"
+          start-placeholder="开始日期"
+          @change="changeDate"
+          end-placeholder="结束日期">
+        </el-date-picker>
+        <!--<el-radio v-model="radio" label="1">明细</el-radio>-->
+        <!--<el-radio v-model="radio" label="2">汇总</el-radio>-->
       </div>
-      <el-table :data="tableData" border :row-style="{ color: '#303133' }" ref="report-table"
-                :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
-                show-summary
-                v-loading="settle_loading"
-                max-height="600"
-                :span-method="merge"
-                :summary-method="getTotal"
-                highlight-current-row>
-
-          <el-table-column align="center" prop="name" label="患者名字">
-              <template slot-scope="scope">{{ scope.row.other_name }}</template>
-          </el-table-column>
-          <el-table-column align="center" prop="item_name" label="结算日期">
-              <template slot-scope="scope">
-                  {{scope.row.setl_time?scope.row.setl_time.split(" ")[0]:getTimes(scope.row.settle_accounts_date)}}
-              </template>
-          </el-table-column>
-
-          <el-table-column align="center" prop="item_name" label="结算类型">
-              <template slot-scope="scope">
-                  <div v-if="scope.row.is_medicine_insurance == 0">自费</div>
-                  <div v-if="scope.row.is_medicine_insurance == 1">医保</div>
-              </template>
-          </el-table-column>
-          <el-table-column align="center" prop="item_name" label="处方类型">
-              <template slot-scope="scope">
-                  <div v-if="scope.row.med_type == '14'">门诊特殊病</div>
-                  <div v-if="scope.row.med_type == '11'">普通门诊</div>
-              </template>
-          </el-table-column>
-          <el-table-column align="center" prop="item_name" label="医疗费总额">
-              <template slot-scope="scope">{{scope.row.medfee_sumamt.toFixed(2)}}</template>
-          </el-table-column>
-          <el-table-column align="center" prop="item_name" label="基金支付金额">
-              <template slot-scope="scope">{{scope.row.fund_pay_sumamt.toFixed(2)}}</template>
-          </el-table-column>
-          <el-table-column align="center" prop="item_name" label="个人账户支付金额">
-              <template slot-scope="scope">{{scope.row.acct_pay.toFixed(2)}}</template>
-          </el-table-column>
-          <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.hifes_pay.toFixed(2)}}</template>
-          </el-table-column>
-
-
-          <el-table-column align="center" prop="item_name" label="居民大病保险资金支出">
-              <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>
-              </template>
-          </el-table-column>
-
-      </el-table>
+      <div>
+        <!-- <el-popover
+          placement="bottom"
+          width="210"
+          trigger="click">
+          <el-button size="small" ref="button_two" @click="open(1)">打印清单</el-button>
+          <el-button size="small" ref="button_six" @click="open(2)">打印汇总</el-button>
+          <el-button slot="reference" style="margin:0 10px;" type="primary" size="small">打印</el-button>
+
+        </el-popover> -->
+        <el-button size="small" type="primary" @click="export_detail">报表下载</el-button>
+      </div>
+    </div>
+    <el-table :data="tableData" border :row-style="{ color: '#303133' }" ref="report-table"
+              :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
+              show-summary
+              v-loading="settle_loading"
+              max-height="600"
+              :span-method="merge"
+              :summary-method="getTotal"
+              highlight-current-row>
+
+      <el-table-column align="center" prop="name" label="患者名字">
+        <template slot-scope="scope">{{ scope.row.other_name }}</template>
+      </el-table-column>
+      <el-table-column align="center" prop="item_name" label="结算日期">
+        <template slot-scope="scope">
+          {{scope.row.setl_time?scope.row.setl_time.split(" ")[0]:getTimes(scope.row.settle_accounts_date)}}
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="item_name" label="结算类型">
+        <template slot-scope="scope">
+          <div v-if="scope.row.is_medicine_insurance == 0">自费</div>
+          <div v-if="scope.row.is_medicine_insurance == 1">医保</div>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="item_name" label="处方类型">
+        <template slot-scope="scope">
+          <div v-if="scope.row.med_type == '14'">门诊特殊病</div>
+          <div v-if="scope.row.med_type == '11'">普通门诊</div>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="item_name" label="医疗费总额">
+        <template slot-scope="scope">{{scope.row.medfee_sumamt.toFixed(2)}}</template>
+      </el-table-column>
+      <el-table-column align="center" prop="item_name" label="基金支付金额">
+        <template slot-scope="scope">{{scope.row.fund_pay_sumamt.toFixed(2)}}</template>
+      </el-table-column>
+      <el-table-column align="center" prop="item_name" label="个人账户支付金额">
+        <template slot-scope="scope">{{scope.row.acct_pay.toFixed(2)}}</template>
+      </el-table-column>
+      <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>
+      </el-table-column>
+
+
+      <el-table-column align="center" prop="item_name" label="居民大病保险资金支出">
+        <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>
+        </template>
+      </el-table-column>
+
+    </el-table>
   </div>
 </template>
 
@@ -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/user/hospitalSummary.vue

@@ -236,34 +236,120 @@
               <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">pathology</span> : </label>
+              <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>
+              <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-input v-model="title" style="width: 420px"></el-input>
-            </div> -->
-
-
-            <!-- <div class="textarea_panel">
-              <keep-alive>
-                <editor ref="editor"
-                        id="editors"
-                        style="width: 600px"
-                        v-bind:r_content="new_content"
-                        >
-                </editor>
-              </keep-alive>
-            </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"
@@ -574,7 +660,9 @@
           xray:"",
           admitting_diagnosis_id:"",
           admitting_diagnosis:"",
-         connecticut:"",
+          discharge_diagnosis_id:"",
+          discharge_diagnosis:"",
+          connecticut:"",
           nuclear_magnetic_resonance:"",
           ultrasound:"",
           pathology:"",