长沙南雅打印单问题修改

config/dev.env.js

@@ -7,8 +7,8 @@ module.exports = {
   NODE_ENV: '"development"',
   ENV_CONFIG: '"dev"',
   //BASE_API: '"http://new_mobile.xt.api.sgjyun.com"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527,////'"http://localhost:9529"',
-  BASE_API: '"http://api.xt.test.sgjyun.com"',
-  // BASE_API: '"http://localhost:9531"',
+  // BASE_API: '"http://api.xt.test.sgjyun.com"',
+  BASE_API: '"http://localhost:9531"',
   SSO_HOST: '"http://testsso.sgjyun.com"',
   SRCM_HOST: '"http://test1.sgjyun.com"',
   XT_HOST: '"http://xt.test.sgjyun.com"',

config/index.js

@@ -27,10 +27,10 @@ module.exports = {
     // can be overwritten by process.env.HOST
     // if you want dev by ip, please set host: '0.0.0.0'
 
-    host: 'xt.test.sgjyun.com',
+    // host: 'xt.test.sgjyun.com',
     //  host: 'xt.kuyicloud.com',
    // host: 'xt.test.sgjyun.com',
-  //  host: 'localhost',
+    host: 'localhost',
     port: 9528, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,

src/api/dialysis_record.js

@@ -47,7 +47,7 @@ export function editMonitor(patient_id, schedule_date, data, mode) {
   })
 }
 
