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

src/api/patient.js

@@ -1403,4 +1403,76 @@ export function getPatientRescueRecordList(id,patient_id,params){
     method:"get",
     params:params
   })
-}
+}
+
+export function getMonitorSearchList(params){
+
+  return request({
+    url:"/api/patient/getmonitorsearchlist",
+    method:"get",
+    params:params,
+  })
+}
+
+export function getSummarySearchList(params){
+
+  return request({
+    url:"/api/patient/getsummarysearchlist",
+    method:"get",
+    params:params
+  })
+}
+
+export function getPatientDryWeightList(params){
+
+  return request({
+    url:"/api/patient/getpatientdryweightlist",
+    method:"Get",
+    params:params
+  })
+}
+
+export function getDilaysisSystemList(params){
+   
+  return request({
+    url:"/api/patient/getdialysissystemlist",
+    method:"Get",
+    params:params,
+  })
+}
+
+export function getPatientAdviceList(params){
+
+  return request({
+    url:"/api/patient/getpatientadvicelist",
+    method:"Get",
+    params:params,
+  })
+}
+
+export function getPatientInspectionList(params){
+
+  return request({
+    url:"/api/patient/getpatientinspectionlist",
+    method:"get",
+    params:params
+  })
+}
+
+export function getInspectionByProjectId(params){
+ 
+  return request({
+    url:"/api/patient/getinspectionbyprojectid",
+    method:"get",
+    params:params
+  })
+}
+
+// export function getNewInspetingList(params){
+
+//   return request({
+//     url:"/api/patient/getnewinspetionlist",
+//     method:"get",
+//     params:params
+//   })
+// }

src/xt_pages/dialysis/batch_print/batch_print_order_eighty.vue

@@ -185,7 +185,7 @@
                           {{
                             record.assessment_before_dislysis.pulse_frequency
                               ? record.assessment_before_dislysis.pulse_frequency
-                              : ""
+                              : "拒测"
                           }}
                         </div>
                         次/分
@@ -1036,7 +1036,7 @@
                           {{
                             record.assessment_after_dislysis.pulse_frequency
                               ? record.assessment_after_dislysis.pulse_frequency
-                              : ""
+                              : "拒测"
                           }}
                         </div>
                         次/分

src/xt_pages/dialysis/batch_print/batch_print_order_eightyone.vue

@@ -879,7 +879,106 @@
                               />
                             </td>
                           </tr>
-                          <template v-if="record.advices.length<3">
+                          <tr v-for="(advice, advice_index) in record.advices"
+                            :key="advice_index"
+                          >
+                            <td height="35px">
+                              <span v-if="advice[0].start_time">
+                                {{ getTime(advice[0].start_time, "{h}:{i}") }}
+                              </span>
+                            </td>
+
+                            <td
+                              height="35px"
+                              colspan="2"
+                              class="advice-name"
+                              style="padding-left: 7px"
+
+                            >
+                             
+                              <span>{{ advice[0].advice_name }}</span>
+
+                              <span v-if="advice[0].advice_desc">
+                                ({{ advice[0].advice_desc
+                                }}{{ advice[0].drug_spec_unit }} )
+                              </span>
+
+                              <span v-if="advice[0].prescribing_number"
+                                >&nbsp;{{ advice[0].prescribing_number
+                                }}{{ advice[0].prescribing_number_unit }}</span
+                              >
+                              <span v-if="advice[0].single_dose != 0">
+                                {{ advice[0].single_dose
+                                }}{{ advice[0].single_dose_unit }}</span
+                              >
+
+                              <span v-if="advice[0].parent_id == 0">{{
+                                advice[0].delivery_way
+                              }}</span>
+                              <span v-if="advice[0].parent_id == 0">{{
+                                advice[0].execution_frequency
+                              }}</span>
+                              <span
+                                v-if="
+                                  advice[0].parent_id == 0 &&
+                                  advice[0].remark.length > 0
+                                "
+                                >({{ advice[0].remark }})</span>
+                              <!-- <span v-if="advice.child.length >1"> + </span> -->
+                            
+                            </td>
+
+                            <td height="35px">
+                              <span
+                                v-if="
+                                  setAdminUserES(advice[0], 'advice_doctor') ==
+                                  ''
+                                "
+                                >{{
+                                  getAdminUser(advice[0], "advice_doctor")
+                                }}</span
+                              >
+                              <img
+                                class="es-img"
+                                :src="
+                                  setAdminUserES(advice[0], 'advice_doctor')
+                                "
+                                alt=""
+                                srcset=""
+                                v-else
+                                style="height: 30px"
+                              />
+                            </td>
+                            <td height="35px">
+                              <span v-if="advice[0].execution_time">{{
+                                getTime(advice[0].execution_time, " {h}:{i}")
+                              }}</span>
+                            </td>
+                            <td height="35px">
+                              <span
+                                v-if="
+                                  setAdminUserES(
+                                    advice[0],
+                                    'execution_staff'
+                                  ) == ''
+                                "
+                                >{{
+                                  getAdminUser(advice[0], "execution_staff")
+                                }}</span
+                              >
+                              <img
+                                class="es-img"
+                                :src="
+                                  setAdminUserES(advice[0], 'execution_staff')
+                                "
+                                alt=""
+                                srcset=""
+                                v-else
+                                style="height: 30px"
+                              />
+                            </td>
+                          </tr>
+                          <!-- <template v-if="record.advices.length<3">
                             <tr v-for="item in 3">
                               <td height="35px"></td>
                               <td colspan="2"></td>