-export function startDialysis(patient_id, schedule_date, nurse_id, bed_id, lood_drawing, puncture_nurse_id, start_time, schedual_type, mode, washpipe_nurse, change_nurse, difficult_puncture_nurse, new_fistula_nurse, blood_drawing, quality_nurse, puncture_needle, puncture_way, dialysis_dialyszers, dialysis_irrigation, blood_access_id, nuclein_date, schedule_remark, order_remark) {
+export function startDialysis(patient_id, schedule_date, nurse_id, bed_id, lood_drawing, puncture_nurse_id, start_time, schedual_type, mode, washpipe_nurse, change_nurse, difficult_puncture_nurse, new_fistula_nurse, blood_drawing, quality_nurse, puncture_needle, puncture_way, dialysis_dialyszers, dialysis_irrigation, blood_access_id, nuclein_date, schedule_remark, order_remark,catheter_operation) {
   var params = {
     patient_id: patient_id,
     date: schedule_date,
@@ -71,7 +71,8 @@ export function startDialysis(patient_id, schedule_date, nurse_id, bed_id, lood_
     blood_access_id: blood_access_id,
     nuclein_date: nuclein_date,
     schedule_remark: schedule_remark,
-    order_remark: order_remark
+    order_remark: order_remark,
+    catheter_operation:catheter_operation
   }
   console.log('params', params)
   return request({

src/lang/zh.js

@@ -404,6 +404,7 @@ export default {
     treatment: '诊疗经过',
     illness_discharge: '出院时病情',
     discharge_advice: '出院医嘱',
-    dialysis_remark: '透析备注'
+    dialysis_remark: '透析备注',
+    catheter_operation:'导管备注',
   }
 }

src/utils/data.js

@@ -6,7 +6,7 @@ export function getDataConfig(module, field) {
   if (moduleConfig == undefined) {
     return false
   }
-  if (module === 'summary' || module === 'education' || module === 'nursing_record' || module === 'special_record' || module == 'dialysis_remark') {
+  if (module === 'summary' || module === 'education' || module === 'nursing_record' || module === 'special_record' || module == 'dialysis_remark' || module=='catheter_operation') {
     var Aresult = []
     for (var j = 0; j < moduleConfig.length; j++) {
       var Atemp = []

src/xt_pages/data/template.vue

@@ -55,6 +55,7 @@ export default {
         { label: this.$t("data_config.illness_discharge"), key:"illness_discharge"},
         { label: this.$t("data_config.discharge_advice"), key:"discharge_advice"},
         { label: this.$t("data_config.dialysis_remark"), key:"dialysis_remark"},
+        { label: this.$t("data_config.catheter_operation"), key:"catheter_operation"},
       ],
       activeName: "education",
       createdTimes: 0

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

@@ -117,6 +117,32 @@
             </el-select>
        </el-form-item>
 
+       <el-row :gutter="20">
+        <el-col :span="24" v-if="isShowFiled('导管备注')">
+          <el-form-item label="导管备注：">
+            <el-select @change="dialysisSummarySelectChange" v-model="value2">
+              <el-option
+                v-for="(item, index) in summary"
+                :label="item.text"
+                :value="item.value"
+                :key="index"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col v-if="isShowFiled('导管备注')">
+          <el-form-item>
+            <el-input
+              type="textarea"
+              v-model="form.catheter_operation"
+              :rows="4"
+            ></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
        <el-form-item label="核酸检测日期:" style="width:300px"  v-if="isShowFiled('核酸检测日期')">
           <el-date-picker
             type="date"
@@ -136,7 +162,8 @@
          <el-form-item label="排班备注:" style="width:300px"  v-if="isShowFiled('排班备注')">
           <el-input style="width:200px" v-model="form.schedule_remark"></el-input>
         </el-form-item>
-
+         
+        
 
 
         <el-form-item label="上机时间 :" style="width:300px"  v-if="isShowFiled('上机时间')">
@@ -211,6 +238,7 @@
           nuclein_date:moment(new Date()).add('year',0).format("YYYY-MM-DD"),
           schedule_remark:"",
           order_remark:"",
+          catheter_operation:""
         },
         blood_access_option:[],
         schedual_type: 0,
@@ -234,6 +262,8 @@
         },
         dialyzers:[],
         irrigations:[],
+        summary: [],
+        value2:"",
       }
     },
     props: {
@@ -312,6 +342,8 @@
         )
       this.form.schedule_remark = this.dialysis_order.schedule_remark
       this.form.order_remark = this.dialysis_order.order_remark
+    
+      this.summary = getDataConfig('catheter_operation', 'catheter_operation')
     },
     watch: {
       patient:{
@@ -557,7 +589,7 @@
         console.log("质控护士",this.form.quality_nurse_id)
         console.log("this.form.nuclein_date",this.form.nuclein_date)
        
-        startDialysis(this.patient_id, this.schedule_date ? parseTime(this.schedule_date, '{y}-{m}-{d}') : parseTime(new Date(), '{y}-{m}-{d}'), this.form.nurse_id, this.form.bed_id, this.form.lood_drawing, this.form.puncture_nurse_id, this.form.start_time, this.schedual_type, mode,this.form.washpipe_nurse,this.form.change_nurse,this.form.difficult_puncture_nurse,this.form.new_fistula_nurse,blood_drawing,this.form.quality_nurse_id,this.form.puncture_needle,this.form.puncture_way,this.form.dialysis_dialyszers,this.form.dialysis_irrigation,this.form.blood_access_id,this.form.nuclein_date,this.form.schedule_remark,this.form.order_remark).then(rs => {
+        startDialysis(this.patient_id, this.schedule_date ? parseTime(this.schedule_date, '{y}-{m}-{d}') : parseTime(new Date(), '{y}-{m}-{d}'), this.form.nurse_id, this.form.bed_id, this.form.lood_drawing, this.form.puncture_nurse_id, this.form.start_time, this.schedual_type, mode,this.form.washpipe_nurse,this.form.change_nurse,this.form.difficult_puncture_nurse,this.form.new_fistula_nurse,blood_drawing,this.form.quality_nurse_id,this.form.puncture_needle,this.form.puncture_way,this.form.dialysis_dialyszers,this.form.dialysis_irrigation,this.form.blood_access_id,this.form.nuclein_date,this.form.schedule_remark,this.form.order_remark,this.form.catheter_operation).then(rs => {
           this.loading = false
           var resp = rs.data
           if (resp.state == 1) {
@@ -602,6 +634,8 @@
         ParamsQuery['mode'] = "2"
         ParamsQuery["schedule_remark"] = this.form.schedule_remark
         ParamsQuery["order_remark"] = this.form.order_remark
+        ParamsQuery['catheter_operation'] = this.form.catheter_operation
+ 
         if (this.dialysis_order.creator != this.$store.getters.xt_user.user.id) {
           ParamsQuery['mode'] = "3"
         }
@@ -721,6 +755,29 @@
       innerDialogCancle: function() {
         this.InnerDialogProps.visibility = false
       },
+     
+      dialysisSummarySelectChange: function(values) {
+      if (this.form.catheter_operation == '') {
+        this.form.catheter_operation = values
+      } else {
+       
+        if (this.form.catheter_operation.indexOf(values) == -1) {
+          if (
+            this.form.catheter_operation
+              .charAt(this.form.catheter_operation.length - 1)
+              .indexOf('。') == -1
+          ) {
+            this.form.catheter_operation =
+              this.form.catheter_operation + ',' + values
+          } else {
+            this.form.catheter_operation =
+              this.form.catheter_operation + ',' + values
+            this.form.catheter_operation =
+              this.form.catheter_operation + values
+          }
+        }
+      }
+    },
     }
   }
 </script>

src/xt_pages/dialysis/details/dialysisComputer.vue

@@ -92,6 +92,12 @@
           <span class="content">{{start_time}}</span>
         </li>
       </ul>
+      <ul>
+        <li v-if="isShow('导管操作')">
+          <label>导管操作 : </label>
+          <span class="content">{{catheter_operation}}</span>
+        </li>
+      </ul>
     </div>
     <div class="middleLine"></div>
   </div>
@@ -224,6 +230,14 @@
           }
         }
         return name
+      },
+      catheter_operation:function(){
+        if(this.record.id == 0){
+          return '-'
+        }else{
+          return this.record.catheter_operation
+        }
+       
       }
     },
     methods: {

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyThree.vue

@@ -657,7 +657,7 @@
                   </th>
                   <th style="width: 70px; font-weight: normal" v-if="org_id==10430||org_id==9675">
                     <p style="height: 20px; line-height: 20px">血温</p>
-                    <p style="height: 20px; line-height: 20px">ml</p>
+                    <p style="height: 20px; line-height: 20px">℃</p>
                   </th>
 
                   <th style="width: 80px; font-weight: normal">

src/xt_pages/hospitalStation/invoicePrint.vue

@@ -38,8 +38,6 @@
   </div>
 </template>
 
-
-
 <script>
 import printOne from "./invoiceTemplate/printOne";
 import printTwo from "./invoiceTemplate/printTwo";
@@ -48,7 +46,6 @@ import printThree from "./invoiceTemplate/printThree";
 export default {
   name: "invoicePrint",
   components: {
-    PrintNight,
     printOne,
     printTwo,
     printThree,

src/xt_pages/hospitalStation/outpatientChargesManagement.vue

@@ -94,10 +94,16 @@
 
           <div>
             <div>入院时间：{{this.hisPatientInfo&&this.hisPatientInfo.in_hosptial_time?this.hisPatientInfo.in_hosptial_time:""}}</div>
-            <el-button  size="small"
-                       @click="open(1)"
-                       type="primary">入院登记
-            </el-button>
+            <el-button
+              size="small"
+              @click="exportUnchargeData"
+              type="primary">导出未收费数据</el-button>
+
+<!--            -->
+<!--            <el-button  size="small"-->
+<!--                       @click="open(1)"-->
+<!--                       type="primary">入院登记-->
+<!--            </el-button>-->
 
             <el-button v-loading="loadingone" size="small"
                        v-if="(this.activeName == 'third' &&this.hisPatientInfo.balance_accounts_type != 2 && this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 0)"
@@ -276,6 +282,28 @@
                 <el-button type="primary" @click="comfirmTime">确 定</el-button>
              </span>
     </el-dialog>
+
+    <el-dialog
+      title="导出时间"
+      :visible.sync="dialogExportVisible"
+      width="30%"
+    >
+      <el-date-picker v-model="export_start_time" type="datetime" format="yyyy-MM-dd"
+                      value-format="yyyy-MM-dd"
+                      placeholder="请选择导出开始时间">
+      </el-date-picker>
+
+      <el-date-picker v-model="export_end_time" type="datetime" format="yyyy-MM-dd"
+                      value-format="yyyy-MM-dd"
+                      placeholder="请选择导出结束时间">
+      </el-date-picker>
+
+      <span slot="footer" class="dialog-footer">
+                <el-button @click="dialogExportVisible = false">取 消</el-button>
+                <el-button type="primary" @click="comfirmExportTime">确 定</el-button>
+             </span>
+    </el-dialog>
+
   </div>
 
 </template>
@@ -301,6 +329,12 @@ import {
   Outhopitaluncheck,
   Settle
 } from '@/api/his/his'
+
+import {
+  exportData
+} from '@/api/his/his_hospital'
+
+
 import { uParseTime } from '@/utils/tools'
 
 import RegisterDialog from './components/registerDialog'
@@ -436,7 +470,10 @@ export default {
       department: [],
       invoiceVisible: false,
       invoiceParams: {},
-      out_hospital_time: moment(new Date()).add('year',0).format("YYYY-MM-DD HH:mm:ss")
+      out_hospital_time: moment(new Date()).add('year',0).format("YYYY-MM-DD HH:mm:ss"),
+      dialogExportVisible:false,
+      export_start_time: moment(new Date()).add('year',0).format("YYYY-MM-DD"),
+      export_end_time: moment(new Date()).add('year',0).format("YYYY-MM-DD"),
 
     }
   },
@@ -459,6 +496,68 @@ export default {
     this.getPatientList()
   },
   methods: {
+    comfirmExportTime(){
+      let params = {
+        'patient_id': this.patientInfo.id,
+        'start_time': this.export_start_time,
+        'end_time': this.export_end_time,
+      }
+      exportData(params).then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg)
+          this.dialogExportVisible = false
+          return false
+        } else {
+          this.dialogExportVisible = false
+          var prescriptions = response.data.data.month_prescriptions
+          var patient_ids = this.unique_patient(prescriptions)
+          let list=  []
+          for(var i = 0;i < patient_ids.length; i++){
+            let obj = {}
+            let total = 0
+            obj["患者姓名"] = patient_ids[i].patient.name
+            for(let b = 0; b < prescriptions.length; b++){
+              if(patient_ids[i].patient_id == prescriptions[b].patient_id){
+                if (prescriptions[b].type == 1) {
+                  if (prescriptions[b].advices != null) {
+                    console.log("~~~~~~~~~~~~~~~~~1111")
+
+                    for (let a = 0; a < prescriptions[b].advices.length; a++) {
+                      total = total + parseFloat(prescriptions[b].advices[a].price * prescriptions[b].advices[a].prescribing_number)
+                    }
+                  }
+                } else {
+                  if (prescriptions[b].project != null) {
+                    console.log("~~~~~~~~~~~~~~~~~22222")
+                    for (let c = 0; c < prescriptions[b].project.length; c++) {
+                      total = total + parseFloat(prescriptions[b].project[c].price  * prescriptions[b].project[c].count)
+                    }
+                  }
+                }
+              }
+            }
+            obj["总金额"] = total.toFixed(2)
+            list.push(obj)
+          }
+          import("@/vendor/Export2Excel").then((excel) => {
+            const tHeader = [
+              "患者姓名",
+              "总金额"
+            ];
+            const filterVal = [
+              "患者姓名",
+              "总金额"
+            ];
+            const data = this.formatJson(filterVal, list);
+            excel.export_json_to_excel({
+              header: tHeader,
+              data,
+              filename: "消费明细",
+            });
+          });
+        }
+      })
+    },
     comfirmTime() {
       var that = this
       let params = {
@@ -1290,6 +1389,10 @@ export default {
     },
     formatJson(filterVal, jsonData) {
       return jsonData.map(v => filterVal.map(j => v[j]))
+    },exportUnchargeData(){
+
+      this.dialogExportVisible = true
+
     },
     open(index) {
       if (index == 1){
@@ -2873,6 +2976,22 @@ export default {
       this.curSettlePrescriptions = this.settle_prescriptions[0]
 
     },
+    unique_patient(array) {
+      // res用来存储结果
+      var res = []
+      for (var i = 0, arrayLen = array.length; i < arrayLen; i++) {
+        for (var j = 0, resLen = res.length; j < resLen; j++) {
+          if (array[i].patient_id === res[j].patient_id) {
+            break
+          }
+        }
+        // 如果array[i]是唯一的，那么执行完循环，j等于resLen
+        if (j === resLen) {
+          res.push(array[i])
+        }
+      }
+      return res
+    },
     unique_two(array) {
       // res用来存储结果
       var res = []

src/xt_pages/user/courseOfDisease.vue

@@ -86,8 +86,8 @@
               <label class="title"><span class="name">病程日期</span> : </label>
               <el-date-picker v-model="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>
+                              type="datetime" placeholder="选择日期时间" align="right" format="yyyy-MM-dd HH:mm:ss"
+                              value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
 
               <label class="title"><span class="name">日常病程</span> : </label>
               <el-select v-model="select_template" placeholder="可选择病程模板" @change="didSelectTemplate">
@@ -132,8 +132,8 @@
               <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>
+                              placeholder="选择日期时间" align="right" format="yyyy-MM-dd HH:mm:ss"
+                              value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
 
               <label class="title"><span class="name">日常病程</span> : </label>
               <el-select v-model="select_template" placeholder="可选择病程模板" @change="didEditSelectTemplate">
@@ -286,7 +286,7 @@
       },
       recordTime: function(timestamp) {
         var time = new Date(timestamp * 1000)
-        return parseTime(time, '{y}-{m}-{d} {h}:{m}')
+        return parseTime(time, '{y}-{m}-{d} {h}:{i}:{s}')
       },
       doctorName: function(doctor_id) {
         for (let index = 0; index < this.doctors.length; index++) {

src/xt_pages/workforce/components/template_table.vue

@@ -886,6 +886,7 @@
                       placeholder="请选择"
                       size="mini"
                       @change="changeJihao"
+                      @click.native="changeSch(scope.row)"
                       class="select_list_arrage"
                     >
                       <el-option
@@ -1594,8 +1595,8 @@ export default {
 
       this.smartVisible = true;
     },
-    SetSmartSch(tempData,delData) {
-        this.saveActionThree(tempData,delData);
+    SetSmartSch(tempData) {
+        this.saveActionThree(tempData);
     },
     check(tempData) {
       let isJiXu = true;
@@ -1647,7 +1648,7 @@ export default {
     batchSetSch() {
       this.smartSaveLoading = true;
       var tempData = [];
-      var delData = [];
+      // var delData = [];
       for (let b = 0; b < this.editableTabs.length; b++) {
         for (let c = 0; c < this.editableTabs[b].tableWeekArrage.length; c++) {
           let obj = {
@@ -1667,36 +1668,35 @@ export default {
         }
       }
 
-      for (let b = 0; b < this.current_patient_data.length; b++) {
-        for (let c = 0; c < this.current_patient_data[b].tableWeekArrage.length; c++) {
-          let obj = {
-            time_type: this.current_patient_data[b].tableWeekArrage[c].time_type,
-            jihao_id: this.current_patient_data[b].tableWeekArrage[c].device_number_id,
-            schedule_week: this.getWeekByzhongwen(
-              this.current_patient_data[b].tableWeekArrage[c].week
-            ),
-            mode_id: this.current_patient_data[b].tableWeekArrage[c].treat_mode,
-            sch_id: this.current_patient_data[b].tableWeekArrage[c].id,
-            zone_id: this.current_patient_data[b].tableWeekArrage[c].zone_id,
-            t_id: this.current_patient_data[b].name,
-            title:this.current_patient_data[b].title,
-            patient_id: this.cur_smart_patient_id,
-          };
-          delData.push(obj);
-        }
-      }
-      console.log(tempData)
-      console.log(delData)
+      // for (let b = 0; b < this.current_patient_data.length; b++) {
+      //   for (let c = 0; c < this.current_patient_data[b].tableWeekArrage.length; c++) {
+      //     let obj = {
+      //       time_type: this.current_patient_data[b].tableWeekArrage[c].time_type,
+      //       jihao_id: this.current_patient_data[b].tableWeekArrage[c].device_number_id,
+      //       schedule_week: this.getWeekByzhongwen(
+      //         this.current_patient_data[b].tableWeekArrage[c].week
+      //       ),
+      //       mode_id: this.current_patient_data[b].tableWeekArrage[c].treat_mode,
+      //       sch_id: this.current_patient_data[b].tableWeekArrage[c].id,
+      //       zone_id: this.current_patient_data[b].tableWeekArrage[c].zone_id,
+      //       t_id: this.current_patient_data[b].name,
+      //       title:this.current_patient_data[b].title,
+      //       patient_id: this.cur_smart_patient_id,
+      //     };
+      //     delData.push(obj);
+      //   }
+      // }
+      // console.log(tempData)
+      // console.log(delData)
 
-      for (let i = 0; i < delData.length; i++) {
-        for (let  b = 0; b < tempData.length; b++) {
-          if(delData[i].sch_id == tempData[b].sch_id){
-            delData.splice(i,1)
-          }
-        }
-      }
+      // for (let i = 0; i < delData.length; i++) {
+      //   for (let  b = 0; b < tempData.length; b++) {
+      //     if(delData[i].sch_id == tempData[b].sch_id){
+      //       delData.splice(i,1)
+      //     }
+      //   }
+      // }
 
-      console.log(delData)
       for (let i = 0; i < tempData.length; i++) {
         if (tempData[i].jihao_id == "" || tempData[i].zone_id == "") {
           this.$message.error("分区或者床位不能空");
@@ -1706,11 +1706,11 @@ export default {
         }
       }
       this.isEdit = true
-      this.$emit("saveData", tempData,delData);
+      console.log("saveData")
+      console.log(tempData)
+      this.$emit("saveData", tempData);
     },changeJihao(){
-
       this.$forceUpdate()
-
     },
     changeSch(row) {
 
@@ -2940,10 +2940,10 @@ export default {
         });
       }
     },
-    saveActionThree: function (val,delData) {
+    saveActionThree: function (val) {
       updateEditSchedules(
         JSON.stringify(val),
-        JSON.stringify(delData),
+        JSON.stringify([]),
       ).then((rs) => {
         var resp = rs.data;
         if (resp.state == 1) {