@@ -887,7 +986,7 @@
                               <td></td>
                               <td></td>
                             </tr>
-                          </template>
+                          </template> -->
 
                         </template>
                       </tbody>

src/xt_pages/dialysis/batch_print/batch_print_order_sixtyeight.vue

@@ -2033,7 +2033,8 @@
                 年龄：
                 <div class="under_line" style="width: 30px; text-align: center">
                   <!-- {{ record.patient.age }} -->
-                  {{ getAge(record.patient) }}
+                  <!-- {{ getAge(record.patient) }} -->
+                  {{ calculateAge(record.patient.id_card_no,record.schedule_date) }}
                 </div>
                 岁
               </div>
@@ -3454,6 +3455,48 @@ export default {
       });
   },
   methods: {
+  
+    getTimeOne(val) {
+      return uParseTime(val, "{y}");
+    },
+    getTimeTwo(val) {
+      return uParseTime(val, "{m}");
+    },
+    getTimeThree(val) {
+      return uParseTime(val, "{h}");
+    },
+    calculateAge(idNumber,created_time) {
+    var year = this.getTimeOne(created_time)
+
+    var month = this.getTimeTwo(created_time)
+
+    var day = this.getTimeThree(created_time)
+    console.log("start_time=====",year)
+    // 假设身份证号码是18位，且生日在第7位到第14位
+    const birthYear = parseInt(idNumber.substring(6, 10), 10);
+    const birthMonth = parseInt(idNumber.substring(10, 12), 10);
+    const birthDay = parseInt(idNumber.substring(12, 14), 10);
+
+    const today = new Date();
+    // console.log("today============",today)
+    var ageYear = year - birthYear;
+    let ageMonth = month - birthMonth; // 月份是从0开始的
+    let ageDay = day - birthDay;
+
+    // 调整月份和日期，以便于正确计算
+      if (ageDay < 0) {
+          ageMonth -= 1;
+          // 获取上个月的天数
+          const pastMonthDay = new Date(year,month, 0).getDate();
+          ageDay += pastMonthDay;
+      }
+      if (ageMonth < 0) {
+          ageYear -= 1;
+          ageMonth += 12;
+      }
+
+     return ageYear
+    },
     getDisplaceLiquiPart: function (val) {
       let displace_liqui_part_name = "/";
       const displace_liqui_part = this.displaceLiquiPartOptions;

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

@@ -358,24 +358,7 @@
                         </el-form-item>
                     </el-col>
 
-                    <el-col :span="8" v-if="isShows('追加肝素量')" >
-                       <el-form-item v-if="dialysisPrescription.anticoagulant == 2"
-                       :label="'追加肝素量(mg) : '" prop="add_amount" :rules="isCheckmust('追加肝素量')">
-                                <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
-                                          v-model="dialysisPrescription.add_amount"></el-input>
-                                <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
-                                          v-model="dialysisPrescription.add_amount"></el-input>
-                            </el-form-item>
-
-                            <el-form-item v-if="dialysisPrescription.anticoagulant != 2 && dialysisPrescription.anticoagulant != 1"
-                            :label="'追加肝素量(' + anticoagulant.shouji_unit + ') : '" prop="add_amount" :rules="isCheckmust('追加肝素量')">
-                                <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
-                                          v-model="dialysisPrescription.add_amount"></el-input>
-                                <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
-                                          v-model="dialysisPrescription.add_amount"></el-input>
-                            </el-form-item>
-                    </el-col>
-
+                 
                   <el-col :span="8" v-if="isShows('减肝素量')">
                        <el-form-item v-if="dialysisPrescription.anticoagulant == 2" :label="'减肝素量(mg) : '" prop="calculateAnticoagulantZL" :rules="isCheckmust('减肝素量')">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
@@ -500,6 +483,26 @@
                     </el-col>
 
 
+                    <el-col :span="8" v-if="isShows('追加肝素量')" >
+                       <el-form-item v-if="dialysisPrescription.anticoagulant == 2"
+                       :label="'追加肝素量(mg) : '" prop="add_amount" :rules="isCheckmust('追加肝素量')">
+                                <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
+                                          v-model="dialysisPrescription.add_amount"></el-input>
+                                <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
+                                          v-model="dialysisPrescription.add_amount"></el-input>
+                            </el-form-item>
+
+                            <el-form-item v-if="dialysisPrescription.anticoagulant != 2 && dialysisPrescription.anticoagulant != 1"
+                            :label="'追加肝素量(' + anticoagulant.shouji_unit + ') : '" prop="add_amount" :rules="isCheckmust('追加肝素量')">
+                                <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
+                                          v-model="dialysisPrescription.add_amount"></el-input>
+                                <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
+                                          v-model="dialysisPrescription.add_amount"></el-input>
+                            </el-form-item>
+                    </el-col>
+
+
+
                     <el-col :span="8" v-if="anticoagulant!=undefined &&anticoagulant.weichi != -1 && isShows('维持')  && dialysisPrescription.anticoagulant!=1&& dialysisPrescription.anticoagulant!=12">
                         <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157  && this.$store.getters.xt_user.template_info.org_id != 9990 && this.$store.getters.xt_user.template_info.org_id != 9671  && this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10432 && this.$store.getters.xt_user.template_info.org_id != 9829 && this.$store.getters.xt_user.template_info.org_id != 10440 && this.$store.getters.xt_user.template_info.org_id != 10469 && this.$store.getters.xt_user.template_info.org_id != 10471 && this.$store.getters.xt_user.template_info.org_id != 10495 && this.$store.getters.xt_user.template_info.org_id != 10375 && this.$store.getters.xt_user.template_info.org_id != 10600 && this.$store.getters.xt_user.template_info.org_id != 10702 && this.$store.getters.xt_user.template_info.org_id != 10510 && this.$store.getters.xt_user.template_info.org_id != 10480">
                           <div v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id != 45 && this.$store.getters.xt_user.template_info.template_id != 54 && this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10387 && this.$store.getters.xt_user.template_info.org_id != 10495 && this.$store.getters.xt_user.template_info.org_id != 10375 ">

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyeight.vue

@@ -48,6 +48,7 @@
             年龄：
             <div class="under_line" style="width: 30px; text-align: center">
               {{ getAge(patientInfo) }}
+              <!-- {{ calculateAge(patientInfo.id_card_no,xtdate) }} -->
             </div>
             岁
           </div>
@@ -1711,6 +1712,7 @@
             <div class="inline_block" style="margin-left: 10px">
               年龄：
               <div class="under_line" style="width: 30px; text-align: center">
+                <!-- {{ calculateAge(patientInfo.id_card_no,xtdate) }} -->
                 {{ getAge(patientInfo) }}
               </div>
               岁
@@ -3927,6 +3929,48 @@ export default {
         return age
       }
     },
+    
+    getTimeOne(val) {
+      return uParseTime(val, "{y}");
+    },
+    getTimeTwo(val) {
+      return uParseTime(val, "{m}");
+    },
+    getTimeThree(val) {
+      return uParseTime(val, "{h}");
+    },
+    calculateAge(idNumber,created_time) {
+    var year = this.getTimeOne(created_time)
+
+    var month = this.getTimeTwo(created_time)
+
+    var day = this.getTimeThree(created_time)
+    console.log("start_time=====",year)
+    // 假设身份证号码是18位，且生日在第7位到第14位
+    const birthYear = parseInt(idNumber.substring(6, 10), 10);
+    const birthMonth = parseInt(idNumber.substring(10, 12), 10);
+    const birthDay = parseInt(idNumber.substring(12, 14), 10);
+
+    const today = new Date();
+    // console.log("today============",today)
+    var ageYear = year - birthYear;
+    let ageMonth = month - birthMonth; // 月份是从0开始的
+    let ageDay = day - birthDay;
+
+    // 调整月份和日期，以便于正确计算
+      if (ageDay < 0) {
+          ageMonth -= 1;
+          // 获取上个月的天数
+          const pastMonthDay = new Date(year,month, 0).getDate();
+          ageDay += pastMonthDay;
+      }
+      if (ageMonth < 0) {
+          ageYear -= 1;
+          ageMonth += 12;
+      }
+
+     return ageYear
+    },
     newAdviceGroupObject: function () {
       return Object.assign(
         {},

src/xt_pages/dialysis/template/DialysisPrintOrdereighty.vue

@@ -172,7 +172,7 @@
                         {{
                           predialysis.pulse_frequency
                             ? predialysis.pulse_frequency
-                            : ""
+                            : "拒测"
                         }}
                       </div>
                       次/分
@@ -876,7 +876,7 @@
                         {{
                           afterdialysis.pulse_frequency
                             ? afterdialysis.pulse_frequency
-                            : ""
+                            : "拒测"
                         }}
                       </div>
                       次/分

src/xt_pages/dialysis/template/DialysisPrintOrdereightyone.vue

@@ -753,8 +753,7 @@
                         <td style="font-size: 16px" width="10%">执行人员</td>
                       </tr>
 
-                      <tr
-                        v-for="(advice, advice_index) in doctor_advices"
+                      <tr v-for="(advice, advice_index) in doctor_advices"
                         :key="advice_index"
                       >
                         <td height="32px">
@@ -1368,7 +1367,7 @@
                       治疗医生：
                       <div class="under_line"
                         style="width: 80px; text-align: center"
-                      > 
+                      >
                       <!-- {{ getAdminUser(prescription.creater) }} -->
                         <span style="height: 30px; display: inline-block"
                           v-if=" setAdminUserES(prescription.creater) == ''"
@@ -1998,7 +1997,7 @@ export default {
         return "";
       }
       for (let i = 0; i < this.adminUser.length; i++) {
-        if (this.adminUser[i].id == id) {        
+        if (this.adminUser[i].id == id) {
           return this.adminUser[i].name;
         }
       }
@@ -2352,10 +2351,12 @@ export default {
         this.loading = false;
         this.doctor_advices =
           response.data.data.advices == null ? [] : response.data.data.advices;
+          const advices = response.data.data.doctorAdevieInfo
         for (let index = 0; index < this.doctor_advices.length; index++) {
           this.doctor_advices[index]["isShow"] = 2;
         }
-        console.log("haaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",this.doctor_advices)
+        this.doctor_advices = this.doctor_advices.concat(advices)
+        console.log("haaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",this.doctor_advices,advices)
 
         if(this.org_id == 10489 ){
           let projectsOne = [];
@@ -2560,27 +2561,29 @@ export default {
           }
           this.doctor_advices = []
           this.doctor_advices = docArr
+          console.log('222222222222',docArr);
+          
         }
 
-        if (this.doctor_advices.length + this.projectsOne.length <= 6) {
-            var nl = 6 - (this.doctor_advices.length + this.projectsOne.length);
-            this.print_length = 6;
-
-            for (let index = 0; index < nl; index++) {
-              if (
-                this.projectsOne[index] == undefined ||
-                this.projectsOne[index].length <= 0
-              ) {
-                this.projectsOne.push([]);
-              } else {
-                continue;
-              }
-            }
-          }
+        // if (this.doctor_advices.length + this.projectsOne.length <= 6) {
+        //     var nl = 6 - (this.doctor_advices.length + this.projectsOne.length);
+        //     this.print_length = 6;
+
+        //     for (let index = 0; index < nl; index++) {
+        //       if (
+        //         this.projectsOne[index] == undefined ||
+        //         this.projectsOne[index].length <= 0
+        //       ) {
+        //         this.projectsOne.push([]);
+        //       } else {
+        //         continue;
+        //       }
+        //     }
+        //   }
 
 
         this.totollength = this.doctor_advices.length + this.monitors.length;
-        console.log("this.totollength",this.totollength)
+        console.log("this.totollength",this.totollength,this.doctor_advices)
 
 
         if (this.totollength > 18) {

src/xt_pages/outpatientCharges/invoiceTemplate/printthirteen.vue

@@ -7,8 +7,8 @@
       <div style="display: flex; margin: 15px 0 5px 0;">
         <div style="flex: 1.1;">业务流水号:{{ list.order_number }}</div>
         <div style="flex: 0.9;">医疗机构类型:</div>
-        <div style="flex: 1;">医院国家编码：H32092103007</div>
-
+        <div style="flex: 1;" v-if="org_id == 10188">医院国家编码：H32092103007</div>
+        <div style="flex: 1;" v-if="org_id ==10217">医院国家编码：H32090403023</div>
       </div>
       <div style="display: flex;">
         <!-- <div style="flex:1;">医生：{{ doctor_info.user_name }}</div>
@@ -126,7 +126,8 @@
         <!-- <div style="flex: 1;">No.{{list.order.fa_piao_number}}</div> -->
       </div>
       <div style="display: flex;">
-        <div style="flex: 1.5;">收款单位（章）：{{ org_name }}</div>
+        <div style="flex: 1.5;" v-if="org_id==10188">收款单位（章）：{{ org_name }}</div>
+        <div style="flex: 1.5;" v-if="org_id==10217">收款单位（章）：大丰燕舞血液透析中心</div>
         <div style="flex: 0.7;">收费员：{{ paramsObj.chargeName }}</div>
         <div style="flex: 1;">
           <span>{{  paramsObj.setl_time ? paramsObj.setl_time.split(' ')[0].slice(0,4) : getTime(list.date, '{y}-{m}-{d}').slice(0,4) }}</span>

src/xt_pages/outpatientCharges/statementTemplate/printSixtheen.vue

@@ -10,6 +10,9 @@
             <div style="flex: 1;">健康ID:{{ info.patient.dialysis_no }}</div>
             <div style="flex: 1;">门诊单据号:{{info.id}}</div>
         </div>
+        <div style="border-bottom:1px solid black;padding: 5px;">
+          身份证号：{{ info.patient.id_card_no }}
+        </div>
         <div style="border-bottom:1px solid black;display: flex;padding: 5px;">
             <div style="flex: 1;">医保编码:</div>
             <div style="flex: 1;">刷卡前余额:</div>
@@ -43,11 +46,11 @@
         </div>
         <div style="">
           <div style="display: flex;padding: 5px;line-height: 30px;">
+            <div style="flex: 1;">基金支付总额:{{ info.new_order.fund_pay_sumamt }}</div>
             <div style="flex: 1;">基本统筹:{{info.hifp_pay}}</div>
-            <div style="flex: 1;">公务员补助:</div>
             <div style="flex: 1;">大病基金支付:{{info.hifmi_pay}}</div>
+            <div style="flex: 1;">医疗救助基金支付:{{info.maf_pay}}</div>
             <div style="flex: 1;">个人账户支付:{{info.acct_pay}}</div>
-            <div style="flex: 1;">医保个人现金:{{info.fund_pay_sumamt}}</div>
           </div>
           <div style="display: flex;padding: 5px;line-height: 30px;">
             <div style="flex: 2;">费用总额(大写):{{getmoney(info.medfee_sumamt)}}</div>

src/xt_pages/outpatientTool/components/settle.vue

@@ -104,8 +104,6 @@
         </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>
@@ -392,7 +390,7 @@
       </el-table-column>
 
 
-      <el-table-column align="center" prop="item_name" label="储值卡说明">
+      <el-table-column align="center" prop="card_desc" label="储值卡说明">
         <template slot-scope="scope">{{scope.row.card_desc}}</template>
         <!--        <template slot-scope="scope" style="width: 100px">-->
         <!--          <el-input v-model="scope.row.oth_desc"></el-input>-->
@@ -691,7 +689,13 @@ import { uParseTime } from '@/utils/tools'
             return
           }
           const values = data.map(item => Number(item[column.property]))
-          if (column.property === 'total' || column.property === 'medfee_sumamt'  || column.property === 'fund_pay_sumamt'  || column.property === 'acct_pay'  || column.property === 'maf_pay'  || column.property === 'psn_cash_pay'  || column.property === 'hifp_pay'  || column.property === 'hifob_pay' ||  column.property === 'hifes_pay' || column.property === 'hifmi_pay' || column.property === 'oth_pay' || column.property === 'cvlserv_pay' || column.property === 'wechat_pay' || column.property === 'ali_pay' || column.property === 'band_card_pay' || column.property === 'jifen_pay' || column.property === 'cash_pay') {
+          if (column.property === 'total' || column.property === 'medfee_sumamt'  || column.property === 'fund_pay_sumamt'  || 
+              column.property === 'acct_pay'  || column.property === 'maf_pay'  || column.property === 'psn_cash_pay'  || 
+              column.property === 'hifp_pay'  || column.property === 'hifob_pay' ||  column.property === 'hifes_pay' || 
+              column.property === 'hifmi_pay' || column.property === 'oth_pay' || column.property === 'cvlserv_pay' || 
+              column.property === 'wechat_pay' || column.property === 'ali_pay' || column.property === 'band_card_pay' || 
+              column.property === 'jifen_pay' || column.property === 'cash_pay' || column.property ==='card_desc'
+          ) {
             sums[index] = values.reduce((prev, curr) => {
               const value = Number(curr)
               if (!isNaN(value)) {

src/xt_pages/stock/drugs/drugStockInOrderAdd.vue

@@ -916,7 +916,7 @@ export default {
             }
           }
 
-          if(this.$store.getters.xt_user.org_id == 0 || this.$store.getters.xt_user.org_id == 10138 || this.$store.getters.xt_user.org_id == 10278 || this.$store.getters.xt_user.org_id == 10610 ||  this.$store.getters.xt_user.org_id == 10537  ||  this.$store.getters.xt_user.org_id == 10480 ) {
+          if(this.$store.getters.xt_user.org_id == 10138 || this.$store.getters.xt_user.org_id == 10278 || this.$store.getters.xt_user.org_id == 10610 ||  this.$store.getters.xt_user.org_id == 10537  ||  this.$store.getters.xt_user.org_id == 10480 ) {
             for (let i = 0; i < array.length; i++) {
               if (array[i].drug_code.length == 0) {
                 this.$message.error(array[i].drug_name + " 药品溯源码不能为空");

src/xt_pages/stock/query/purchaseNewStockQuery.vue

@@ -294,7 +294,7 @@ export default {
                   list[i].stockMoney = (list[i].buy_price * list[i].stockIn).toFixed(2)
                }else if(this.org_id == 0 || this.org_id == 10644){
                  list[i].stock_in_price = "/"
-                list[i].stockMoney = (this.getAllStockInPrice(list[i].StWarehousingInfoTwo) + this.getAllStockInFlowPrice(list[i].WareStartInStockFlow) - this.getAllOutStockInPrice(list[i].WarehouseOutInfoTenty) - this.getAllStockOutFlowPrice(list[i].WareStartOutStockFlow)).toFixed(2)
+                list[i].stockMoney = this.getAllStockInPrice(list[i].StWarehousingInfoTwo) + this.getAllStockInFlowPrice(list[i].WareStartInStockFlow) - this.getAllOutStockInPrice(list[i].WarehouseOutInfoTenty) - this.getAllStockOutFlowPrice(list[i].WareStartOutStockFlow)
                 
                }else{
                 list[i].stock_in_price = "/"
@@ -310,7 +310,7 @@ export default {
                 list[i].saleStockMoney = (list[i].buy_price *list[i].stockAdd).toFixed(2)
               }else if(this.org_id == 0 || this.org_id == 10644){
                 list[i].addStockMoney = "/"
-                list[i].saleStockMoney = this.getWarehouseInfoOnePrice(list[i].StartFlowWarehouseInfo,list[i].WareStartEndStockInventoryProfit).toFixed(2)
+                list[i].saleStockMoney = this.getWarehouseInfoOnePrice(list[i].StartFlowWarehouseInfo,list[i].WareStartEndStockInventoryProfit)
               } else{
                list[i].addStockMoney = "/"
                list[i].saleStockMoney = "/"
@@ -338,9 +338,6 @@ export default {
               if(this.org_id == 10265){
                 list[i].overStock = list[i].GoodEndFlowInfo.over_count
               }else{
-                // console.log("期初",list[i].stockIn)
-                // console.log("增加",list[i].stockAdd)
-                // console.log("出库",list[i].outStock)
                 if((list[i].stockIn + list[i].stockAdd - list[i].outStock)>0 ){
                   list[i].overStock = list[i].stockIn + list[i].stockAdd - list[i].outStock
                 }else{
@@ -760,7 +757,7 @@ export default {
     all_count_price = count_price + count_one_price
 
     if(all_count_price > 0 ){
-      return all_count_price
+      return all_count_price.toFixed(2)
     }else{
       return 0
     }

src/xt_pages/stock/query/purchaseNewStockQueryPrint.vue

@@ -189,7 +189,7 @@ export default {
                       list[i].stockMoney = (list[i].buy_price * list[i].stockIn).toFixed(2)
                     }else if(this.org_id == 0 || this.org_id == 10644){
                       list[i].stock_in_price = "/"
-                      list[i].stockMoney = (this.getAllStockInPrice(list[i].StWarehousingInfoTwo) + this.getAllStockInFlowPrice(list[i].WareStartInStockFlow) - this.getAllOutStockInPrice(list[i].WarehouseOutInfoTenty) - this.getAllStockOutFlowPrice(list[i].WareStartOutStockFlow)).toFixed(2)
+                      list[i].stockMoney = (this.getAllStockInPrice(list[i].StWarehousingInfoTwo) + this.getAllStockInFlowPrice(list[i].WareStartInStockFlow) - this.getAllOutStockInPrice(list[i].WarehouseOutInfoTenty) - this.getAllStockOutFlowPrice(list[i].WareStartOutStockFlow))
                     } else{
                       list[i].stock_in_price = "/"
                       list[i].stockMoney = "/"
@@ -203,7 +203,7 @@ export default {
                         list[i].saleStockMoney = (list[i].buy_price *list[i].stockAdd).toFixed(2)
                     }else if(this.org_id == 0 || this.org_id == 10644){
                       list[i].addStockMoney = "/"
-                      list[i].saleStockMoney = this.getWarehouseInfoOnePrice(list[i].StartFlowWarehouseInfo,list[i].WareStartEndStockInventoryProfit).toFixed(2)
+                      list[i].saleStockMoney = this.getWarehouseInfoOnePrice(list[i].StartFlowWarehouseInfo,list[i].WareStartEndStockInventoryProfit)
                      
                     }else{
                         list[i].addStockMoney = "/"
@@ -218,8 +218,11 @@ export default {
                       list[i].stockOutprice = list[i].packing_price
                       list[i].saleOutMoney = (list[i].packing_price * list[i].outStock).toFixed(2)
                     }else if(this.org_id == 0 || this.org_id == 10644){
-                      list[i].addStockMoney = "/"
-                      list[i].saleStockMoney = this.getWarehouseInfoOnePrice(list[i].StartFlowWarehouseInfo,list[i].WareStartEndStockInventoryProfit).toFixed(2)
+                      list[i].stockOutprice = "/"
+                      list[i].saleOutMoney = this.getWarehosueOutInfoPrice(list[i].WarehouseOutInfoStart,list[i].WareStartEndStockInventoryLosses,list[i].StartEndCancelFLowInfo)
+                      if(list[i].saleOutMoney == "NaN"){
+                        list[i].saleOutMoney = ""
+                      }
                       
                     }else{
                       list[i].stockOutprice = "/"
@@ -236,10 +239,13 @@ export default {
                       list[i].overPrice = list[i].packing_price
                       list[i].overMoney = (list[i].packing_price*list[i].overStock).toFixed(2)
                      }else if(this.org_id == 0 || this.org_id == 10644){
-                      list[i].stockOutprice = "/"
-                      list[i].saleOutMoney = this.getWarehosueOutInfoPrice(list[i].WarehouseOutInfoStart,list[i].WareStartEndStockInventoryLosses,list[i].StartEndCancelFLowInfo)
-                      if(list[i].saleOutMoney == "NaN"){
-                        list[i].saleOutMoney = ""
+                      list[i].overPrice = "/"
+                      console.log("stockMoney-00000000000000",list[i].stockMoney)
+                      console.log("saleStockMoney-00000000000000",list[i].saleStockMoney)
+                      console.log("saleOutMoney-00000000000000",list[i].saleOutMoney)
+                      list[i].overMoney = (parseFloat(list[i].stockMoney)  + parseFloat(list[i].saleStockMoney) - parseFloat(list[i].saleOutMoney)).toFixed(2)
+                      if(list[i].overMoney == "NaN"){
+                        list[i].overMoney = ""
                       }
                      }else{
                         list[i].overPrice = "/"

src/xt_pages/user/components/PatientDetail.vue

@@ -1030,6 +1030,22 @@
        </el-col>
       </el-row>
 
+      <el-row>
+        <el-col>
+            <el-form-item label="病历图册:" prop="gallery">
+             <div style="display: flex;">
+              <div v-for="item in fileList" style="margin-left: 10px;">
+                <el-image 
+                  style="width: 100px; height: 100px"
+                  :src="item" 
+                  :preview-src-list="fileList">
+               </el-image>
+              </div>
+             </div>
+            </el-form-item>
+        </el-col>
+      </el-row>
+
     </el-form>
     <!-- 打印预览 style="display: none"-->
     <div style="display: none">
@@ -1669,6 +1685,7 @@ const defaultForm = {
   print_date:"",
   famality_record:"",
   patient_type:"",
+  org_logo:"",
 };
 
 export default {
@@ -1776,6 +1793,8 @@ export default {
       liuAddresslist:[],
       patientVascularAccessOne:{},
       patientType: [{ value: 1, label: "血透患者" }, { value: 2, label: "慢病患者" }, { value: 3, label: "会员患者" },{ value: 4, label: "腹透患者" },{ value: 5, label: "CKD患者" },{ value: 6, label: "其他患者" }],
+      fileList:[],
+      guploading:false,
     };
   },
   computed: {
@@ -1916,6 +1935,7 @@ export default {
         }
       });
     },
+   
     fetchPatient(id) {
       fetchPatient(id)
         .then((response) => {
@@ -2062,6 +2082,19 @@ export default {
             this.form.tell_phone = patietInfo.tell_phone;
             this.form.dialysis_age = patietInfo.dialysis_age;
             this.form.record_number = patietInfo.record_number
+            this.fileList = []
+            var arrNew = []
+            if(patietInfo.org_logo!=""){
+              arrNew = patietInfo.org_logo.split(",")
+            }
+            if(arrNew!=null){
+              for(let i=0;i<arrNew.length;i++){
+                if(arrNew[i]!=""){
+                  this.fileList.push(arrNew[i])
+                }
+              }
+            }
+            console.log("----------------------------",this.fileList)
             if (patietInfo.expense_kind == 0) {
               this.form.expense_kind = "";
             } else {

src/xt_pages/user/components/PatientForm.vue

@@ -1075,6 +1075,26 @@
           </el-form-item>
        </el-col>
       </el-row>
+
+      <el-row>
+        <el-col>
+            <el-form-item label="病历图册:" prop="gallery">
+                <el-upload
+                    v-loading="guploading"
+                    :data="uploadData"
+                    action="https://upload.qiniup.com"
+                    list-type="picture-card"
+                    :file-list="fileList"
+                    :on-remove="handleRemove"
+                    :on-error="handleGalleryError"
+                    :on-success="handleGallerySuccess"
+                    :before-upload="beforeGalleryUpload">
+                    <i class="el-icon-plus"></i>
+                </el-upload>
+                
+            </el-form-item>
+        </el-col>
+      </el-row>
       
        <el-row>
           <el-col :span="24" align="right" class="newCol">
@@ -1140,7 +1160,6 @@ import {
 import { fetchAllAdminUsers } from "@/api/doctor";
 // import { fetchAllDoctorAndNurse } from "@/api/doctor";
 import { getDataConfig } from "@/utils/data";
-
 const defaultForm = {
   avatar: "https://images.shengws.com/201809182128111.png",
   name: "",
@@ -1205,6 +1224,7 @@ const defaultForm = {
   allergic_history:"",
   print_date:"",
   famality_record:"",
+  org_logo:"",
   formItem: [
     {
       id: 0,
@@ -1355,6 +1375,7 @@ const defaultForm = {
   dbp: "",
   showOne:true,
   treatment_plan:"",
+  
 };
 
 export default {
@@ -1540,7 +1561,13 @@ export default {
       },
       adminUserOptions:[],
       org_id:0,
-      liuAddresslist:[]
+      liuAddresslist:[],
+      formloading:false,
+      uploading:false,
+      guploading:false,
+      formsubmit:false,
+      loadingText:'',
+      fileList:[],
     };
   },
   components: {
@@ -1636,6 +1663,106 @@ export default {
     // }
   },
   methods: {
+    handleAvatarSuccessOne(res, file) {
+            this.form.org_logo = this.qiniuDomain + res.url;
+            this.uploading = false;
+        },
+        beforeAvatarUploadOne(file) {
+            var fileType = file.type
+            const isJPG = fileType.indexOf('image') > -1
+            const isLt2M = file.size / 1024 / 1024 < 5
+
+            if (!isJPG) {
+                this.$message.error('只能上传图片')
+                return false
+            }
+            if (!isLt2M) {
+                this.$message.error('上传头像图片大小不能超过 5MB!')
+                return false
+            }
+
+            var date = new Date()
+            var ext = getFileExtension(file.name)
+            var key = "" + date.getFullYear() + (date.getMonth() + 1) + date.getDate() + date.getHours()  + date.getMinutes()  + date.getSeconds()  +'_o_' + file.uid + '.' + ext;
+            this.uploading = true;
+            this.loadingText = '机构头像上传中'
+
+            const _self = this
+            return new Promise((resolve, reject) => {
+                getToken().then(response => {
+                    const token = response.data.data.uptoken
+                    _self._data.uploadData.token = token
+                    _self._data.uploadData.key = key
+                    resolve(true)
+                }).catch(err => {
+                    reject(false)
+                    this.uploading = false;
+                })
+            })
+        },
+        handleGalleryError(err, file, fileList) {
+            this.$message.error(err);
+            this.guploading = false;
+            return false
+        },
+        handleGallerySuccess(res, file) {
+            var data = {type:1, url: this.qiniuDomain + res.url};
+            this.fileList.push(data)
+            console.log("fileLit==============",this.fileList)
+            if(this.fileList!=null){
+              for(let i=0;i<this.fileList.length;i++){
+                 this.form.org_logo += this.fileList[i].url+","
+              }
+            }
+          //  console.log("hahahahhwoowowo",this.form.org_logo)
+          //  this.form.org_logo += data.url+","
+
+            this.guploading = false;
+        },
+    beforeGalleryUpload(file) {
+        var fileType = file.type
+        const isJPG = fileType.indexOf('image') > -1
+        const isLt100M = file.size / 1024 / 1024 < 100
+
+        if (!isJPG) {
+            this.$message.error('只能上传图片')
+            return false
+        }
+        if (!isLt100M) {
+            this.$message.error('上传图片大小不能超过 100MB!')
+            return false
+        }
+
+        var date = new Date()
+        var ext = getFileExtension(file.name)
+        var key = ""+date.getFullYear() + (date.getMonth() + 1) + date.getDate() + date.getHours()  + date.getMinutes()  + date.getSeconds()  +'_g_' + file.uid + '.' + ext;
+        this.guploading = true;
+        this.loadingText = '机构图册上传中'
+
+        const _self = this
+        return new Promise((resolve, reject) => {
+            getToken().then(response => {
+                const token = response.data.data.uptoken
+                _self._data.uploadData.token = token
+                _self._data.uploadData.key = key
+                resolve(true)
+            }).catch(err => {
+                reject(false)
+                this.guploading = false;
+            })
+        })
+    },
+
+    handleRemove(file, fileList) {
+      console.log("fileList--------------",fileList)
+      var log_str = ""
+      for(let i=0;i<fileList.length;i++){
+          log_str +=fileList[i].url+","
+      }
+      this.form.org_logo = ""
+      this.form.org_logo = log_str
+    
+    },
     fetchAllAdminUsers() {
       fetchAllAdminUsers().then((response) => {
         if (response.data.state === 1) {
@@ -1735,10 +1862,9 @@ export default {
             if(this.form.patient_type >0){
                this.form.patient_type = parseInt(this.form.patient_type)
             }
-
-            editPatient(this.patientID, this.form)
-
-              .then(response => {
+            console.log("form===============",this.form)
+            
+            editPatient(this.patientID, this.form).then(response => {
                 if (response.data.state == 0) {
                   this.$message.error(response.data.msg);
                   this.formSubmit = true;
@@ -1938,6 +2064,20 @@ export default {
           if (response.data.state == 1) {
             this.$emit("tran-patient-info", response.data.data.patient);
             var patietInfo = response.data.data.patient;
+            this.fileList = []
+            var arrNew = []
+            if(patietInfo.org_logo!=""){
+              arrNew = patietInfo.org_logo.split(",")
+            }
+            if(arrNew!=null){
+              for(let i=0;i<arrNew.length;i++){
+                if(arrNew[i]!=""){
+                  var image = { name:i+1, url:arrNew[i]};
+                  this.fileList.push(image)
+                }
+              }
+            }
+            console.log("---------------------",this.fileList)
             console.log("9999999",response.data.data.patient)
             this.form.avatar = patietInfo.avatar;
             this.form.name = patietInfo.name;

src/xt_pages/user/components/PatientSidebar.vue

@@ -169,7 +169,7 @@ export default {
             // },
             {
               name: '3-4',
-              label: '病史新'
+              label: '病史'
             },
             {
               name: '3-2',

src/xt_pages/user/sickHistory_new.vue

@@ -471,6 +471,10 @@ export default {
     },
     template_dele(){
       console.log("hahhahahah",this.template_id)
+      if(this.template_id == 0){
+          this.$message.error("默认模版不能删除!")
+          return false
+      }
      deleteSickHistoryTempalte(this.template_id).then(response=>{
         if(response.data.state == 1){
           var msg =  response.data.data.msg
@@ -988,7 +992,8 @@ export default {
 
     },
     getCurrentChangeOne(val){
-      console.log("val-------------------",val.id)
+     
+     
       this.$refs.editorOne.contents = val.content
       this.template_content = ""
       this.template_content = val.content

src/xt_permission.js

@@ -12,19 +12,19 @@ const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名
 
 router.beforeEach((to, from, next) => {
   // 线上注释
-  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
-    store.dispatch('VerifyConfigList', []).then(() => {
-      next()
-    })
-  }
-  if (store.getters.permission_routers === undefined) {
-    store.dispatch('xt_GenerateRoutes', []).then(() => {
-      next()
-    })
-  } else {
-    next()
-  }
-  return
+  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
+  //   store.dispatch('VerifyConfigList', []).then(() => {
+  //     next()
+  //   })
+  // }
+  // if (store.getters.permission_routers === undefined) {
+  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
+  //     next()
+  //   })
+  // } else {
+  //   next()
+  // }
+  // return
  // 线上注释
   NProgress.start()
   // console.log(store.getters.current_role_urls.indexOf(to.path))