新分支

src/api/data.js

@@ -305,3 +305,48 @@ export function postSearchDrugList(keyword, storehouse_id, params) {
   })
 }
 
+export function savePatientDiagnose(data){
+  
+  return request({
+    url:"/api/patient/addpatientdiagnose",
+    method:"post",
+    data:data,
+  })
+}
+
+export function getPatientDiagnose(params){
+  
+  return request({
+    url:"/api/patient/getpatientdiagnose",
+    method:"get",
+    params:params
+  })
+}
+
+export function getPatientDiagnoseDetail(params){
+  
+  return request({
+    url:"/api/patient/getpatientdiagnosedetail",
+    method:"Get",
+    params:params
+  })
+}
+
+
+export function updatePatientCase(data){
+  
+  return request({
+    url:"/api/patient/updatepatientcase",
+    method:"post",
+    data:data,
+  })
+}
+
+export function deletePatientDiagnose(params){
+  
+  return request({
+    url:"/api/patient/deletepatientdiagnose",
+    method:"Get",
+    params:params,
+  })
+}

src/api/his/his.js

@@ -754,6 +754,30 @@ export function getBatchSettleAccount(params) {
 
 
 
+export function getHospitalUnChargeList(params) {
+  return request({
+    url: "/api/his/prescription/list",
+    method: "get",
+    params:params,
+  });
+}
+
+
+export function getHospitalUnChargeSummary(params) {
+  return request({
+    url: "/api/his/prescription/summary",
+    method: "get",
+    params:params,
+  });
+}
+
+export function getInHospitalHistory(params){
+  return request({
+    url:"/api/hospital/inhopitalcheck/list",
+    method:"get",
+    params:params
+  })
+}
 
 
 

src/api/manage.js

@@ -797,4 +797,12 @@ export function DeleteBatchDialyisWater(data){
     method:"Delete",
     data:data,
   })
+}
+
+export function getInformationManaList(params){
+  return request({
+    url:"/api/manage/getinformationmanalist",
+    method:"get",
+    params:params
+  })
 }

src/api/patient.js

@@ -744,3 +744,11 @@ export function getSickhistoryCheckRecordsPrint(params) {
 }
 
 
+export function getPatientDialysisInfor(params){
+  
+  return request({
+    url:"/api/patient/getpatientdialysisinforlist",
+    method:"get",
+    params:params
+  })
+}

src/lang/zh.js

@@ -294,7 +294,8 @@ export default {
     faPiao: '发票设置',
     chargeDetailManagement: '收费明细',
     yidiClear: '异地清分',
-    zeroSummary: '零用明细汇总'
+    zeroSummary: '零用明细汇总',
+    hospitalhistory: '住院历史',
   },
   navbar: {
     logOut: '退出登录',
@@ -416,6 +417,7 @@ export default {
     tentative_diagnosis: '初步诊断',
     diagnostic_basis: '诊断依据',
     differential_diagnosis: '鉴别诊断',
-    treatment_plan: '诊疗计划'
+    treatment_plan: '诊疗计划',
+    befor_symptoms: '透前症状',
   }
 }

src/router/modules/hospitalRecord.js

@@ -17,6 +17,11 @@ export default {
       component: () => import('@/xt_pages/hospitalStation/index'),
       name: 'hospitalIndex',
       meta: { title: 'hospitalIndex', noCache: true }
+    }, {
+      path: '/hospitalRecord/history',
+      component: () => import('@/xt_pages/hospitalStation/inHospitalHistory'),
+      name: 'hospitalhistory',
+      meta: { title: 'hospitalhistory', noCache: true }
     },
 
   ]

src/router/modules/workforce.js

@@ -167,6 +167,18 @@ export default {
       noCache: true
     }
   },
+
+  {
+    path: '/scheduleTablePrintThree',
+    component: () => import('@/xt_pages/workforce/scheduleTablePrintThree'),
+    name: 'scheduleTablePrintThree',
+    hidden: true,
+    is_menu: false,
+    meta: {
+      title: 'scheduleTablePrintThree',
+      noCache: true
+    }
+  },
   // {
   //   path: '/historyWeekTable',
   //   component: () => import('@/xt_pages/workforce/historyWeekTable'),

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

src/xt_pages/data/components/editInspection.vue

@@ -421,7 +421,8 @@
     },
     created() {
       this.getlist()
-    },watch: {
+    },
+    watch: {
       'tableData': function() {
         let c = 0
         this.form.price  = 0

src/xt_pages/data/components/inspection.vue

@@ -99,7 +99,7 @@ export default {
             },],
             value: '',
             tableData: [],
-            limit:20,
+            limit:10,
             page:1,
             total:0
             

src/xt_pages/data/specialDictionary.vue

@@ -43,6 +43,11 @@
           <diagnose-other v-if="activeName == 10"></diagnose-other>
         </el-tab-pane>
 
+
+        <el-tab-pane label="疾病诊断" name="11">
+          <patient-diagnose v-if="activeName == 11"></patient-diagnose>
+        </el-tab-pane>
+
       </el-tabs>
     </div>
   </div>
@@ -62,7 +67,7 @@
   import Addtion from './components/addtion'
   import DiagnoseOtherDialog from "./components/diagnoseOtherDialog";
   import DiagnoseOther from "./components/diagnoseOther";
-
+  import PatientDiagnose from "./components/patient_diagnose.vue"
   export default {
     name: 'specialDictionary',
     components: {
@@ -77,7 +82,8 @@
       project,
       inspection,
       manufacturer,
-      configure
+      configure,
+      PatientDiagnose
     },
     data() {
       return {

src/xt_pages/data/template.vue

@@ -63,7 +63,7 @@ export default {
         { label: this.$t("data_config.differential_diagnosis"), key:"differential_diagnosis"},
         { label: this.$t("data_config.treatment_plan"), key:"treatment_plan"},
         { label: this.$t("data_config.sick_history"), key:"sick_history"},
-
+        { label: this.$t("data_config.befor_symptoms"), key:"befor_symptoms"},
       ],
       activeName: "education",
       createdTimes: 0

src/xt_pages/device/airDisinfectTwo.vue

@@ -510,7 +510,7 @@
                     ></el-date-picker>
                   </el-form-item>
                   <el-form-item label="累计时间(h)" label-width="110px">
-                      <el-input v-model= "form.first_disinfection_time"  ></el-input>
+                      <el-input v-model= "form.first_total_time"  ></el-input>
                   </el-form-item>
                   <el-form-item label="检测合格" label-width="110px">
                       <div>
@@ -1258,7 +1258,23 @@
                 }else{
                     this.form.last_modifications= 0
                 }
+                console.log("23333333333333",this.form.first_total_time)
+                if( this.form.first_total_time > 0){
+                  this.form.first_total_time   = this.form.first_total_time.toString()
+                }
+                if( this.form.sencond_total_time > 0){
+                  this.form.sencond_total_time   = this.form.sencond_total_time.toString()
+                }
 
+                if( this.form.third_total_time > 0){
+                  this.form.third_total_time   = this.form.third_total_time.toString()
+                }
+
+                if(this.form.last_total_time >0){
+                    this.form.last_total_time   = this.form.last_total_time.toString()
+                }
+               
+                console.log("form23333333333333333wo",this.form)
                 updateNewAirDisinfect(this.form).then(response=>{
                 if(response.data.state == 1){
                   var disinfect =  response.data.data.disinfect

src/xt_pages/device/objectTableDisinfectTwo.vue

@@ -80,7 +80,7 @@
                     </template>
                 </el-table-column>
 
-                <el-table-column prop="name" :label="'体温计'+'\n'+'75%酒精擦拭'" align="center" min-width="60">
+                <el-table-column prop="name" :label="'体温计'+'\n'+'75%酒精浸泡'" align="center" min-width="60">
                     <template slot-scope="scope">
                         <!-- {{scope.row.fourth_total_time?scope.row.fourth_total_time:""}} -->
                         <!-- {{ scope.row.fourth_disinfection_time }} -->
@@ -990,7 +990,7 @@
                                 <td>负责人</td>
                                 <td>医疗垃圾桶<br/>1000mg/l含氯制剂</td>
                                 <td>负责人</td>
-                                <td>体温计<br/>75%酒精<br/>擦拭</td>
+                                <td>体温计<br/>75%酒精<br/>浸泡</td>
                                 <td>负责人</td>
                                 <td>体温枪<br/>75%酒精<br/>擦拭</td>
                                 <td>负责人</td>
@@ -1424,15 +1424,15 @@
               this.form.third_modifications = list.third_modifications?list.third_modifications:""
               this.form.third_creator = list.third_creator
 
-              this.form.fourth_disinfection_water = list.third_disinfection_water?list.third_disinfection_water:""
-              this.form.fourth_disinfection_methods = list.third_disinfection_methods?list.third_disinfection_methods:""
+              this.form.fourth_disinfection_water = list.fourth_disinfection_water?list.fourth_disinfection_water:""
+              this.form.fourth_disinfection_methods = list.fourth_disinfection_methods?list.fourth_disinfection_methods:""
               this.form.fourth_disinfection_time = list.fourth_disinfection_time?list.fourth_disinfection_time:""
-              this.form.fourth_start_time  =this.getTimeThree(list.third_start_time)
-              this.form.fourth_end_time = this.getTimeThree(list.third_end_time)
-              this.form.fourth_total_time = list.third_total_time? list.third_total_time:""
-              this.form.fourth_is_check = list.third_is_check.toString()
-              this.form.fourth_modifications = list.third_modifications?list.third_modifications:""
-              this.form.fourth_creator = list.third_creator
+              this.form.fourth_start_time  =this.getTimeThree(list.fourth_start_time)
+              this.form.fourth_end_time = this.getTimeThree(list.fourth_end_time)
+              this.form.fourth_total_time = list.fourth_total_time? list.fourth_total_time:""
+              this.form.fourth_is_check = list.fourth_is_check.toString()
+              this.form.fourth_modifications = list.fourth_modifications?list.fourth_modifications:""
+              this.form.fourth_creator = list.fourth_creator
 
               this.form.last_start_time = this.getTimeThree(list.last_start_time)
               this.form.last_end_time = this.getTimeThree(list.last_end_time)

src/xt_pages/dialysis/batch_print/batch_print_order_fortyOne.vue

@@ -1392,16 +1392,38 @@ export default {
         return record[key] == target_value
       }
     },
+    // getAge: function(val) {
+    //   if (val.age == 0) {
+    //     if (val.birthday == 0) {
+    //       return ''
+    //     }
+    //     return jsGetAge(uParseTime(val.birthday, '{y}-{m}-{d}'), '-')
+    //   } else {
+    //     return val.age
+    //   }
+    // },
     getAge: function(val) {
-      if (val.age == 0) {
-        if (val.birthday == 0) {
-          return ''
-        }
-        return jsGetAge(uParseTime(val.birthday, '{y}-{m}-{d}'), '-')
-      } else {
-        return val.age
-      }
-    },
+     
+     if (val.id_card_no) {
+       var thisLen = val.id_card_no.length
+
+       var birth = ''
+       if (thisLen == 15) {
+         birth = '19' + val.id_card_no.substr(6, 6)
+       } else {
+         birth = val.id_card_no.substr(6, 8)
+       }
+       var birthtwo =
+         birth.substr(0, 4) +
+         '-' +
+         birth.substr(4, 2) +
+         '-' +
+         birth.substr(6, 2)
+
+       var age = jsGetAge(birthtwo, '-')
+       return age
+     }
+   },
     newAdviceGroupObject: function() {
       return Object.assign(
         {},

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -69,8 +69,14 @@
               </div>
               岁
             </div>
-            <div class="inline_block">
-              门诊：
+            <div class="inline_block" v-if="record.receive_assessment.condition!=1">
+                门诊：
+                <div class="under_line" style="width: 30px; text-align: center">
+                  <check-box :checked="record.patient.source == 1"></check-box>
+                </div>
+              </div>
+            <div class="inline_block" v-if="record.receive_assessment.condition==1">
+              住院：
               <div class="under_line" style="width: 30px; text-align: center">
                 <check-box :checked="record.patient.source == 1"></check-box>
               </div>
@@ -1108,6 +1114,30 @@
                           <span v-if="record.prescription.anticoagulant == 7"
                             >&nbsp;低分子肝素钠</span
                           >
+                          <span v-if="record.prescription.anticoagulant == 8"
+                            >&nbsp;依诺肝素</span
+                          >
+                          <span v-if="record.prescription.anticoagulant == 9"
+                            >&nbsp;达肝素</span
+                          >
+                          <span v-if="record.prescription.anticoagulant == 10"
+                            >&nbsp;体外抗凝</span
+                          >
+                          <span v-if="record.prescription.anticoagulant == 11"
+                            >&nbsp;那屈肝素</span
+                          >
+                          <span v-if="record.prescription.anticoagulant == 12"
+                            >&nbsp;无抗凝剂</span
+                          >
+                          <span v-if="record.prescription.anticoagulant == 13"
+                            >&nbsp;那屈肝素钙</span
+                          >
+                          <span v-if="record.prescription.anticoagulant == 14"
+                            >&nbsp;肝素钙注射液</span
+                          >
+                          <span v-if="record.prescription.anticoagulant == 15"
+                            >&nbsp;甲磺酸萘莫司他</span
+                          >
                         </div>
                       </div>
                       <div class="inline_block" style="margin-left: 20px">
@@ -1318,7 +1348,8 @@
                               org_id != 9538 &&
                               org_id != 10121 &&
                               org_id != 9675 &&
-                              org_id != 0
+                              org_id != 0 &&
+                              org_id!=10490
                             "
                           >
                             电导度<br />(ms/cm)
@@ -1334,13 +1365,21 @@
                           <td
                             width="50"
                             v-if="
-                              org_id == 0 || org_id ==  10469
+                              org_id ==  10469
                             "
                           >
                             钠浓度<br />(mmol/L)
                           </td>
-                          <td width="50" v-if="org_id != 0 && org_id != 3877 && org_id != 10449">超滤量<br />(ml)</td>
-                          <td width="50" v-if="org_id ==0 || org_id ==3877 || org_id ==10449">累计超滤量<br />(ml)</td>
+                          <td
+                            width="50"
+                            v-if="
+                              org_id ==  10490 || org_id == 0
+                            "
+                          >
+                          置换液的速度<br />(ml/h)
+                          </td>
+                          <td width="50" v-if="org_id != 3877 && org_id != 10449">超滤量<br />(ml)</td>
+                          <td width="50" v-if="org_id ==3877 || org_id ==10449">累计超滤量<br />(ml)</td>
                           <td
                             v-if="
                               record.prescription.mode_id == 2 ||
@@ -1351,7 +1390,7 @@
                           >
                             置换量<br />(ml)
                           </td>
-                          <td v-if="org_id == 3877 || org_id == 0 || org_id == 10449" width="50">滤前压(mmHg)</td>
+                          <td v-if="org_id == 3877  || org_id == 10449" width="50">滤前压(mmHg)</td>
                           <td
                             width="50"
                             v-if="
@@ -1372,6 +1411,15 @@
                             血容量<br />(L)
                           </td>
 
+                          <td
+                            width="50"
+                            v-if="
+                              org_id == 10490 || org_id == 0
+                            "
+                          >
+                          碳酸氢钠<br />(ml)
+                          </td>
+
                           <td width="200">病情变化及处理</td>
                         </tr>
 
@@ -1446,15 +1494,13 @@
                             }}
                           </td>
 
-                          <!-- <td v-if="org_id != 10121 && org_id != 9675 && org_id != 0">
-                            {{monitor_record.conductivity? monitor_record.conductivity : ""}}
-                          </td> -->
+                      
                           <td
                             v-if="
                               org_id != 9538 &&
                               org_id != 10121 &&
                               org_id != 9675 && 
-                              org_id!=0
+                              org_id!=0 && org_id!=10490
                              
                             "
                           >
@@ -1479,7 +1525,7 @@
 
                           <td
                             v-if="
-                              org_id == 0 || org_id == 10469 
+                              org_id == 10469 
                             "
                           >
                             {{
@@ -1489,6 +1535,18 @@
                             }}
                           </td>
 
+                          <td
+                            v-if="
+                              org_id == 10490 || org_id == 0 
+                            "
+                          >
+                            {{
+                              monitor_record.replacement_speed
+                                ? monitor_record.replacement_speed
+                                : ""
+                            }}
+                          </td>
+
                           <td v-if="org_id == 9538">
                             {{
                               monitor_record.sodium_concentration
@@ -1528,7 +1586,7 @@
                                 : ""
                             }}
                           </td>
-                          <td v-if="org_id == 3877 || org_id == 0 || org_id == 10449">
+                          <td v-if="org_id == 3877  || org_id == 10449">
                             {{
                               monitor_record.filter_pressure
                                 ? monitor_record.filter_pressure
@@ -1554,6 +1612,14 @@
                           >
                             {{ monitor_record.accumulated_blood_volume }}
                           </td>
+                          <td
+                            width="50"
+                            v-if="
+                              org_id == 10490 || org_id == 0
+                            "
+                          >
+                           {{ monitor_record.dicarbonate  }}<br />
+                          </td>
 
                           <td style="line-height: 16px; padding: 0px">
                             <div
@@ -1604,22 +1670,29 @@
                           v-for="(monitor_record, s) in record.monitor_records2"
                           :key="s"
                         >
-                          <td></td>
-                          <td></td>
-                          <td></td>
-                          <td></td>
-                          <td></td>
-                          <td></td>
-                          <td></td>
-                          <td></td>
-                          <td></td>
-                          <td></td>
-                          <td
-                            v-if="
-                              org_id == 9919 || org_id == 9538 || org_id == 9675
-                            "
-                          ></td>
-                          <td v-if="org_id == 9538 || org_id == 9675"></td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td v-if="org_id == 9671 || org_id == 9919"></td>
+                        <td
+                          v-if="
+                            prescription.mode_id == 2 ||
+                            prescription.mode_id == 5 ||
+                            prescription.mode_id == 12
+                          "
+                          width="50"
+                        ></td>
+                        <td v-if="org_id == 9919||org_id == 9538 || org_id == 9671"></td>
+                        <td v-if="org_id == 9538"></td>
+                        <td v-if="org_id == 10490 || org_id == 0"></td>
+                         
                           <td style="line-height: 16px; padding: 0px">
                             <div
                               style="
@@ -1994,12 +2067,18 @@
                 </div>
                 岁
               </div>
-              <div class="inline_block">
+              <div class="inline_block" v-if="record.receive_assessment.condition!=1">
                 门诊：
                 <div class="under_line" style="width: 30px; text-align: center">
                   <check-box :checked="record.patient.source == 1"></check-box>
                 </div>
               </div>
+              <div class="inline_block" v-if="record.receive_assessment.condition==1">
+                住院：
+                <div class="under_line" style="width: 30px; text-align: center">
+                  <check-box :checked="record.patient.source == 1"></check-box>
+                </div>
+              </div>
               <div class="inline_block">
                 病区：
                 <div class="under_line" style="width: 50px; text-align: center">
@@ -3439,16 +3518,38 @@ export default {
         return record[key] == target_value;
       }
     },
-    getAge: function (val) {
-      if (val.age == 0) {
-        if (val.birthday == 0) {
-          return "";
-        }
-        return jsGetAge(uParseTime(val.birthday, "{y}-{m}-{d}"), "-");
-      } else {
-        return val.age;
-      }
-    },
+    // getAge: function (val) {
+    //   if (val.age == 0) {
+    //     if (val.birthday == 0) {
+    //       return "";
+    //     }
+    //     return jsGetAge(uParseTime(val.birthday, "{y}-{m}-{d}"), "-");
+    //   } else {
+    //     return val.age;
+    //   }
+    // },
+    getAge: function(val) {
+     
+     if (val.id_card_no) {
+       var thisLen = val.id_card_no.length
+
+       var birth = ''
+       if (thisLen == 15) {
+         birth = '19' + val.id_card_no.substr(6, 6)
+       } else {
+         birth = val.id_card_no.substr(6, 8)
+       }
+       var birthtwo =
+         birth.substr(0, 4) +
+         '-' +
+         birth.substr(4, 2) +
+         '-' +
+         birth.substr(6, 2)
+
+       var age = jsGetAge(birthtwo, '-')
+       return age
+     }
+   },
     newAdviceGroupObject: function () {
       return Object.assign(
         {},

src/xt_pages/dialysis/batch_print/batch_print_order_thirteen.vue

@@ -200,10 +200,17 @@
                     </div>
                     <div class="inline_block" style="margin-right:30px;">
                         透析液配方
-                        <div class="inline_block under_line" style="width:150px;text-align: center;">
+                        <div class="inline_block under_line" style="width:100px;text-align: center;">
                             {{ record.prescription.dialysate_formulation ? dialysateFormulationName(record.prescription.dialysate_formulation) : ''}}
                         </div>
                     </div>
+                    <div class="inline_block" style="margin-right:30px;">
+                      通路形成时间
+                      <div class="inline_block under_line" style="width:100px;text-align: left;">
+                        {{getTimeOne(record.assessment_before_dislysis.pathway_formation_time) }}
+                         
+                      </div>
+                  </div>
                 </div>
                 <div class="row">
                     血管通路
@@ -236,19 +243,53 @@
                     </div>
                 </div>
                 <div class="row">
-                  <div class="inline_block" style="margin-right:30px;">
+                  <div class="inline_block" style="margin-right:10px;">
                       导管
-                      <div class="inline_block under_line" style="width:200px;text-align: left;">
+                      <div class="inline_block under_line" style="width:900px;text-align: left;">
                           {{ record.assessment_before_dislysis.catheter ? record.assessment_before_dislysis.catheter : ''}}
                       </div>
                   </div>
-                  <div class="inline_block" style="margin-right:30px;">
+                </div>
+                <div class="row">
+                 <div class="inline_block" style="margin-right:10px;">
                       内瘘
-                      <div class="inline_block under_line" style="width:200px;text-align: left;">
+                      <div class="inline_block under_line" style="width:900px;text-align: left;">
                           {{ record.assessment_before_dislysis.internal_fistula ? record.assessment_before_dislysis.internal_fistula : ''}}
                       </div>
                   </div>
                 </div>
+                <!-- <div class="row"> -->
+                  <!-- <div class="inline_block" style="margin-right:30px;">
+                    导管评估项目
+                      <div class="inline_block under_line" style="width:200px;text-align: left;">
+                          {{ record.assessment_before_dislysis.catheter_evaluation_program ? record.assessment_before_dislysis.catheter_evaluation_program : ''}}
+                      </div>
+                  </div>
+                  <div class="inline_block" style="margin-right:30px;">
+                    置管部位皮肤
+                      <div class="inline_block under_line" style="width:100px;text-align: left;">
+                          {{ record.assessment_before_dislysis.skin_site_catheterization ? record.assessment_before_dislysis.skin_site_catheterization : ''}}
+                      </div>
+                  </div>
+
+                  <div class="inline_block" style="margin-right:30px;">
+                    是否通畅
+                      <div class="inline_block under_line" style="width:100px;text-align: left;">
+                        <span v-if="record.assessment_before_dislysis.whether_unobstructed ==0"></span>
+                         <span v-if="record.assessment_before_dislysis.whether_unobstructed ==1">是</span>
+                         <span v-if="record.assessment_before_dislysis.whether_unobstructed ==2">否</span>
+                      </div>
+                  </div> -->
+                  <!-- <div class="inline_block" style="margin-right:30px;">
+                    留置必要
+                      <div class="inline_block under_line" style="width:100px;text-align: left;">
+                        <span v-if="record.assessment_before_dislysis.lien_necessary ==0"></span>
+                         <span v-if="record.assessment_before_dislysis.lien_necessary ==1">是</span>
+                         <span v-if="record.assessment_before_dislysis.lien_necessary ==2">否</span>
+                         
+                      </div>
+                  </div> -->
+                <!-- </div> -->
                 <div class="row">
                     抗凝药物
                     <div class="inline_block under_line" style="width:92%;text-align: left;">
@@ -1010,6 +1051,16 @@ export default {
         )
       }
     },
+    getTimeOne(val) {
+        if(val < 0){
+          return ""
+        }
+        if(val == ""){
+        return ""
+        }else {
+        return uParseTime(val, '{y}-{m}-{d}')
+        }
+     },
     getNewAge(UUserCard) {
       if (UUserCard != null && UUserCard != '') {
         // 获取年龄

src/xt_pages/dialysis/batch_print/batch_print_order_thirtyTwo.vue

@@ -72,7 +72,9 @@
                         <td width="10">第</td>
                         <td width="50">
                             <div class="under-line">
-                            {{ record.patient.total_dialysis + record.patient.user_sys_before_count }}
+                            <!-- {{ record.patient.total_dialysis + record.patient.user_sys_before_count }} -->
+
+                             {{ record.Count }}
                             </div>
                         </td>
                         <td width="80">次透析</td>

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -606,6 +606,11 @@
           <span class="content">{{this.prescription.treatment_remark}}</span>
         </li>
 
+        <li v-if="isShow('加糖')">
+          <label>加糖: </label>
+          <span class="content">{{this.prescription.chaptalization}}</span>
+        </li>
+
        
       </ul>
     </div>

src/xt_pages/dialysis/details/NavIgation.vue

@@ -131,6 +131,12 @@
       ref="treatmentSummary"
       :patient="patient"
       :treatment_summary="treatment_summary"
+      :prescription="prescription"
+      :predialysis_evaluation="predialysis_evaluation"
+      :doctor_advices="doctor_advices"
+      :dialysis_order="dialysis_order"
+      :monitors="monitor_records"
+      :assessment_after_dislysis="assessment_after_dislysis"
     ></treatment-summary-dialog>
 
     <doctor-advice-dialog
@@ -579,6 +585,9 @@ export default {
       default:()=>{
         return [];
       } 
+    },
+    record_date:{
+      type:String
     }
   },
   methods: {
@@ -668,7 +677,7 @@ export default {
       this.$refs.assessment_after_dislysis.show(this.assessment_after_dislysis,this.last_assessment_after_dislysis);
     },
     showDoctorAdviceDialog: function() {
-      console.log("!!!!!!temp_schedual",this.temp_schedual)
+      
       this.$refs.doctor_advice.show(this.his_is_open,this.is_advice_open);
     },
     showComputerDialog: function() {
@@ -678,16 +687,16 @@ export default {
       this.$refs.finish_dialog.show(this.dialysis_order);
     },
     showPrescription: function() {
-      console.log("prescirpiton+++++++++++",this.prescription)
+     
       this.$refs.prescription.show(this.prescription,this.schedual,this.last_dialysis_prescribe,this.his_is_open,this.is_advice_open,this.admin_users);
     },
     showAccepts: function() {
       this.$refs.accepts.show(this.receiver_treatment_access);
     },
     showAssessmentBefore: function() {
-      console.log(this.last_predialysis_evaluation)
-
-      this.$refs.assessmentBefore.show(this.predialysis_evaluation,this.last_dryWeight_dislysis,this.last_predialysis_evaluation,this.lastAssessment);
+     
+      console.log("透前评估进入23232323我我哦",this.record_date)
+      this.$refs.assessmentBefore.show(this.predialysis_evaluation,this.last_dryWeight_dislysis,this.last_predialysis_evaluation,this.lastAssessment,this.record_date);
     },
     showDoubleCheck: function() {
 

src/xt_pages/dialysis/details/assessmentAfter.vue

@@ -193,8 +193,8 @@
         <li v-if="isShow('透析中进食')">
           <label>透析中进食: </label>
           <span class="content" >{{ this.record.dialysis_during ? this.record.dialysis_during : ""  }}</span>
-          <span class="unit" v-if="this.$store.getters.xt_user.template_info.template_id != 36">{{ this.record.dialysis_during ? "ml" : "" }}</span>
-          <span class="unit" v-if="this.$store.getters.xt_user.template_info.template_id == 36">{{ this.record.dialysis_during ? "g" : "" }}</span>
+          <span class="unit" v-if="this.$store.getters.xt_user.template_info.template_id != 36 && this.$store.getters.xt_user.template_info.template_id != 6">{{ this.record.dialysis_during ? "ml" : "" }}</span>
+          <span class="unit" v-if="this.$store.getters.xt_user.template_info.template_id == 36 || this.$store.getters.xt_user.template_info.template_id == 6">{{ this.record.dialysis_during ? "g" : "" }}</span>
         </li>
       </ul>
       <ul>

src/xt_pages/dialysis/details/assessmentBefore.vue

@@ -421,6 +421,13 @@
           <span class="unit"></span>
         </li>
 
+        <li v-if="isShow('透前症状')">
+          <label>透前症状: </label>
+          <span class="content">{{this.record.befor_symptoms}}</span>
+          <span class="unit"></span>
+        </li>
+
+
       </ul>
     </div>
     <div class="note">

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

@@ -29,7 +29,7 @@
           <el-col :span="8" v-if="isShow('实际超滤量')">
             <el-form-item
               label="实际超滤量(ml): " :prop="isName('实际超滤量')" :rules="isCheckmust('实际超滤量')"
-              v-if=" this.template_id == 6 || this.template_id == 9 || this.template_id == 10 || this.template_id == 11  || this.template_id == 17 || this.template_id == 20 || this.template_id == 21 || this.template_id == 22 || this.template_id == 23 || this.template_id == 24 || this.template_id == 26 || this.template_id == 28 || this.template_id == 27 || this.template_id == 29 || this.template_id == 30 || this.template_id == 31 || this.template_id == 32 || this.template_id == 34 || this.template_id == 36 || this.template_id == 38 || this.template_id == 43 || this.template_id == 44 || this.template_id == 47 || this.template_id == 56 || this.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10307 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10387 || this.$store.getters.xt_user.template_info.org_id == 10430 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10441 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 ||  this.$store.getters.xt_user.template_info.org_id == 10485"  >
+              v-if=" this.template_id == 6 || this.template_id == 9 || this.template_id == 10 || this.template_id == 11  || this.template_id == 17 || this.template_id == 20 || this.template_id == 21 || this.template_id == 22 || this.template_id == 23 || this.template_id == 24 || this.template_id == 26 || this.template_id == 28 || this.template_id == 27 || this.template_id == 29 || this.template_id == 30 || this.template_id == 31 || this.template_id == 32 || this.template_id == 34 || this.template_id == 36 || this.template_id == 38 || this.template_id == 43 || this.template_id == 44 || this.template_id == 47 || this.template_id == 56 || this.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10307 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10387 || this.$store.getters.xt_user.template_info.org_id == 10430 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10441 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410"  >
               <el-input v-model="form.actual_ultrafiltration"></el-input>
             </el-form-item>
             <el-form-item label="实际超滤量(L): " v-else :prop="isName('实际超滤量')" :rules="isCheckmust('实际超滤量')">
@@ -382,10 +382,10 @@
         </el-col>
 
         <el-col :span="8" v-if="isShow('透析中进食')">
-          <el-form-item label="透析中进食(ml): " v-if="template_id != 36" :prop="isName('透析中进食')" :rules="isCheckmust('透析中进食')">
+          <el-form-item label="透析中进食(ml): " v-if="template_id != 36 && template_id!=6" :prop="isName('透析中进食')" :rules="isCheckmust('透析中进食')">
             <el-input v-model="form.dialysis_during"></el-input>
           </el-form-item>
-          <el-form-item label="透析中进食(g): " v-if="template_id == 36" :prop="isName('透析中进食')" :rules="isCheckmust('透析中进食')" >
+          <el-form-item label="透析中进食(g): " v-if="template_id == 36 || template_id == 6" :prop="isName('透析中进食')" :rules="isCheckmust('透析中进食')" >
             <el-input v-model="form.dialysis_during"></el-input>
           </el-form-item>
         </el-col>
@@ -856,7 +856,7 @@ export default {
           this.form['internal_fistula_tremor_ac'] = ''
         }
         if (this.assessment_after_dislysis['patient_gose'] == 0) {
-          this.form['patient_gose'] = ''
+          this.form['patient_gose'] = 0
         }
         if (this.assessment_after_dislysis['weight_after'] == 0) {
           this.form['weight_after'] = ''
@@ -1082,7 +1082,7 @@ export default {
           data['puncture_point_oozing_blood'] = this.form.puncture_point_oozing_blood ? parseFloat(this.form.puncture_point_oozing_blood) : 0
           data['puncture_point_haematoma'] = this.form.puncture_point_haematoma ? parseFloat(this.form.puncture_point_haematoma) : 0
           data['internal_fistula_tremor_ac'] = this.form.internal_fistula_tremor_ac ? parseFloat(this.form.internal_fistula_tremor_ac) : 0
-          data['patient_gose'] = this.form.patient_gose ? parseFloat(this.form.patient_gose) : ' '
+          data['patient_gose'] = this.form.patient_gose ? parseFloat(this.form.patient_gose) : 0
           data['inpatient_department'] = this.form.inpatient_department
           data['observation_content'] = this.form.observation_content
           data['observation_content_other'] = this.form.observation_content_other

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

@@ -223,7 +223,7 @@
         :cell-class-name="adviceNameShow"
         :modal-append-to-body="false"
         highlight-current-row
-
+        
       >
       <!-- @selection-change="handleSelectionChange" -->
         <!-- <el-table-column type="selection"  width="55"></el-table-column> -->
@@ -257,6 +257,7 @@
             <el-dropdown trigger="click" v-if="scope.row.parent_id > 0">
               <span class="el-dropdown-link">
                 &emsp;{{ getAdviceContent(scope.row, 2)}}
+               
                 <i class="el-icon-arrow-down el-icon--right"></i>
               </span>
               <el-dropdown-menu slot="dropdown">
@@ -290,7 +291,7 @@
           </template>
         </el-table-column>
         <el-table-column
-          v-if="template_id != 6 && org_id!=10223 && org_id!=10445"
+          v-if="template_id != 6 && org_id!=10223 && org_id!=10445 && org_id!=0"
           prop="checker"
           min-width="30px"
           align="center"
@@ -304,7 +305,7 @@
         </el-table-column>
       </el-table>
 
-
+     
 
       <el-table
         v-if="his_is_open  == 1 || is_advice_open == 1"
@@ -359,6 +360,7 @@
             <el-dropdown trigger="click" v-if="scope.row.parent_id > 0">
               <span class="el-dropdown-link">
                 &emsp;{{ getAdviceContent(scope.row, 2)}}
+                 
                 <i class="el-icon-arrow-down el-icon--right"></i>
               </span>
               <el-dropdown-menu slot="dropdown">
@@ -606,40 +608,6 @@
       v-on:add-new-order="addNewOrder"
       :admin_users="admin_users"
     ></edit-group-advice>
-
-
-      <el-dialog
-          title="提示"
-          :visible.sync="infoDialogVisible"
-          width="30%">
-          <span>
-           <el-form>
-             <el-row>
-               <span>申请日期:</span>
-                <span>
-                    <el-date-picker
-                      type="datetime"
-                      format="yyyy-MM-dd HH:mm"
-                      value-format="yyyy-MM-dd HH:mm"
-                      placeholder="选择时间"
-                      v-model="selected_date"
-                  ></el-date-picker>
-                </span>
-             </el-row>
-             <el-row>
-               <span>备注:</span>
-                <span>
-                   <el-input v-model="remark" style="width:200px"></el-input>
-                </span>
-             </el-row>
-           </el-form>
-
-          </span>
-          <span slot="footer" class="dialog-footer">
-            <el-button @click="infoDialogVisible = false">取 消</el-button>
-            <el-button type="primary" @click="saveInformation">确 定</el-button>
-          </span>
-        </el-dialog>
   </div>
 </template>
 
@@ -815,9 +783,7 @@
         src_type:"",
         org_id:0,
         schedulePatient:{},
-        infoDialogVisible:false,
-        selected_date:"",
-        remark:""
+        tempArrOne:[],
       }
     },
     watch: {
@@ -832,12 +798,40 @@
         this.form['dialysis_order_id'] = this.dialysis_order.id
       },
 
+      'doctor_advices': function() {
+      
+        this.handleSpanTempArrOne();
+      },
+     
     },
     methods: {
+      handleSpanTempArrOne() {
+          this.tempArrOne = [];
+         
+          for (let i = 0; i < this.doctor_advices.length; i++) {
+            if (i === 0) {
+              this.tempArrOne.push(1);
+              this.pos = 0;
+            } else {
+              // 判断当前元素与上一个元素是否相同
+              if (
+                this.doctor_advices[i].groupno ===
+                this.doctor_advices[i - 1].groupno
+              ) {
+                this.tempArrOne[this.pos] += 1;
+                this.tempArrOne.push(0);
+              } else {
+                this.tempArrOne.push(1);
+                this.pos = i;
+              }
+            }
+          }
+      },
       handleSelectionChange(){
 
       },
-
+     
+    
       //调试
       lili(index,row){
         // console.log("==index==",index)
@@ -921,9 +915,6 @@
               response => {
                 if (response.data.state == 0) {
                   this.$message.error(response.data.msg);
-                  if(response.data.code == 600000008){
-                     this.infoDialogVisible = true
-                   }
                   return false;
                 } else {
                   this.$notify({
@@ -958,6 +949,7 @@
           return ''
         }
       },
+     
       submitEditAdvice() {
         // console.log()
         console.log("保存22222222222222")
@@ -983,9 +975,6 @@
           response => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg)
-              if(response.data.code == 600000008){
-               this.infoDialogVisible = true
-              }
               return false
             } else {
               this.$notify({
@@ -1294,9 +1283,6 @@
         ExecDoctorAdvice(this.patient.id, this.currentRow.id, this.execTime, mode,this.currentRow.origin).then(response => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg)
-             if(response.data.code == 600000008){
-               this.infoDialogVisible = true
-             }
               this.exceLoading = false
               return false
             } else {
@@ -1391,9 +1377,6 @@
             this.loading = false
             if (response.data.state == 0) {
               this.$message.error(response.data.msg)
-              if(response.data.code == 600000008){
-               this.infoDialogVisible = true
-              }
               return false
             } else {
               this.$notify({
@@ -1667,9 +1650,7 @@
               response => {
                 if (response.data.state == 0) {
                   this.$message.error(response.data.msg)
-                  if(response.data.code == 600000008){
-                    this.infoDialogVisible = true
-                  }
+
                   this.deleLoading = false
                   return false
                 } else {
@@ -1841,9 +1822,6 @@
             DeleteGroupAdvice(groupno, mode).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
-                if(response.data.code == 600000008){
-                 this.infoDialogVisible = true
-                }
                 return false
               } else {
                 this.$notify({
@@ -1892,9 +1870,6 @@
               this.deleLoading = false
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
-                if(response.data.code == 600000008){
-                   this.infoDialogVisible = true
-                }
                 return false
               } else {
                 this.$notify({
@@ -1936,9 +1911,6 @@
             DeleteDoctorAdvice(this.currentRow.id, mode).then(response => {
               this.deleLoading = false
               if (response.data.state == 0) {
-                 if(response.data.code == 600000008){
-                  this.infoDialogVisible = true
-                 }
                 this.$message.error(response.data.msg)
                 return false
               } else {
@@ -2154,17 +2126,8 @@
         return true
       }
       ,
-      mergeSpan({ row, column, rowIndex, columnIndex }) {
-        if (columnIndex != 2) {
-          const _row = this.tempArr[rowIndex]
-          const _col = _row > 0 ? 1 : 0
-          return {
-            rowspan: _row,
-            colspan: _col
-          }
-        }
-      }
-      ,
+    
+      
       handleSpanTempArr() {
         this.tempArr = []
 
@@ -2327,34 +2290,45 @@
         // });
       },
       objectSpanMethod({ row, column, rowIndex, columnIndex }) {
+        console.log("hhhhhhhhhh",this.tempArrOne)
+        //合并单元格
+        if (columnIndex === 0 || columnIndex === 1 ) {
+          const _row = this.tempArrOne[rowIndex];
+          const _col = _row > 0 ? 1 : 0;
+          console.log("_row====",_row)
+          console.log("_row----------",_col)
+          return {
+            rowspan: _row,
+            colspan: _col
+          };
+        }
+        // if (columnIndex === 0) {
+        //   if (rowIndex % 2 === 0) {
+        //     return {
+        //       rowspan: 2,
+        //       colspan: 1
+        //     }
+        //   } else {
+        //     return {
+        //       rowspan: 0,
+        //       colspan: 0
+        //     }
+        //   }
+        // }
 
-        if (columnIndex === 0) {
-          if (rowIndex % 2 === 0) {
-            return {
-              rowspan: 2,
-              colspan: 1
-            }
-          } else {
-            return {
-              rowspan: 0,
-              colspan: 0
-            }
-          }
-        }
-
-        if (columnIndex === 1) {
-          if (rowIndex % 2 === 0) {
-            return {
-              rowspan: 2,
-              colspan: 1
-            }
-          } else {
-            return {
-              rowspan: 0,
-              colspan: 0
-            }
-          }
-        }
+        // if (columnIndex === 1) {
+        //   if (rowIndex % 2 === 0) {
+        //     return {
+        //       rowspan: 2,
+        //       colspan: 1
+        //     }
+        //   } else {
+        //     return {
+        //       rowspan: 0,
+        //       colspan: 0
+        //     }
+        //   }
+        // }
       }
       ,
       GetLastOrNextDoctorAdvice(params) {
@@ -2657,28 +2631,10 @@
          }
          console.log("nam e23233232322323wo",name)
          return name
-      },
-
-     saveInformation(){
-        var params = {
-          selected_date:this.selected_date,
-          patient_id:this.$route.query.patient_id,
-          record_date:this.$route.query.date,
-          module:2,
-          remark:this.remark,
-        }
-        saveInformation(params).then(response=>{
-           if(response.data.state == 1){
-             var information = response.data.data.information
-             this.$message.success("审核成功!")
-             this.infoDialogVisible = false
-           }
-        })
       }
-
     },
     created() {
-
+     
       var date = this.$route.query && this.$route.query.date
       this.record_date = uParseTime(date, '{y}-{m}-{d}')
       this.form.advice_date = this.record_date

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

@@ -1,4 +1,5 @@
 <template>
+  <div>
   <el-dialog
     title="接诊评估"
     class="newDialog"
@@ -433,6 +434,8 @@ export default {
       infoDialogVisible:false,
       selected_date:"",
       remark:"",
+      arr:[],
+   
     };
   },
   methods: {
@@ -505,16 +508,23 @@ export default {
 
     handleComfirm: function (formName) {
       // var arr = [];
-      for (let i = 0; i < this.precaution_arr.length; i++) {
-        for (let j = 0; j < this.precautionTwo.length; j++) {
-          if (this.precaution_arr[i].name == this.precautionTwo[j]) {
-            this.arr.push(this.precaution_arr[i].id);
-          }
-        }
+
+      if(this.precaution_arr!=null){
+        for (let i = 0; i < this.precaution_arr.length; i++) {
+               for (let j = 0; j < this.precautionTwo.length; j++) {
+                 if (this.precaution_arr[i].name == this.precautionTwo[j]) {
+                   this.arr.push(this.precaution_arr[i].id);
+                 }
+               }
+             }
+         if(this.arr!=null && this.arr.length > 0){
+          var obj = this.arr.join(",");
+          this.receiveTreatmentAsses.precaution = obj;
+         }
+            
       }
-      // this.precautionchange()
-      var obj = this.arr.join(",");
-      this.receiveTreatmentAsses.precaution = obj;
+
+
       let ParamsQuery = this.receiveTreatmentAsses;
 
       console.log("ParamsQuery", ParamsQuery);

src/xt_pages/dialysis/details/dialog/adviceDialog/AddGroupAdvice.vue

@@ -1559,7 +1559,7 @@ export default {
         }
       }
       
-      if(this.$store.getters.xt_user.org.id == 9671 || this.$store.getters.xt_user.org.id == 9675 || this.$store.getters.xt_user.org.id == 10340){
+      if(this.$store.getters.xt_user.org.id == 9671 || this.$store.getters.xt_user.org.id == 9675 || this.$store.getters.xt_user.org.id == 10340 || this.$store.getters.xt_user.org.id == 10517){
          var date = new Date()
           var year = date.getFullYear()
           var month = date.getMonth() + 1

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

@@ -416,6 +416,8 @@
             </el-form-item>
           </el-col>
 
+        
+
           <el-col :span="8">
             <el-form-item label="前次透析后症状：" :prop="isName('前次透析后症状')"
               :rules="isCheckmust('前次透析后症状')" v-if="isShow('前次透析后症状')">
@@ -624,19 +626,105 @@
               <el-input v-model="body_weight_before" readonly></el-input>
             </el-form-item>
           </el-col>
+
+          <el-col :span="8">
+          
+            <el-form-item label="导管评估项目: " :prop="isName('导管评估项目')"
+              :rules="isCheckmust('导管评估项目')" v-if="isShow('导管评估项目')">
+              <el-input v-model="assessmentBeforeDislysis.catheter_evaluation_program" readonly
+                        @focus="showInnerDialog('22')"></el-input>
+            </el-form-item>
+          
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="置管部位皮肤:" :prop="isName('置管部位皮肤')"
+              :rules="isCheckmust('置管部位皮肤')" v-if="isShow('置管部位皮肤')">
+           
+              <el-input v-model="assessmentBeforeDislysis.skin_site_catheterization" readonly
+                        @focus="showInnerDialog('23')"></el-input>
+            </el-form-item>
+          </el-col>
          
+          <el-col :span="8">
+            <el-form-item label="是否通畅:" :prop="isName('是否通畅')"
+              :rules="isCheckmust('是否通畅')" v-if="isShow('是否通畅')">
+              <el-select v-model="assessmentBeforeDislysis.whether_unobstructed" @change="changeThrombus">
+                <el-option :key="0" label="请选择" :value="0"></el-option>
+                <el-option label="是" value="1"></el-option>
+                <el-option label="否" value="2"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
         
- 
-         
-          <el-col :span="24">
-            <el-form-item label="备注： " :prop="isName('备注')"
-              :rules="isCheckmust('备注')">
-              <el-input type="textarea" v-model="assessmentBeforeDislysis.remark" :rows="5"></el-input>
+          <el-col :span="8">
+            <el-form-item label="留置必要:" :prop="isName('留置必要')"
+              :rules="isCheckmust('留置必要')" v-if="isShow('留置必要')">
+              <el-select v-model="assessmentBeforeDislysis.lien_necessary" @change="changeThrombus">
+                <el-option :key="0" label="请选择" :value="0"></el-option>
+                <el-option label="是" value="1"></el-option>
+                <el-option label="否" value="2"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="通路形成时间:" :prop="isName('通路形成时间')"
+              :rules="isCheckmust('通路形成时间')" v-if="isShow('通路形成时间')">
+              <el-date-picker
+              v-model="assessmentBeforeDislysis.pathway_formation_time"
+              type="date"
+              style="width:200px"
+              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd"
+              placeholder="通路形成时间">
+              </el-date-picker>
             </el-form-item>
           </el-col>
          
-      
+        
         </el-row>
+        <el-row :gutter="20">
+          <el-col :span="24" v-if="isShow('透前症状')">
+              <el-form-item
+                label="透前症状："
+                :prop="isName('透前症状')"
+                :rules="isCheckmust('透前症状')"
+              >
+                <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-col v-if="isShow('透前症状')">
+              <el-form-item
+                :prop="isName('透前症状')"
+                :rules="isCheckmust('透前症状')"
+              >
+                <el-input
+                  type="textarea"
+                  v-model="assessmentBeforeDislysis.befor_symptoms"
+                  :rows="4"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          
+              
+            
+              <el-col :span="24">
+                <el-form-item label="备注： " :prop="isName('备注')"
+                  :rules="isCheckmust('备注')">
+                  <el-input type="textarea" v-model="assessmentBeforeDislysis.remark" :rows="5"></el-input>
+                </el-form-item>
+              </el-col>
+            
+          
+            </el-row>
 
 
       </el-form>
@@ -748,7 +836,7 @@
   import { parseTime } from '@/utils'
 
   import request from '@/utils/request'
-
+  const moment = require('moment')
   export default {
     components: {
       multiSelectBox
@@ -866,7 +954,12 @@
           age:"",
           his_department:"",
           his_bed:"",
-          point_puncture:""
+          point_puncture:"",
+          catheter_evaluation_program:"",
+          skin_site_catheterization:"",
+          pathway_formation_time:"",
+          lien_necessary:"",
+          befor_symptoms:"",
         },
 
         InnerDialogProps: {
@@ -887,8 +980,11 @@
         point_punctures:[],
         infoDialogVisible:false,
         selected_date:"",
-        remark:""
-
+        remark:"",
+        catheter_evaluation_program_list:[],
+        skin_site_catheterization_list:[],
+        summary:[],
+        value2:""
       }
     },
     props: {
@@ -994,13 +1090,18 @@
         return false
       },
 
-      show(assessment, lastDryWeightDislysis,last_predialysis_evaluation) {
+      show(assessment, lastDryWeightDislysis,last_predialysis_evaluation,lastAssessment,record_date) {
         console.log("dryWeightList",this.dryWeightList)
         console.log("doclist",this.docList)
         let filedList = store.getters.xt_user.fileds;
         console.log(filedList,'filedList')
         this.lastPredialysisEvaluation = last_predialysis_evaluation
         console.log("获取上次数据",this.lastPredialysisEvaluation, this.$store.getters.xt_user.org.id )
+
+        if(record_date!=null && record_date!=undefined){
+           this.record_date = record_date
+        }
+        console.log("日期23333333333我",this.record_date)
         if(this.lastPredialysisEvaluation != null) {
         // if(this.lastPredialysisEvaluation.remark == "" && this.$store.getters.xt_user.org.id == 10307){
         //     console.log("2o2o3232o23o2o3o23")
@@ -1042,6 +1143,24 @@
          
         }
 
+        this.assessmentBeforeDislysis.pathway_formation_time = moment(new Date()).format('YYYY-MM-DD')
+        console.log(" this.assessmentBeforeDislysis.pathway_formation_time", moment(new Date()).format('YYYY-MM-DD'))
+        console.log("hhahhahahah",assessment)
+        if(assessment!=null){
+          this.assessmentBeforeDislysis.pathway_formation_time =  this.getTimeOne(assessment.pathway_formation_time)
+          if(assessment.whether_unobstructed >0){
+            this.assessmentBeforeDislysis.whether_unobstructed = assessment.whether_unobstructed.toString()
+          } 
+          if(assessment.lien_necessary>0){
+            this.assessmentBeforeDislysis.lien_necessary = assessment.lien_necessary.toString()
+          }
+        }
+      
+
+        
+         
+        
+
 
         this.assessment = assessment
         this.getPermission()
@@ -1313,6 +1432,26 @@
             this.InnerDialogProps.isShowTextArea = false
 
             break
+
+            case '22': // 导管评估项目
+
+              this.InnerDialogProps.values = this.catheter_evaluation_program_list
+              this.InnerDialogProps.titles = '导管评估项目'
+              this.InnerDialogProps.type = 'catheter_evaluation_program'
+              this.InnerDialogProps.selected = this.assessmentBeforeDislysis.catheter_evaluation_program
+              this.InnerDialogProps.isShowTextArea = false
+
+            break
+
+            case '23': // 置管部位皮肤
+
+              this.InnerDialogProps.values = this.skin_site_catheterization_list
+              this.InnerDialogProps.titles = '置管部位皮肤'
+              this.InnerDialogProps.type = 'skin_site_catheterization'
+              this.InnerDialogProps.selected = this.assessmentBeforeDislysis.skin_site_catheterization
+              this.InnerDialogProps.isShowTextArea = false
+
+            break
          
         }
       },
@@ -1386,12 +1525,20 @@
            case 'point_puncture':
             this.assessmentBeforeDislysis.point_puncture = val.value.join(',')
             break
+           case 'catheter_evaluation_program':
+            this.assessmentBeforeDislysis.catheter_evaluation_program = val.value.join(',')
+            break
+          case 'skin_site_catheterization':
+            this.assessmentBeforeDislysis.skin_site_catheterization = val.value.join(',')
+            break
+            
         }
       },
       innerDialogCancle: function() {
         this.InnerDialogProps.visibility = false
       }, 
       handleComfirm(formName) {
+        console.log("提交日期",this.record_date)
         var arr = this.assessmentBeforeDislysis
         for (let i = 0; i < this.machineType.length; i++) {
           if (arr.machine_type == this.machineType[i].id) {
@@ -1420,6 +1567,9 @@
           }
         }
          console.log("params",ParamsQuery)
+
+         ParamsQuery.whether_unobstructed = parseInt(ParamsQuery.whether_unobstructed)
+         ParamsQuery.lien_necessary =  parseInt(ParamsQuery.lien_necessary)
          
         postAssessmentBeforeDislysis(ParamsQuery).then(response => {
           
@@ -1579,7 +1729,37 @@
              this.infoDialogVisible = false
            }
         })
+      },
+      getTimeOne(val) {
+        if(val == ""){
+        return ""
+        }else {
+        return uParseTime(val, '{y}-{m}-{d}')
+        }
+     },
+     dialysisSummarySelectChange: function (values) {
+   
+      if (this.assessmentBeforeDislysis.befor_symptoms == "") {
+        this.assessmentBeforeDislysis.befor_symptoms = values;
+      } else {
+       
+        if (this.assessmentBeforeDislysis.befor_symptoms.indexOf(values) == -1) {
+          if (
+            this.assessmentBeforeDislysis.befor_symptoms
+              .charAt(this.assessmentBeforeDislysis.befor_symptoms.length - 1)
+              .indexOf("。") == -1
+          ) {
+            this.assessmentBeforeDislysis.befor_symptoms =
+            this.assessmentBeforeDislysis.befor_symptoms+ "," + values;
+          } else {
+            this.assessmentBeforeDislysis.befor_symptoms =
+            this.assessmentBeforeDislysis.befor_symptoms+ "," + values;
+            this.assessmentBeforeDislysis.befor_symptoms =
+            this.assessmentBeforeDislysis.befor_symptoms + values;
+          }
+        }
       }
+    },
       
     },
     created() {
@@ -1615,10 +1795,19 @@
       console.log("针眼",this.pinholings)
       this.catheter_maintenancelist = getDataConfig('hemodialysis','catheter_maintenance')
       console.log("导管维护",this.catheter_maintenancelist)
+
+      this.catheter_evaluation_program_list = getDataConfig('hemodialysis','catheter_evaluation_program')
+
+      this.skin_site_catheterization_list = getDataConfig('hemodialysis','skin_site_catheterization')
        
       console.log("predialysis_evaluation2332323323222323",this.predialysis_evaluation)
 
       this.point_punctures = getDataConfig('hemodialysis','point_puncture')
+
+      this.summary = getDataConfig("befor_symptoms", "befor_symptoms");
+      
+      console.log("hhh32h323h23h23h23h23h23h",getDataConfig("befor_symptoms", "befor_symptoms"))
+      
       // this.weight_adjust.weight = this.dry_weight.dry_weight
 
       // if(this.predialysis_evaluation.id == 0){
@@ -1639,12 +1828,12 @@
 
       },
       'predialysis_evaluation.id': function() {
-         
+        console.log("hhahahahhaah",this.predialysis_evaluation)
        if(this.predialysis_evaluation.thromubus_type == 1){
              this.predialysis_evaluation.thromubus_type = this.predialysis_evaluation.thromubus_type.toString()
              this.thrombuShow = true
         }
-
+       
         if (this.predialysis_evaluation.id > 0) {
           for (var index in this.assessmentBeforeDislysis) {
             this.assessmentBeforeDislysis[index] = this.predialysis_evaluation[index]
@@ -1693,6 +1882,7 @@
           if (this.predialysis_evaluation['pulse_frequency'] == 0) {
             this.assessmentBeforeDislysis['pulse_frequency'] = ''
           }
+          
         }
       },
       'assessmentBeforeDislysis.weight_before': {

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

@@ -10,13 +10,16 @@
         >
             <el-button style="position: absolute;left: 12%;top: 2%" @click="handlePatientInfo">{{ patient.name }}</el-button>
             <span style="position: absolute;left: 22%;top: 3%">
-              透前体重： --kg
+              透前体重：{{predialysis&&predialysis.weight_before?predialysis.weight_before:"" }} kg
             </span>
             <span style="position: absolute;left: 35%;top: 3%">
-              干体重：--kg
+              干体重：{{predialysis&&predialysis.dry_weight?predialysis.dry_weight:""}}kg
             </span>
+            <!-- <span style="position: absolute;left: 48%;top: 3%">
+              衣物重：{{predialysis&&predialysis.additional_weight?predialysis.additional_weight:""}}kg
+            </span> -->
             <span style="position: absolute;left: 48%;top: 3%">
-              衣物重：--kg
+              上次透后体重：{{last_record&&last_record.weight_after?last_record.weight_after:""}}kg
             </span>
             <div class="warnTxt" v-if="showTxt != ''">{{ showTxt }}</div>
             <el-form
@@ -137,6 +140,14 @@
                         </el-form-item>
                     </el-col>
 
+                    <el-col :span="8"
+                            v-if="isShows('加糖')">
+                        <el-form-item label="加糖：" prop="prescription_water" :rules="isCheckmust('加糖')">
+                            <el-input v-model="dialysisPrescription.chaptalization"
+                            ></el-input>
+                        </el-form-item>
+                    </el-col>
+
                    <el-col :span="8" v-if="isShows('带水上机')">
                         <el-form-item label="带水上机:" prop="water_machine" :rules="isCheckmust('带水上机')">
                            <el-select v-model="dialysisPrescription.water_machine">
@@ -1627,6 +1638,7 @@
           sodium_bicarbonate_flow:"",
           prescription_water:"",
           dialysis_strainer:"",
+          chaptalization:"",
         },
 
         anticoagulant: {
@@ -2427,7 +2439,7 @@ mu
           if (minites < 10) {
             minites = '0' + minites
           }
-          if (this.$store.getters.xt_user.org.id == 10016 || this.$store.getters.xt_user.org.id == 10121 || this.$store.getters.xt_user.org.id == 4 || this.$store.getters.xt_user.org.id == 10013 || this.$store.getters.xt_user.org.id == 10014 ) {
+          if (this.$store.getters.xt_user.org.id == 10016 || this.$store.getters.xt_user.org.id == 10121 || this.$store.getters.xt_user.org.id == 4 || this.$store.getters.xt_user.org.id == 10013 || this.$store.getters.xt_user.org.id == 10014 ||  this.$store.getters.xt_user.org.id == 9970) {
             this.start_time = year + '-' + month + '-' + day + ' ' + hours + ':' + minites
           }else if(this.$store.getters.xt_user.org.id == 10234 || this.$store.getters.xt_user.org.id == 9990 || this.$store.getters.xt_user.org.id==10432){
             if (schedual.schedule_type == 1) {
@@ -2485,6 +2497,14 @@ mu
             } else if (schedual.schedule_type == 3) {
               this.start_time = year + '-' + month + '-' + day + ' ' + '15:00'
             }
+           }else if(this.$store.getters.xt_user.org.id == 10517){
+              if (schedual.schedule_type == 1) {
+              this.start_time = year + '-' + month + '-' + day + ' ' + '7:00'
+            } else if (schedual.schedule_type == 2) {
+              this.start_time = year + '-' + month + '-' + day + ' ' + '11:00'
+            } else if (schedual.schedule_type == 3) {
+              this.start_time = year + '-' + month + '-' + day + ' ' + '15:00'
+            }
            } else {
             if (schedual.schedule_type == 1) {
               this.start_time = year + '-' + month + '-' + day + ' ' + '07:00'
@@ -2703,24 +2723,24 @@ mu
               this.dialysisPrescription.anticoagulant_shouji = '0'
               this.dialysisPrescription.anticoagulant_zongliang = '0'
             }
-            if (this.$store.getters.xt_user.template_info.template_id == 6) {
-              if (this.dialysisPrescription.mode_id == 2) {
-                if (
-                  this.dialysisPrescription.displace_liqui_part == 0 ||
-                  this.dialysisPrescription.displace_liqui_part == -2 ||
-                  this.dialysisPrescription.displace_liqui_value == 0 ||
-                  this.dialysisPrescription.displace_liqui_value == ''
-                  || this.dialysisPrescription.replacement_total == 0 ||
-                  this.dialysisPrescription.replacement_total == '' ||
-                  this.dialysisPrescription.displace_speed == 0 ||
-                  this.dialysisPrescription.displace_speed == ''
-                ) {
-                  this.$message.error('HDF模式下置换液和置换液总量不能为空!')
-                  return
-                }
-              }
-
-            }
+            // if (this.$store.getters.xt_user.template_info.template_id == 6) {
+            //   if (this.dialysisPrescription.mode_id == 2) {
+            //     if (
+            //       this.dialysisPrescription.displace_liqui_part == 0 ||
+            //       this.dialysisPrescription.displace_liqui_part == -2 ||
+            //       this.dialysisPrescription.displace_liqui_value == 0 ||
+            //       this.dialysisPrescription.displace_liqui_value == ''
+            //       || this.dialysisPrescription.replacement_total == 0 ||
+            //       this.dialysisPrescription.replacement_total == '' ||
+            //       this.dialysisPrescription.displace_speed == 0 ||
+            //       this.dialysisPrescription.displace_speed == ''
+            //     ) {
+            //       this.$message.error('HDF模式下置换液和置换液总量不能为空!')
+            //       return
+            //     }
+            //   }
+
+            // }
             if(this.dialysisPrescription.mode_id!=2 && this.dialysisPrescription.mode_id!=5 && this.dialysisPrescription.mode_id!=12){
               this.dialysisPrescription.displace_liqui_part = 0
               this.dialysisPrescription.displace_liqui_value = 0
@@ -3212,35 +3232,35 @@ mu
                 this.dialysisPrescription.anticoagulant_shouji = '0'
                 this.dialysisPrescription.anticoagulant_zongliang = '0'
               }
-              if (this.$store.getters.xt_user.template_info.template_id == 6) {
-                if (this.dialysisPrescription.mode_id == 2) {
-                  if (
-                    this.dialysisPrescription.displace_liqui_part == 0 ||
-                    this.dialysisPrescription.displace_liqui_part == -2 ||
-                    this.dialysisPrescription.displace_liqui_value == 0 ||
-                    this.dialysisPrescription.displace_liqui_value == ''
-                    || this.dialysisPrescription.replacement_total == 0 ||
-                    this.dialysisPrescription.replacement_total == ''||
-                    this.dialysisPrescription.displace_speed == 0 ||
-                    this.dialysisPrescription.displace_speed == ''
-                  ) {
-                    this.$message.error('HDF模式下置换液和置换液总量不能为空!')
-                    return
-                  }
-                }
-                if(this.dialysisPrescription.mode_id!=2 && this.dialysisPrescription.mode_id!=5 && this.dialysisPrescription.mode_id!=12){
-                  this.dialysisPrescription.displace_liqui_part == 0
-                  this.dialysisPrescription.displace_liqui_value == 0
-                  this.dialysisPrescription.replacement_total == 0
-                  this.dialysisPrescription.displace_speed == 0
-                  console.log('this.dialysisPrescription.displace_liqui_part',this.dialysisPrescription.displace_liqui_part);
-                  console.log('this.dialysisPrescription.replacement_total',this.dialysisPrescription.replacement_total);
-                  // this.dialysisPrescription.displace_liqui_part = 0
-                  // this.dialysisPrescription.displace_liqui_value = 0
-                  // this.dialysisPrescription.replacement_total = 0
-                  // this.dialysisPrescription.displace_speed = 0
-                }
-              }
+              // if (this.$store.getters.xt_user.template_info.template_id == 6) {
+              //   if (this.dialysisPrescription.mode_id == 2) {
+              //     if (
+              //       this.dialysisPrescription.displace_liqui_part == 0 ||
+              //       this.dialysisPrescription.displace_liqui_part == -2 ||
+              //       this.dialysisPrescription.displace_liqui_value == 0 ||
+              //       this.dialysisPrescription.displace_liqui_value == ''
+              //       || this.dialysisPrescription.replacement_total == 0 ||
+              //       this.dialysisPrescription.replacement_total == ''||
+              //       this.dialysisPrescription.displace_speed == 0 ||
+              //       this.dialysisPrescription.displace_speed == ''
+              //     ) {
+              //       this.$message.error('HDF模式下置换液和置换液总量不能为空!')
+              //       return
+              //     }
+              //   }
+              //   if(this.dialysisPrescription.mode_id!=2 && this.dialysisPrescription.mode_id!=5 && this.dialysisPrescription.mode_id!=12){
+              //     this.dialysisPrescription.displace_liqui_part == 0
+              //     this.dialysisPrescription.displace_liqui_value == 0
+              //     this.dialysisPrescription.replacement_total == 0
+              //     this.dialysisPrescription.displace_speed == 0
+              //     console.log('this.dialysisPrescription.displace_liqui_part',this.dialysisPrescription.displace_liqui_part);
+              //     console.log('this.dialysisPrescription.replacement_total',this.dialysisPrescription.replacement_total);
+              //     // this.dialysisPrescription.displace_liqui_part = 0
+              //     // this.dialysisPrescription.displace_liqui_value = 0
+              //     // this.dialysisPrescription.replacement_total = 0
+              //     // this.dialysisPrescription.displace_speed = 0
+              //   }
+              // }
 
           this.is_pre = 2
 
@@ -3601,13 +3621,13 @@ mu
                             advice_doctor: this.waitUploadAdvices[0].advice_doctor,
                             advice_type: this.waitUploadAdvices[0].advice_type,
                             parent_id: this.patient_id,
-                            // start_time: uParseTime(this.$route.query.date, '{y}-{m}-{d} {h}{i}'),
-                            start_time:
-                              uParseTime(this.$route.query.date, '{y}-{m}-{d}') +
-                              ' ' +
-                              hour +
-                              ':' +
-                              minute,
+                            start_time: uParseTime(this.$route.query.date, '{y}-{m}-{d} {h}{i}'),
+                            // start_time:
+                            //   uParseTime(this.$route.query.date, '{y}-{m}-{d}') +
+                            //   ' ' +
+                            //   hour +
+                            //   ':' +
+                            //   minute,
 
                             remark: ''
                           }

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

@@ -536,6 +536,7 @@
               ((template_id == 6 &&
                 org_id != 9919 &&
                 org_id != 10191 &&
+                org_id!=10478 &&
                 template_id != 43 &&
                 template_id != 47) ||
                 org_id == 9779 ||
@@ -568,7 +569,7 @@
             width="100"
             v-if="
               isShow('置换量') &&
-              (template_id != 6 || org_id == 9919 || org_id == 10191) &&
+              (template_id != 6 || org_id == 9919 || org_id == 10191 || org_id == 10478) &&
               template_id != 9779 &&
               template_id != 11 &&
               template_id != 20 &&
@@ -2403,6 +2404,8 @@ export default {
         this.form.filter_pressure = monitor.filter_pressure
         ? monitor.filter_pressure
         : "";
+        this.form.replacement_speed = monitor.replacement_speed?monitor.replacement_speed:""
+        this.form.dicarbonate = monitor.dicarbonate?monitor.dicarbonate:""
         // 设置三个下拉框的值，直接调用事件偷懒
         this.symptomTextareaBlur();
         this.disposeTextareaBlur();

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

@@ -59,7 +59,9 @@
           </el-form-item>
         </el-col>
       </el-row>
+      <el-button type="primary" size="small" @click="autoClick" style="margin-top: 5px;margin-bottom: 5px;" v-if="org_id ==9671 || org_id==10440 || org_id == 10495">自动生成</el-button>
       <el-row :gutter="20">
+
         <el-col v-if="isShow('透析小结')">
           <el-form-item
             :prop="isName('透析小结')"
@@ -219,6 +221,42 @@ export default {
         return { id: 0 };
       },
     },
+    prescription:{
+      type:Object,
+      default: () => {
+        return { id: 0 };
+      },
+    },
+    predialysis_evaluation:{
+      type:Object,
+      default: () => {
+        return { id: 0 };
+      },
+    },
+    doctor_advices:{
+      type:Array,
+      default: () => {
+        return { id: 0 };
+      },
+    },
+    dialysis_order:{
+      type:Object,
+      default: () => {
+        return { id: 0 };
+      },
+    },
+    monitors:{
+      type:Array,
+      default: () => {
+        return { id: 0 };
+      },
+    },
+    assessment_after_dislysis:{
+      type:Object,
+      default: () => {
+        return { id: 0 };
+      },
+    }
   },
   data() {
     return {
@@ -254,7 +292,8 @@ export default {
           return time.getTime() > Date.now()
         }
       },
-      remark:""
+      remark:"",
+      org_id:0,
     };
   },
   methods: {
@@ -497,7 +536,223 @@ export default {
              this.infoDialogVisible = false
            }
         })
-     }
+     },
+     autoClick(){
+      var str_one = ""
+      if(this.dialysis_order!=null){
+        if(this.dialysis_order.puncture_nurse_id >0){
+          str_one = "护士穿刺成功!"
+        }
+      }
+    
+      var total =0 
+      if(this.predialysis_evaluation!=null){
+        total = (this.predialysis_evaluation.weight_before - this.predialysis_evaluation.dry_weight).toFixed(1)
+      }
+  
+
+      var monitor_one =[]
+      var monitor_two = []
+      var monitor_three = []
+
+      if(this.monitors!=null && this.monitors.length > 0){
+        var monitor_one =  this.monitors.sort(function (a,b) {
+     	     return b.systolic_bp - a.systolic_bp
+        })
+        var monitor_two =  this.monitors.sort(function (a,b) {
+           return b.diastolic_bp - a.diastolic_bp
+        })
+
+        var monitor_three = this.monitors.sort(function (a,b) {
+              return b.pulse_frequency - a.pulse_frequency
+        })
+
+      }
+  
+
+    
+     
+     
+     var doc_str = ""
+      console.log("医嘱2333333333333",this.predialysis_evaluation)
+      if(this.doctor_advices!=null && this.doctor_advices.length > 0){
+       
+        
+        for(let i=0;i<this.doctor_advices.length;i++){
+          doc_str +=this.doctor_advices[i].advice_name +" "+this.doctor_advices[i].prescribing_number+this.doctor_advices[i].prescribing_number_unit+" "+this.doctor_advices[i].delivery_way
+        }
+      }
+
+      if(this.predialysis_evaluation.blood_access_part_id == -2){
+        this.predialysis_evaluation.blood_access_part_id = ""
+      }
+     
+       var str = " 患者今日来我科行血液透析治疗,血管通路选择:"+this.predialysis_evaluation.blood_access_part_id+ " "+this.QueryOperaById(this.predialysis_evaluation.blood_access_part_opera_id) +",透析模式:"+this.getModeId(this.prescription.mode_id)+
+       ",透前检查:"+this.predialysis_evaluation.internal_fistula +this.predialysis_evaluation.catheter + str_one +" "+ ",透析器:"+this.prescription.dialyzer_perfusion_apparatus + ",抗凝剂:"+this.GetAnticoagulant(this.prescription.anticoagulant) +",总量:"+this.prescription.anticoagulant_zongliang+"iu"+
+      ",透前体重:"+this.predialysis_evaluation.weight_before+"kg"+",间期体重增长:"+total +"kg"+",目标脱水量:"+this.prescription.target_ultrafiltration +"ml" +",血流量:"+this.prescription.blood_flow_volume+"ml/min" + ",透析开始时间:"+this.getTime(this.dialysis_order.start_time) +",透析过程中血压波动,"+"最大收缩压:"+monitor_one[0].systolic_blood_pressure+"mmHg"+",最小收缩压:"+monitor_one[monitor_one.length-1].systolic_blood_pressure
+      +"mmHg" +",最小舒张压:" +monitor_two[0].diastolic_blood_pressure+"mmHg" + ",最大舒张压:" + monitor_two[monitor_two.length-1].diastolic_blood_pressure +"mmHg" + ",最大脉搏:"+monitor_three[0].pulse_frequency+"次/分"+",最小脉搏:"+monitor_three[monitor_three.length-1].pulse_frequency+"次/分"+",透析结束时间:"+this.getTime(this.dialysis_order.end_time) +
+      ",实际治疗时长:"+ this.assessment_after_dislysis.actual_treatment_hour +"时"+this.assessment_after_dislysis.actual_treatment_minute+"分" +",实际超滤量:"+this.assessment_after_dislysis.actual_ultrafiltration+"ml"+",透后体重:"+this.assessment_after_dislysis.weight_after+"kg"+",透析过程顺利，安全下机" + " "
+      +",今日使用药品:"+doc_str +",患者下机后测血压,"+"收缩压:"+this.assessment_after_dislysis.systolic_blood_pressure+"mmHg"+",舒张压:"+this.assessment_after_dislysis.diastolic_blood_pressure+"mmHg"+",脉搏:"+this.assessment_after_dislysis.pulse_frequency +"次/分"
+
+       console.log("str000000000000000000222o2o2",str)
+       this.treatmentSummary.dialysis_summary = ""
+       this.treatmentSummary.dialysis_summary = str
+    },
+    QueryOperaById(val){
+       var blood_access_part_opera = getDataConfig('hemodialysis', 'vascular_access_desc')
+       var name = ""
+       for(let i=0;i<blood_access_part_opera.length;i++){
+         if(val == blood_access_part_opera[i].id){
+            name = blood_access_part_opera[i].name
+         }
+       }
+       return name
+    },
+    getModeId(mode_id){
+      var mode_name = ""
+      if(mode_id == 1){
+         mode_name ="HD"
+      }
+      if(mode_id == 2){
+         mode_name ="HDF"
+      }
+      if(mode_id == 3){
+         mode_name ="HD+HP"
+      }
+      if(mode_id == 4){
+         mode_name ="HP"
+      }
+      if(mode_id == 5){
+         mode_name ="HF"
+      }
+      if(mode_id == 6){
+         mode_name ="SCUF"
+      }
+      if(mode_id == 7){
+         mode_name ="IUF"
+      }
+      if(mode_id == 8){
+         mode_name ="HFHD"
+      }
+      if(mode_id == 9){
+         mode_name ="HFHD+HP"
+      }
+      if(mode_id == 10){
+         mode_name ="PHF"
+      }
+      if(mode_id == 11){
+         mode_name ="HFR"
+      }
+      if(mode_id == 12){
+         mode_name ="HDF+HP"
+      }
+      if(mode_id == 13){
+         mode_name ="CRRT"
+      }
+      if(mode_id == 14){
+         mode_name ="腹水回输"
+      }
+      if(mode_id == 19){
+         mode_name ="IUF+HD"
+      }
+      if(mode_id == 20){
+         mode_name ="UF"
+      }
+      if(mode_id == 21){
+         mode_name ="HD+"
+      }
+      if(mode_id == 22){
+         mode_name ="血浆胆红素吸附+HDF"
+      }
+      if(mode_id == 23){
+         mode_name ="血浆胆红素吸附"
+      }
+      if(mode_id == 24){
+         mode_name ="I-HDF"
+      }
+      if(mode_id == 25){
+         mode_name ="HD高通"
+      }
+      if(mode_id == 26){
+         mode_name ="CVVH"
+      }
+      if(mode_id == 27){
+         mode_name ="CVVHD"
+      }
+      if(mode_id == 28){
+         mode_name ="CVVHDF"
+      }
+      if(mode_id == 29){
+         mode_name ="PE"
+      }
+      if(mode_id == 30){
+         mode_name ="血浆胆红素吸附+HP"
+      }
+      if(mode_id == 31){
+         mode_name ="HPD"
+      }
+      if(mode_id == 32){
+         mode_name ="HDP"
+      }
+      return mode_name
+    },
+    GetAnticoagulant(id){
+      var  anticoagulant_name = ""
+      if(id == 1){
+       anticoagulant_name = "无肝素"
+      }
+      if(id == 2){
+         anticoagulant_name = "普通肝素"
+      }
+      if(id == 3){
+        anticoagulant_name = "低分子肝素"
+      } 
+      if(id == 4){
+        anticoagulant_name = "阿加曲班"
+      } 
+
+      if(id == 5){
+       anticoagulant_name = "枸橼酸钠"
+      }
+      if(id == 6){
+         anticoagulant_name = "低分子肝素钙"
+      }
+      if(id == 7){
+        anticoagulant_name = "低分子肝素钠"
+      } 
+      if(id == 8){
+        anticoagulant_name = "依诺肝素"
+      } 
+
+      if(id == 9){
+        anticoagulant_name = "达肝素"
+      } 
+      if(id == 10){
+        anticoagulant_name = "体外抗凝"
+      } 
+
+      if(id == 11){
+        anticoagulant_name = "那屈肝素"
+      } 
+      if(id == 12){
+        anticoagulant_name = "无抗凝剂"
+      } 
+
+      if(id == 13){
+        anticoagulant_name = "那屈肝素钙"
+      } 
+      if(id == 14){
+        anticoagulant_name = "肝素钙注射液"
+      } 
+      if(id == 15){
+        anticoagulant_name = "甲磺酸萘莫司他"
+      } 
+
+      return anticoagulant_name
+    },
+    getTime (time) {
+     return uParseTime(time, '{y}-{m}-{d} {h}:{i}')
+    },
   },
   watch: {
     isVisibility(val) {},
@@ -545,6 +800,7 @@ export default {
         }
       },
     },
+  
   },
   created() {
     this.education = getDataConfig("education", "education");
@@ -562,6 +818,7 @@ export default {
       this.record_date = uParseTime(date, "{y}-{m}-{d}");
     }
     
+    this.org_id = this.$store.getters.xt_user.template_info.org_id
   },
 };
 </script>

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -23,8 +23,8 @@
           <th v-if=" isShow('置换率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46  || template_id == 48 || template_id == 53  || template_id == 54 || template_id == 56 || org_id == 10432 || org_id == 10445 || org_id == 10410) " width="92px" > 置换率(ml/min) </th>
           <th v-if=" isShow('置换率') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53 && template_id != 54 && template_id != 56 && org_id!=10432 && org_id!=10445 && org_id!=10410" width="92px" > 置换率(L/h)  </th>
           <th v-if=" isShow('置换量') && (template_id == 43)" width="92px"> 置换量(ml/h)  </th>
-          <th v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919 && org_id !=10191) || org_id == 9779 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46 || template_id == 48 || template_id == 53 || template_id == 54 || template_id == 56 || 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 == 10445 )" width="92px"  > 置换量(ml)  </th>
-          <th v-if=" isShow('置换量') && ((template_id != 6 || org_id == 9919 || org_id == 10191) && org_id != 9779 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53 && template_id != 54 && template_id != 56 && 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 != 10445)" width="92px" > 置换量(L) </th>
+          <th v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919 && org_id !=10191 && org_id!=10478) || org_id == 9779 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46 || template_id == 48 || template_id == 53 || template_id == 54 || template_id == 56 || 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 == 10445 )" width="92px"  > 置换量(ml)  </th>
+          <th v-if=" isShow('置换量') && ((template_id != 6 || org_id == 9919 || org_id == 10191 || org_id == 10478) && org_id != 9779 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53 && template_id != 54 && template_id != 56 && 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 != 10445)" width="92px" > 置换量(L) </th>
           <th v-if=" isShow('SpO₂') && template_id != 6 && template_id != 10 && template_id != 11  " width="92px" > SpO₂(%) </th>
           <th v-if="isShow('电导度')" width="92px">电导度(mS/m)</th>
           <th v-if="isShow('置换液流量') && template_id != 27" width="92px">置换液流量(ml/h)</th>

src/xt_pages/dialysis/details/index.vue

@@ -676,6 +676,7 @@
         :lastOrder="lastOrder"
         :dryWeightList="dryWeightList"
         :docList="docList"
+       
       >
       </nav-igation>
 

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -112,7 +112,6 @@
           org_template_info.template_id == 52 ||
           org_template_info.template_id == 53  ||
           org_template_info.template_id == 64)
-          && $store.getters.xt_user.org.id != 0
         "
       >
       <div>
@@ -403,8 +402,7 @@
       </template>
       <template
         v-if="
-          org_template_info.template_id == 27 ||
-          org_template_info.template_id == 0
+          org_template_info.template_id == 27
         "
       >
         <div>
@@ -971,7 +969,7 @@
                                   
           <DialysisPrintOrderSix
             v-bind:childResponse="childResponse"
-            v-if="org_template_info.template_id == 6 && $store.getters.xt_user.org.id!=0"
+            v-if="org_template_info.template_id == 6"
           >
           </DialysisPrintOrderSix>
 
@@ -1260,7 +1258,7 @@
 
           <DialysisPrintOrderSixtyFive
               v-bind:childResponse="childResponse"
-            v-if="org_template_info.template_id == 65 || $store.getters.xt_user.org.id ==0">
+            v-if="org_template_info.template_id == 65">
 
           </DialysisPrintOrderSixtyFive>
         </div>

src/xt_pages/dialysis/template/DialysisPrintOrderFortyOne.vue

@@ -1658,20 +1658,42 @@ export default {
       }
       return ''
     },
+    // getAge: function(val) {
+    //   if (
+    //     this.org_template_info.template_id == 2 ||
+    //     this.org_template_info.template_id == 0
+    //   ) {
+    //     if (val.age == 0) {
+    //       return jsGetAge(val.birth, '-')
+    //     } else {
+    //       return val.age
+    //     }
+    //   } else {
+    //     return jsGetAge(val.birth, '-')
+    //   }
+    // },
     getAge: function(val) {
-      if (
-        this.org_template_info.template_id == 2 ||
-        this.org_template_info.template_id == 0
-      ) {
-        if (val.age == 0) {
-          return jsGetAge(val.birth, '-')
-        } else {
-          return val.age
-        }
-      } else {
-        return jsGetAge(val.birth, '-')
-      }
-    },
+     
+     if (val.id_card_no) {
+       var thisLen = val.id_card_no.length
+
+       var birth = ''
+       if (thisLen == 15) {
+         birth = '19' + val.id_card_no.substr(6, 6)
+       } else {
+         birth = val.id_card_no.substr(6, 8)
+       }
+       var birthtwo =
+         birth.substr(0, 4) +
+         '-' +
+         birth.substr(4, 2) +
+         '-' +
+         birth.substr(6, 2)
+
+       var age = jsGetAge(birthtwo, '-')
+       return age
+     }
+   },
     newAdviceGroupObject: function() {
       return Object.assign(
         {},

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -65,12 +65,18 @@
             </div>
             岁
           </div>
-          <div class="inline_block">
+          <div class="inline_block" v-if="receiverTreatmentAccess.condition!=1">
             门诊：
             <div class="under_line" style="width: 30px; text-align: center">
               <check-box :checked="patientInfo_source_1"></check-box>
             </div>
           </div>
+          <div class="inline_block" v-if="receiverTreatmentAccess.condition==1">
+            住院：
+            <div class="under_line" style="width: 30px; text-align: center">
+              <check-box :checked="receiverTreatmentAccess.condition == 1"></check-box>
+            </div>
+          </div>
           <div class="inline_block">
             病区：
             <div class="under_line" style="width: 50px; text-align: center">
@@ -1447,8 +1453,9 @@
                         <td width="60" v-if="org_id == 9671">血温(°C)</td>
                         <td width="60" v-if="org_id!=9836&&org_id!=9919&&org_id!=9671">透析液温度(°C)</td>
                         <td width="50" v-if="org_id != 10121">
-                          <span v-if="org_id != 0 && org_id !=10469"> 电导度<br />(ms/cm)</span> 
-                          <span v-if="org_id == 0 || org_id ==10469"> 钠浓度<br />(mmol/L)</span> 
+                          <span v-if="org_id != 0 && org_id !=10469 && org_id!=10490"> 电导度<br />(ms/cm)</span> 
+                          <span v-if="org_id ==10469"> 钠浓度<br />(mmol/L)</span> 
+                          <span v-if="org_id == 0 || org_id == 10490"> 置换液的速度<br />(ml/h)</span> 
                         </td>
                         <td width="50" v-if="org_id == 10121">SpO₂<br />(%)</td>
                         <td width="50" v-if="org_id != 3877 && org_id != 10449 && org_id != 0">超滤量<br />(ml)</td>
@@ -1468,6 +1475,7 @@
                         <td width="50" v-if="org_id == 9919">在线尿素监测</td>  
                         <td width="50" v-if="org_id == 9671">在线尿素监测</td>  
                         <td width="50" v-if="org_id == 9538 || org_id == 9919 || org_id== 9671">血容量<br />(L)</td>
+                        <td width="50" v-if="org_id == 10490 || org_id == 0">碳酸氢钠<br />(ml)</td>
                         <td width="200">病情变化及处理</td>
                       </tr>
 
@@ -1542,9 +1550,9 @@
 
 
                         <td v-if="org_id != 9538 &&org_id != 10121">
-                          <span v-if="org_id!=0&&org_id!=10469"> {{ monitor.conductivity ? monitor.conductivity : "" }}</span>
-                          <span v-if="org_id==0||org_id==10469"> {{ monitor.sodium_concentration ? monitor.sodium_concentration : "" }}</span>
-                          
+                          <span v-if="org_id!=0&&org_id!=10469 && org_id!=10490"> {{ monitor.conductivity ? monitor.conductivity : "" }}</span>
+                          <span v-if="org_id==10469"> {{ monitor.sodium_concentration ? monitor.sodium_concentration : "" }}</span>
+                          <span v-if="org_id==0||org_id==10490"> {{ monitor.replacement_speed ? monitor.replacement_speed : "" }}</span>
                         </td>
 
                       
@@ -1584,6 +1592,9 @@
                         <td width="50" v-if="org_id == 9538 || org_id == 9919 || org_id == 9671">
                           {{ monitor.accumulated_blood_volume }}
                         </td>
+                        <td width="50" v-if="org_id ==10490 || org_id == 0">
+                          {{ monitor.dicarbonate }}
+                        </td>
                         <td style="line-height: 16px; padding: 0px">
                           <div
                             style="
@@ -1646,6 +1657,7 @@
                         ></td>
                         <td v-if="org_id == 9919||org_id == 9538 || org_id == 9671"></td>
                         <td v-if="org_id == 9538"></td>
+                        <td v-if="org_id == 10490 || org_id == 0"></td>
                         <td style="line-height: 16px; padding: 0px">
                           <div
                             style="
@@ -1872,12 +1884,18 @@
               </div>
               岁
             </div>
-            <div class="inline_block">
-              门诊：
-              <div class="under_line" style="width: 30px; text-align: center">
-                <check-box :checked="patientInfo_source_1"></check-box>
-              </div>
+            <div class="inline_block" v-if="receiverTreatmentAccess.condition!=1">
+            门诊：
+            <div class="under_line" style="width: 30px; text-align: center">
+              <check-box :checked="patientInfo_source_1"></check-box>
             </div>
+          </div>
+          <div class="inline_block" v-if="receiverTreatmentAccess.condition==1">
+            住院：
+            <div class="under_line" style="width: 30px; text-align: center">
+              <check-box :checked="receiverTreatmentAccess.condition == 1"></check-box>
+            </div>
+          </div>
             <div class="inline_block">
               病区：
               <div class="under_line" style="width: 50px; text-align: center">
@@ -3921,18 +3939,40 @@ export default {
       }
       return "";
     },
-    getAge: function (val) {
-      if (
-        this.org_template_info.template_id == 2 ||
-        this.org_template_info.template_id == 0
-      ) {
-        if (val.age == 0) {
-          return jsGetAge(val.birth, "-");
+    // getAge: function (val) {
+    //   if (
+    //     this.org_template_info.template_id == 2 ||
+    //     this.org_template_info.template_id == 0
+    //   ) {
+    //     if (val.age == 0) {
+    //       return jsGetAge(val.birth, "-");
+    //     } else {
+    //       return val.age;
+    //     }
+    //   } else {
+    //     return this.getoldAge();
+    //   }
+    // },
+    getAge: function(val) {
+     
+      if (val.id_card_no) {
+        var thisLen = val.id_card_no.length
+
+        var birth = ''
+        if (thisLen == 15) {
+          birth = '19' + val.id_card_no.substr(6, 6)
         } else {
-          return val.age;
+          birth = val.id_card_no.substr(6, 8)
         }
-      } else {
-        return this.getoldAge();
+        var birthtwo =
+          birth.substr(0, 4) +
+          '-' +
+          birth.substr(4, 2) +
+          '-' +
+          birth.substr(6, 2)
+
+        var age = jsGetAge(birthtwo, '-')
+        return age
       }
     },
     newAdviceGroupObject: function () {

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyfour.vue

@@ -20,7 +20,9 @@
           <h1 style="text-align: center;">血液透析(滤过)记录表单</h1>
           <div>
             <div>
-              <div style="display:inline-block; ;">病历号：</div>
+              <div style="display:inline-block; ;">病历号：
+                {{patientInfo.record_number?patientInfo.record_number:"" }}
+              </div>
               <div style="display:inline-block;margin-left: 90px;">
                 姓名：{{ patientInfo.name }}
               </div>
@@ -54,7 +56,8 @@
                 <td colspan="3" style="border:1px solid black">
                   <div style="display: inline-block; word-break: break-all;word-wrap: break-word;">
                     上机前病情：
-                    {{ predialysis.symptom_before_dialysis ? predialysis.symptom_before_dialysis : "/" }}
+                    <!-- {{ predialysis.symptom_before_dialysis ? predialysis.symptom_before_dialysis : "/" }} -->
+                    {{ predialysis.befor_symptoms? predialysis.befor_symptoms:"" }}
                   </div>
 
                 </td>
@@ -63,7 +66,7 @@
                 <td colspan="3">
                   <div style="display: inline-block; word-break: break-all;word-wrap: break-word;">
                     疾病诊断：
-                    {{ patientInfo.diagnose }}
+                    {{ getDiagnosis(prescriptionInfo.patient_diagnosis) }}
                   </div>
                 </td>
               </tr>
@@ -74,30 +77,31 @@
                     <span v-else-if="prescription.mode_id == 1">HD</span>
                     <span v-else-if="prescription.mode_id == 2">HDF</span>
                     <span v-else-if="prescription.mode_id == 3">HD+HP</span>
-                    <span v-else-if="prescription.mode_id == 4">HF</span>
-                    <span v-else-if="prescription.mode_id == 5">SCUF</span>
-                    <span v-else-if="prescription.mode_id == 6">IUF</span>
-                    <span v-else-if="prescription.mode_id == 7">HFHD</span>
-                    <span v-else-if="prescription.mode_id == 8">HFHD+HP</span>
-                    <span v-else-if="prescription.mode_id == 9">PHF</span>
-                    <span v-else-if="prescription.mode_id == 10">HFR</span>
-                    <span v-else-if="prescription.mode_id == 11">HDF+HP</span>
-                    <span v-else-if="prescription.mode_id == 12">CRRT</span>
-                    <span v-else-if="prescription.mode_id == 13">腹水回输</span>
-                    <span v-else-if="prescription.mode_id == 14">IUF+HD</span>
-                    <span v-else-if="prescription.mode_id == 15">UF</span>
-                    <span v-else-if="prescription.mode_id == 16">HD+</span>
-                    <span v-else-if="prescription.mode_id == 17">血浆胆红素吸附+HDF</span>
-                    <span v-else-if="prescription.mode_id == 18">血浆胆红素吸附</span>
-                    <span v-else-if="prescription.mode_id == 19">I-HDF</span>
-                    <span v-else-if="prescription.mode_id == 20">HD高通</span>
-                    <span v-else-if="prescription.mode_id == 21">CVVH</span>
-                    <span v-else-if="prescription.mode_id == 22">CVVHD</span>
-                    <span v-else-if="prescription.mode_id == 23">CVVHDF</span>
-                    <span v-else-if="prescription.mode_id == 24">PE</span>
-                    <span v-else-if="prescription.mode_id == 25">血浆胆红素吸附+HP</span>
-                    <span v-else-if="prescription.mode_id == 26">HPD</span>
-                    <span v-else-if="prescription.mode_id == 27">HDP</span>
+                    <span v-else-if="prescription.mode_id == 4">HP</span>
+                    <span v-else-if="prescription.mode_id == 5">HF</span>
+                    <span v-else-if="prescription.mode_id == 6">SCUF</span>
+                    <span v-else-if="prescription.mode_id == 7">IUF</span>
+                    <span v-else-if="prescription.mode_id == 8">HFHD</span>
+                    <span v-else-if="prescription.mode_id == 9">HFHD+HP</span>
+                    <span v-else-if="prescription.mode_id == 10">PHF</span>
+                    <span v-else-if="prescription.mode_id == 11">HFR</span>
+                    <span v-else-if="prescription.mode_id == 12">HDF+HP</span>
+                    <span v-else-if="prescription.mode_id == 13">CRRT</span>
+                  
+                    <span v-else-if="prescription.mode_id == 19">IUF+HD</span>
+                    <span v-else-if="prescription.mode_id == 20">UF</span>
+                    <span v-else-if="prescription.mode_id == 21">HD+</span>
+                    <span v-else-if="prescription.mode_id == 22">血浆胆红素吸附+HDF</span>
+                    <span v-else-if="prescription.mode_id == 23">血浆胆红素吸附</span>
+                    <span v-else-if="prescription.mode_id == 24">I-HDF</span>
+                    <span v-else-if="prescription.mode_id == 25">HD高通</span>
+                    <span v-else-if="prescription.mode_id == 26">CVVH</span>
+                    <span v-else-if="prescription.mode_id == 27">CVVHD</span>
+                    <span v-else-if="prescription.mode_id == 28">CVVHDF</span>
+                    <span v-else-if="prescription.mode_id == 29">PE</span>
+                    <span v-else-if="prescription.mode_id == 30">血浆胆红素吸附+HP</span>
+                    <span v-else-if="prescription.mode_id == 31">HPD</span>
+                    <span v-else-if="prescription.mode_id == 32">HDP</span>
                 </td>
                 <td>
                   <span
@@ -378,7 +382,6 @@
                             }}
                             </span>
                         </td >
-
                         <td style=" ">
                             <span v-if="getTime(monitor.operate_time) != ''">
                                 &nbsp;{{
@@ -444,10 +447,12 @@
 
                         <!-- <td style=" "> {{ getTime(monitor.operate_time, "{h}:{i}") }}</td> -->
                         <td style=" ">
-                          <span style="word-break: break-all;word-wrap: break-word;">
-
-                              {{ monitor.symptom }} &nbsp;{{ monitor.dispose }} &nbsp;{{monitor.result}}
-                          </span>
+                          <!-- <span style="display:inline-block;word-break: break-all;word-wrap: break-word; text-align: left;text-indent:2em;">
+                            {{ monitor.symptom }} &nbsp;{{ monitor.dispose }} &nbsp;{{monitor.result}}
+                          </span> -->
+                          <div style="word-break: break-all;word-wrap: break-word; text-align: left;text-indent:2em;">
+                            {{ monitor.symptom }} {{ monitor.dispose }} {{monitor.result}}
+                          </div>
                         </td>
                         <!-- <td>
                           <span v-if="
@@ -765,7 +770,9 @@ export default {
       adminUser: [],
       bloodAccessParOpera: {},
       lastafterdialysis: {},
-      projects:[]
+      projects:[],
+      prescriptionInfo:{},
+      patientDiagnose:[]
     };
   },
   computed: {},
@@ -886,7 +893,8 @@ export default {
         // this.receiverTreatmentAccess =
         //     response.data.data.receiverTreatmentAccess;
         this.assessmentafter = response.data.data.assessmentAfterDislysis;
-
+        this.prescriptionInfo = response.data.data.prescriptionInfo
+        this.patientDiagnose = response.data.data.patientDiagnose
         // this.sick_condition_arr.forEach((o) => {
         //     if (this.receiverTreatmentAccess.sick_condition == o.id) {
         //     this.sick_condition = o.name;
@@ -986,6 +994,7 @@ export default {
           }
         });
         this.projects = projects;
+
         if (this.doctor_advices.length + this.projects.length <= 6) {
           var nl = 6 - (this.doctor_advices.length + this.projects.length);
           this.print_length = 6;
@@ -1004,20 +1013,22 @@ export default {
         console.log("advices",this.advices)
         console.log("this.projects", this.projects);
 
-        var objProject = {advice_name:"",start_time:"",single_dose:"",single_dose_unit:"",}
+        // var objProject = {advice_name:"",start_time:"",single_dose:"",single_dose_unit:"",}
         if(this.projects!=null && this.projects.length >0){
            for(let i=0;i<this.projects.length;i++){
-              if(this.projects[i].project_id ==  7620){
-                 objProject.advice_name = this.projects[i].project.project_name
-                 objProject.start_time = this.projects[i].start_time
-                 objProject.single_dose = this.projects[i].single_dose
-                 objProject.single_dose_unit = this.projects[i].unit
-                 objProject.execution_time = this.projects[i].execution_time
-                 objProject.execution_staff= this.projects[i].execution_staff
-              }
+             if(this.projects[i].type== 2){
+              this.projects[i].advice_name = this.projects[i].project.project_name
+              this.projects[i].start_time = this.projects[i].start_time
+              this.projects[i].single_dose = this.projects[i].single_dose
+              this.projects[i].single_dose_unit = this.projects[i].unit
+              this.projects[i].execution_time = this.projects[i].execution_time
+              this.projects[i].execution_staff= this.projects[i].execution_staff 
+              this.advices.push(this.projects[i])
+             }
+             
            }
         }
-        this.advices.push(objProject)
+        
 
         var tableAdvice = this.advices;
 
@@ -1098,6 +1109,8 @@ export default {
           this.advices = tableAdvice;
         }
 
+        console.log("advices-----------------",this.advices)
+
  
          
 
@@ -1164,20 +1177,52 @@ export default {
       }
       return ''
     },
+    // getAge: function (val) {
+    //   if (
+    //     this.org_template_info.template_id == 2 ||
+    //     this.org_template_info.template_id == 0
+    //   ) {
+    //     if (val.age == 0) {
+    //       return jsGetAge(val.birth, "-");
+    //     } else {
+    //       return val.age;
+    //     }
+    //   } else {
+    //     return jsGetAge(val.birth, "-");
+    //   }
+    // },
     getAge: function (val) {
-      if (
-        this.org_template_info.template_id == 2 ||
-        this.org_template_info.template_id == 0
-      ) {
-        if (val.age == 0) {
-          return jsGetAge(val.birth, "-");
+      if(val!=undefined){
+        var thisLen = val.id_card_no.length;
+        var birth = "";
+        if (thisLen == 15) {
+          birth = "19" + val.id_card_no.substr(6, 6);
         } else {
-          return val.age;
+          birth = val.id_card_no.substr(6, 8);
         }
-      } else {
-        return jsGetAge(val.birth, "-");
+        var birthtwo =
+          birth.substr(0, 4) +
+          "-" +
+          birth.substr(4, 2) +
+          "-" +
+          birth.substr(6, 2);
+
+        var age = jsGetAge(birthtwo, "-");
+        return age;
       }
+    
     },
+   
+    getDiagnosis(id) {
+      let arr = id.split(',')
+      var name = ''
+      for (let i = 0; i < this.patientDiagnose.length; i++) {
+        if (arr.indexOf(String(this.patientDiagnose[i].id)) > -1) {
+          name += this.patientDiagnose[i].class_name + ' '
+        }
+      }
+      return name
+    }
   },
   created() {
     var bloodAccessParOpera = getDataConfig(

src/xt_pages/dialysis/template/DialysisPrintOrderThirteen.vue

@@ -129,10 +129,19 @@
             </div>
             <div class="inline_block" style="margin-right:30px;">
               透析液配方
-              <div class="inline_block under_line" style="width:150px;text-align: center;">
+              <div class="inline_block under_line" style="width:100px;text-align: center;">
                   {{ prescription.dialysate_formulation_name ? prescription.dialysate_formulation_name : ''}}
               </div>
             </div>
+           
+            <div class="inline_block" style="margin-right:30px;">
+              通路形成时间
+              <div class="inline_block under_line" style="width:100px;text-align: center;">
+                {{getTimeOne(predialysis.pathway_formation_time) }}
+              </div>
+            </div>
+          
+         
         </div>
         <div class="row">
           血管通路
@@ -162,17 +171,42 @@
             <label-box :isChecked="predialysis.blood_access_part_id.indexOf('其他')>-1?true:false" showValue="其他"></label-box>
             &nbsp;
           </div>
+        
         </div>
         <div class="row">
           导管
-          <div class="inline_block under_line" style="width:200px;text-align: left;">
+          <div class="inline_block under_line" style="width:95%;text-align: left;">
             {{ predialysis.catheter ? predialysis.catheter : "" }}
           </div>
+        
+         
+        </div>
+        <div class="row">
           内瘘
-          <div class="inline_block under_line" style="width:200px;text-align: left;">
+          <div class="inline_block under_line" style="width:95%;text-align: left;">
             {{ predialysis.internal_fistula ? predialysis.internal_fistula : "" }}
           </div>
         </div>
+        <div class="row">
+          <!-- 导管评估项目
+          <div class="inline_block under_line" style="width:200px;text-align: left;">
+            {{ predialysis.catheter_evaluation_program ? predialysis.catheter_evaluation_program : "" }}
+          </div>
+          置管部位皮肤
+          <div class="inline_block under_line" style="width:200px;text-align: left;">
+            {{ predialysis.skin_site_catheterization ? predialysis.skin_site_catheterization : "" }}
+          </div>
+          是否通畅
+          <div class="inline_block under_line" style="width:100px;text-align: left;">
+             <span v-if="predialysis.whether_unobstructed ==1">是</span>
+             <span v-if="predialysis.whether_unobstructed ==2">否</span>
+          </div> -->
+          <!-- 留置必要
+          <div class="inline_block under_line" style="width:100px;text-align: left;">
+            <span v-if="predialysis.lien_necessary ==1">是</span>
+            <span v-if="predialysis.lien_necessary ==2">否</span>
+          </div> -->
+        </div>
         <div class="row">
           抗凝药物
           <div class="inline_block under_line" style="width:92%;text-align: left;">
@@ -913,6 +947,17 @@ export default {
       }
       return ''
     },
+
+    getTimeOne(val) {
+        if(val < 0){
+          return ""
+        }
+        if(val == ""){
+        return ""
+        }else {
+        return uParseTime(val, '{y}-{m}-{d}')
+        }
+     },
     printThisPage() {
       var ptime = Math.round(new Date().getTime() / 1000)
       this.print_time = uParseTime(ptime, '{y}-{m}-{d} {h}:{i}')

src/xt_pages/dialysis/template/DialysisPrintOrderTwentySeven.vue

@@ -2276,11 +2276,32 @@ export default {
       }
       return ''
     },
+    // getAge: function(val) {
+    //   if (val.birthday != 0) {
+    //     return jsGetAge(val.birth, '-')
+    //   }
+    //   return ''
+    // },
     getAge: function(val) {
-      if (val.birthday != 0) {
-        return jsGetAge(val.birth, '-')
+      if (val.id_card_no == undefined) {
+        return false
       }
-      return ''
+      var thisLen = val.id_card_no.length
+      var birth = ''
+      if (thisLen == 15) {
+        birth = '19' + val.id_card_no.substr(6, 6)
+      } else {
+        birth = val.id_card_no.substr(6, 8)
+      }
+      var birthtwo =
+        birth.substr(0, 4) +
+        '-' +
+        birth.substr(4, 2) +
+        '-' +
+        birth.substr(6, 2)
+
+      var age = jsGetAge(birthtwo, '-')
+      return age
     },
     checkIdCardNo(val) {
       var thisLen = val.length

src/xt_pages/hospitalStation/chargeDetailManagement.vue

@@ -114,6 +114,13 @@
                 type="primary">上传费用明细
             </el-button>
 
+            <el-button
+              v-if="( this.hisPatientInfo.balance_accounts_type == 2 && this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 0 )"
+              size="small"
+              @click="open(1)"
+              type="primary">上传费用明细
+            </el-button>
+
 
             <el-button
                 v-if="( this.hisPatientInfo.balance_accounts_type != 2  && this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 0)"
@@ -122,6 +129,13 @@
             >撤销明细
             </el-button>
 
+            <el-button
+              v-if="( this.hisPatientInfo.balance_accounts_type == 2  && this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 0)"
+
+              size="small" @click="open(2)" type="primary"
+            >撤销明细
+            </el-button>
+
           </div>
 
         </div>
@@ -833,25 +847,27 @@ export default {
           }).catch(() => {
           })
         } else {
-          settle_accounts_type = 2
-          var that = this
-          this.$confirm('该操作会撤销此次入院后所有处方明细，是否继续操作？', '撤销明细', {
-            confirmButtonText: '确 定',
-            cancelButtonText: '取 消',
-            type: 'warning'
-          }).then(() => {
 
-            let params = {
-              'settle_accounts_type': settle_accounts_type,
-              'patient_id': that.hisPatientInfo.patient_id,
-              'his_patient_id': that.hisPatientInfo.id,
-              'record_time': that.record_date,
-              'order_id': that.order.id,
-              'admin_user_id': that.$store.getters.xt_user.user.id
-            }
-            axios.get('http://127.0.0.1:9532/zh/api/refunddetail', {
-              params: params
-            })
+          if (this.hisPatientInfo.balance_accounts_type != 2) {
+            settle_accounts_type = 2
+            var that = this
+            this.$confirm('该操作会撤销此次入院后所有处方明细，是否继续操作？', '撤销明细', {
+              confirmButtonText: '确 定',
+              cancelButtonText: '取 消',
+              type: 'warning'
+            }).then(() => {
+
+              let params = {
+                'settle_accounts_type': settle_accounts_type,
+                'patient_id': that.hisPatientInfo.patient_id,
+                'his_patient_id': that.hisPatientInfo.id,
+                'record_time': that.record_date,
+                'order_id': that.order.id,
+                'admin_user_id': that.$store.getters.xt_user.user.id
+              }
+              axios.get('http://127.0.0.1:9532/zh/api/refunddetail', {
+                params: params
+              })
                 .then(function(response) {
                   if (response.data.state == 0) {
                     that.$message.error(response.data.msg)
@@ -878,8 +894,45 @@ export default {
                 .catch(function(error) {
                 })
 
-          }).catch(() => {
-          })
+            }).catch(() => {
+            })
+
+          }else{
+            settle_accounts_type = 2
+            var that = this
+            this.$confirm('该操作会撤销此次入院后所有处方明细，是否继续操作？', '撤销明细', {
+              confirmButtonText: '确 定',
+              cancelButtonText: '取 消',
+              type: 'warning'
+            }).then(() => {
+              let params = {
+                'settle_accounts_type': settle_accounts_type,
+                'patient_id': that.hisPatientInfo.patient_id,
+                'his_patient_id': that.hisPatientInfo.id,
+                'record_time': that.record_date,
+                'admin_user_id': that.$store.getters.xt_user.user.id
+              }
+              refundDetail(params).then(response => {
+                if (response.data.state == 0) {
+                  this.loading = false
+                  this.$message.error(response.data.msg)
+                  return false
+                } else {
+                  that.$message.success('撤销明细成功')
+                  that.radio = 1
+                  that.getPatientList()
+                }
+              })
+
+
+
+            }).catch(() => {
+            })
+
+
+          }
+
+
 
         }
 

src/xt_pages/hospitalStation/components/deskPrescription.vue

@@ -2303,6 +2303,7 @@ export default {
                 record_date: this.record_date,
                 his_patient_id: this.hisPatientInfo.id,
                 reg_type: this.register_type,
+                patient_diagnose:""
               }
 
               for (let i = 0; i < this.prescriptions.length; i++) {
@@ -2725,7 +2726,8 @@ export default {
                 record_date: this.end_time,
                 his_patient_id: this.hisPatientInfo.id,
                 reg_type: this.register_type,
-                p_type: 1
+                p_type: 1,
+                patient_diagnose:""
               }
 
               var month_prescriptions = this.deepClone(this.month_prescriptions)

src/xt_pages/hospitalStation/components/dialysisIndex.vue

@@ -63,6 +63,7 @@
           :stockType="stockType"
           :mode_id="mode_id"
           :is_advice_open="is_advice_open"
+          :record_date="date"
         >
         </nav-igation>
 

src/xt_pages/management/components/UserForm.vue

@@ -979,7 +979,14 @@
                 </td>
 
                 <td style="text-align:center;font-size:15px;height:30px">
-                  {{ item.user_name }}
+                  <!-- {{ item.user_name }} -->
+
+                  <span v-if="setAdminUserES(item.admin_user_id?item.admin_user_id:item.admin_user_id) == ''">
+                     {{ item.user_name }}
+                  </span>
+                  <span v-else>
+                      <img style="height:30px;" :src="setAdminUserES(item.admin_user_id?item.admin_user_id:item.admin_user_id)" alt="" srcset="">
+                  </span>
                 </td>
               </tr>
             </table>
@@ -1202,6 +1209,8 @@ export default {
       four: true,
       showone: false,
       org_id:0,
+      operators: [],
+      operatorMaps:{},
     };
   },
   methods: {
@@ -1568,6 +1577,17 @@ export default {
         if (response.data.state === 1) {
           var approle = response.data.data.approle;
           this.autograph = approle;
+          this.operators =  response.data.data.operators
+          if (this.operators.length > 0) {
+              var operatorsLen = this.operators.length;
+              for (var index = 0; index < operatorsLen; index++) {
+                this.$set(
+                  this.operatorMaps,
+                  this.operators[index].id,
+                  this.operators[index]
+                );
+              }
+            }
         }
       });
     },
@@ -2596,6 +2616,19 @@ export default {
       formatJson(filterVal, jsonData) {
         return jsonData.map(v => filterVal.map(j => v[j]));
       },
+      setAdminUserES(id) {
+           
+           if (id === 0) {
+           return ''
+           }
+           var user_name = ""
+           for(let i=0;i<this.operators.length;i++){
+              if(id == this.operators[i].admin_user_id){
+                 user_name = this.operators[i].url
+              }
+           }
+           return user_name
+       },
     },
   created() {
     this.getAllSubregion();

src/xt_pages/management/components/WaterForm.vue

@@ -152,7 +152,7 @@
          <el-row>
             <el-col :span="8">
                 <el-form-item label="精密过滤器（MPa):"  class="st">
-                    <el-input  v-model.number="form.ultrafilter"  style="width:100px" oninput="value=value.replace(/[^\d^\.]/g, '')"></el-input>
+                    <el-input  v-model="form.ultrafilter"  style="width:100px"></el-input>
                 </el-form-item>
             </el-col>
          </el-row>
@@ -164,9 +164,7 @@
          <el-row>
             <el-col :span="8">
                 <el-form-item label="硬度监测(mg/l):"  class="st">
-                    <el-input  v-model="form.hardness_monitoring" style="width:100px"
-                    oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')"
-                     ></el-input>
+                    <el-input  v-model="form.hardness_monitoring" style="width:100px"></el-input>
                 </el-form-item>
             </el-col>
             <el-col :span="8">

src/xt_pages/management/components/WaterFormList.vue

@@ -152,7 +152,7 @@
           <el-table-column label="水质监测" align="center" min-width="110px">
             <el-table-column label="硬度" align="center" min-width="110px">
               <template slot-scope="scope">
-                {{ scope.row.hardness_monitoring?scope.row.hardness_monitoring:"" }}
+                {{ scope.row.hardness_monitoring?scope.row.hardness_monitoring:0 }}
               </template>
             </el-table-column>
             <el-table-column label="总氯" align="center" min-width="110px">
@@ -196,6 +196,7 @@
             <el-table-column label="记录人" align="center" min-width="110px">
               <template slot-scope="scope">
                  {{ getDocName(scope.row.admin_user_id) }}
+                
               </template>
             </el-table-column>
 
@@ -397,7 +398,7 @@
          <el-row>
             <el-col :span="8">
                 <el-form-item label="精密过滤器（MPa):"  class="st">
-                    <el-input  v-model="form.ultrafilter" style="width:100px" type="number"></el-input>
+                    <el-input  v-model="form.ultrafilter" style="width:100px"></el-input>
                 </el-form-item>
             </el-col>
          </el-row>
@@ -735,7 +736,7 @@
                 <td
                   style="text-align:center;width:60px;font-size:15px"
                 >
-                {{ item.hardness_monitoring }}
+                {{ item.hardness_monitoring?item.hardness_monitoring:0 }}
                 </td>
                 <td
                   style="text-align:center;width:60px;font-size:15px"
@@ -776,7 +777,14 @@
                 </td>
 
                 <td style="text-align:center;width:70px;font-size:15px">
-                  {{ getDocName(item.admin_user_id) }}
+                  <!-- {{ getDocName(item.admin_user_id) }} -->
+
+                  <span v-if="setAdminUserES(item.admin_user_id?item.admin_user_id:item.admin_user_id) == ''">
+                     {{getDocName(item.admin_user_id)}}
+                 </span>
+                  <span v-else>
+                      <img style="height:30px;" :src="setAdminUserES(item.admin_user_id?item.admin_user_id:item.admin_user_id)" alt="" srcset="">
+                  </span>
                 </td>
 
 
@@ -878,6 +886,8 @@
            nurseList:[],
            selectCulture: [],
            hiddenShow:false,
+           operators: [],
+           operatorMaps:{},
         }
       },
       methods:{
@@ -905,7 +915,17 @@
                var total = response.data.data.total
                this.total = total
                this.adminRole = response.data.data.adminRole
-
+               this.operators = response.data.data.operators
+               if (this.operators.length > 0) {
+                var operatorsLen = this.operators.length
+                for (var index = 0; index < operatorsLen; index++) {
+                this.$set(
+                    this.operatorMaps,
+                    this.operators[index].id,
+                    this.operators[index]
+                )
+               }
+              }
 
              }
           })
@@ -1047,7 +1067,7 @@
             this.form.snd_tank = detail.snd_tank?detail.snd_tank:""
             this.form.resin_tank = detail.resin_tank?detail.resin_tank:""
             this.form.ultrafilter = detail.ultrafilter?detail.ultrafilter:""
-            this.form.hardness_monitoring = detail.hardness_monitoring?detail.hardness_monitoring:""
+            this.form.hardness_monitoring = detail.hardness_monitoring?detail.hardness_monitoring:0
             this.form.total_chlorine_detection= detail.total_chlorine_detection?detail.total_chlorine_detection:""
             this.form.ph_detection = detail.ph_detection?detail.ph_detection:""
             this.form.concentration_of_peroxyacetic_acid = detail.concentration_of_peroxyacetic_acid?detail.concentration_of_peroxyacetic_acid:""
@@ -1336,9 +1356,22 @@
         formatJson(filterVal, jsonData) {
           return jsonData.map(v => filterVal.map(j => v[j]));
         },
+        setAdminUserES(id) {
+           
+           if (id === 0) {
+           return ''
+           }
+           var user_name = ""
+           for(let i=0;i<this.operators.length;i++){
+              if(id == this.operators[i].admin_user_id){
+                 user_name = this.operators[i].url
+              }
+           }
+         
+          return user_name
+       },
       },
       created(){
-        console.log("list+++++++++++++++++++++++")
         this.getlist()
       }
     }

src/xt_pages/management/index.vue

@@ -30,6 +30,15 @@
           @click="seahcerMacherInfo()"
           >搜索</el-button
         >
+
+        <!-- <el-button
+          class="filter-item"
+          type="primary"
+          icon="el-icon-search"
+          size="small"
+          @click="Auto()"
+          >自动生成</el-button
+        > -->
       </div>
 
       <div class="cell clearfix">
@@ -169,7 +178,7 @@
 
 <script>
 import BreadCrumb from "../components/bread-crumb";
-import { getAllMachineInfo, getAllSubregion,getUserMachTotalCount,deleteManageMent } from "@/api/manage";
+import { getAllMachineInfo, getAllSubregion,getUserMachTotalCount,deleteManageMent,getInformationManaList } from "@/api/manage";
 import ManageForm from "./components/ManageForm";
 
 export default {
@@ -397,6 +406,16 @@ export default {
           })
         }
       
+    },
+
+    Auto(){
+       
+      getInformationManaList().then(response=>{
+        if(response.data.state == 1){
+          var list = response.data.data.list
+          this.$message.success("保存成功!")
+        }
+      })
     }
   },
   created() {

src/xt_pages/outpatientCharges/components/chargeDialog.vue

@@ -291,13 +291,13 @@
           return
         }
         console.log("val",val)
-        if (parseFloat(this.form.tmp_decimal) > parseFloat(this.form.private_price)){
-          // alert("押金不得大于自费金额")
-          this.$message.error("押金不得大于自费金额");
-          this.form.tmp_decimal = ""
-          this.form.pay_price = this.tmp_pay
-          return
-        }
+        // if (parseFloat(this.form.tmp_decimal) > parseFloat(this.form.private_price)){
+        //   // alert("押金不得大于自费金额")
+        //   this.$message.error("押金不得大于自费金额");
+        //   this.form.tmp_decimal = ""
+        //   this.form.pay_price = this.tmp_pay
+        //   return
+        // }
         // this.form.private_price = parseFloat(this.form.tmp_decimal) + parseFloat(this.form.pay_price)
 
         this.form.pay_price = ((parseFloat(this.form.private_price)*10000 - parseFloat(this.form.tmp_decimal)*10000)/10000).toFixed(2)
@@ -314,12 +314,12 @@
         }else {
           //储存临时押金
           this.tmp_pay = this.form.pay_price
-          if (parseFloat(this.form.tmp_decimal) > parseFloat(this.form.private_price)){
-            this.form.tmp_decimal = 0
-                // alert("押金不得大于自费金额")
-            this.$message.error("押金不得大于自费金额");
-            return
-          }
+          // if (parseFloat(this.form.tmp_decimal) > parseFloat(this.form.private_price)){
+          //   this.form.tmp_decimal = 0
+          //       // alert("押金不得大于自费金额")
+          //   // this.$message.error("押金不得大于自费金额");
+          //   return
+          // }
           // this.form.private_price = parseFloat(this.form.tmp_decimal) + parseFloat(this.form.pay_price)
           this.tmp_pay = this.form.pay_price
           this.form.pay_price = ((parseFloat(this.form.private_price)*10000 - parseFloat(this.form.tmp_decimal)*10000)/10000).toFixed(2)

src/xt_pages/outpatientCharges/components/registerDialog.vue

@@ -634,7 +634,7 @@
           'certificates':this.form.certificates,
         }
 
-        if ((this.$store.getters.xt_user.org_id == 10387 && this.form.id_card_type ==  4) || (this.$store.getters.xt_user.org_id == 4 && this.form.id_card_type ==  4) || (this.$store.getters.xt_user.org_id == 10318 && this.form.id_card_type ==  4) ){
+        if ((this.$store.getters.xt_user.org_id == 10387 && this.form.id_card_type ==  4) || (this.$store.getters.xt_user.org_id == 4 && this.form.id_card_type ==  4)) {
           try {
             //检测当前浏览器是否支持websocket模式
             window.WebSocket = window.WebSocket || window.MozWebSocket;
@@ -712,7 +712,6 @@
                       that.form.phone = patient.phone
                       that.form.id_card = patient.id_card_no
                       that.form.social_type = parseInt(response.data.data.insutype)
-
                     }
                     that.$message({ message: '读卡成功', type: 'success' })
                   }

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -3658,7 +3658,7 @@ export default {
           "admin_user_id":this.$store.getters.xt_user.user.id,
           'his_patient_id': this.hisPatientInfo.id,
         }
-        if ((this.$store.getters.xt_user.org_id == 10387) || (this.$store.getters.xt_user.org_id == 10318)){
+        if ((this.$store.getters.xt_user.org_id == 10387)){
           try {
             //检测当前浏览器是否支持websocket模式
             window.WebSocket = window.WebSocket || window.MozWebSocket;
@@ -3671,9 +3671,11 @@ export default {
             this.ws.onopen = function(event){
               if (that.$store.getters.xt_user.org_id == 10387){
                 that.ws.send("{\"url\":\"http://10.93.33.243:20001/localcfc/api/hsecfc/localQrCodeQuery\",\"indata\":{\"data\":{\"businessType\":\"01301\",\"deviceType\":\"\",\"officeId\":\"32760\",\"officeName\":\"肾内科\",\"operatorId\":\"admin\",\"operatorName\":\"罗佳菊\",\"orgId\":\"H43082200408\"},\"orgId\":\"H43082200408\",\"transType\":\"ec.query\"}}");
-              }else if(that.$store.getters.xt_user.org_id == 10318){
-                that.ws.send("{\"url\":\"http://igb.hsa.gdgov.cn/prd_nation_eccode/prd_eccode/localcfc/api/hsecfc/localQrCodeQuery\",\"indata\":{\"data\":{\"businessType\":\"01301\",\"deviceType\":\"\",\"officeId\":\"32760\",\"officeName\":\"肾内科\",\"operatorId\":\"admin\",\"operatorName\":\"邹刘阳\",\"orgId\":\"H44011701749\"},\"orgId\":\"H44011701749\",\"transType\":\"ec.query\"}}");
-              }else if(that.$store.getters.xt_user.org_id == 4){
+              }
+              // else if(that.$store.getters.xt_user.org_id == 10318){
+              //   that.ws.send("{\"url\":\"http://igb.hsa.gdgov.cn/prd_nation_eccode/prd_eccode/localcfc/api/hsecfc/localQrCodeQuery\",\"indata\":{\"data\":{\"businessType\":\"01301\",\"deviceType\":\"\",\"officeId\":\"32760\",\"officeName\":\"肾内科\",\"operatorId\":\"admin\",\"operatorName\":\"邹刘阳\",\"orgId\":\"H44011701749\"},\"orgId\":\"H44011701749\",\"transType\":\"ec.query\"}}");
+              // }
+              else if(that.$store.getters.xt_user.org_id == 4){
                 that.ws.send("{\"url\":\"http://igb.hsa.gdgov.cn/prd_nation_eccode/prd_eccode/localcfc/api/hsecfc/localQrCodeQuery\",\"indata\":{\"data\":{\"businessType\":\"01301\",\"deviceType\":\"\",\"officeId\":\"32760\",\"officeName\":\"肾内科\",\"operatorId\":\"admin\",\"operatorName\":\"邹刘阳\",\"orgId\":\"H44011701749\"},\"orgId\":\"H44011701749\",\"transType\":\"ec.query\"}}");
               }
             };

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -60,6 +60,9 @@
                   </el-form-item>
 
 
+                
+
+
                   <el-form-item label="过敏病史: " prop="name" label-position="right">
                       <el-autocomplete
                               style="width:100%;"
@@ -69,6 +72,19 @@
                               placeholder="请输入内容"
                       ></el-autocomplete>
                   </el-form-item>
+
+
+                  <el-form-item label="疾病诊断:" prop="name" label-position="right" style="width:66.6%;" v-if="org_id==3877 || org_id ==10485 || org_id == 0 ">
+
+                    <el-select style="width:100%;" v-model="patient_diagnose" placeholder="" multiple filterable>
+                        <el-option
+                                v-for="(item,index) in patient_diagnoses"
+                                :key="index"
+                                :label="item.class_name"
+                                :value="item.id">
+                        </el-option>
+                    </el-select>
+                  </el-form-item>
               </el-form>
               <div class="tabsBox">
 
@@ -520,7 +536,8 @@ export default {
       default: function() {
         return []
       }
-    }
+    },
+    patient_diagnoses:Array,
   },
   components: {
     DayPrescriptionTable,
@@ -644,6 +661,8 @@ export default {
       sick: [],
       diagnoses: [],
       diagnose: [],
+      patient_diagnose:[],
+      patient_diagnose_list:[],
       state1: '',
       curTotal: 0,
       prescription_id: 0,
@@ -665,7 +684,8 @@ export default {
           }
         }
       },
-      hisList: []
+      hisList: [],
+      patient_diagnose:[]
 
     }
   },
@@ -1893,13 +1913,14 @@ export default {
       this.teamList = []
 
     },
-    setData(data, info, admin_info, doctors, department, hisPatientInfo, month_data, last_info,sick,diagnoses) {
+    setData(data, info, admin_info, doctors, department, hisPatientInfo, month_data, last_info,sick,diagnoses,patient_diagnose) {
       console.log("诊断23333333333333",this.diagnose)
       this.sick = sick
       this.diagnoses = diagnoses
       this.department = department
       this.curMonthPrescriptions = {}
       this.curPrescriptions = {}
+      this.patient_diagnose = patient_diagnose
       // this.$refs.tabProjectTeam.clearSelection()
 
       for (let i = 0; i < doctors.length; i++) {
@@ -2056,6 +2077,39 @@ export default {
         }
 
       }
+      
+      // console.log("info233333333333333333333",info.id)
+      // console.log("LAST_INFO2323232323WO",last_info.patient_diagnosis)
+      this.patient_diagnose = []
+      if(info.id == 0){
+        if (last_info.patient_diagnosis.length == 0) {
+          this.patient_diagnose = []
+        } else {
+          for (let i = 0; i < last_info.patient_diagnosis.split(",").length; i++) {
+            if(last_info.patient_diagnosis.split(',')[i].length > 0) {
+              this.patient_diagnose.push(parseInt(last_info.patient_diagnosis.split(',')[i]))
+            }
+          }
+        }
+      }
+
+      if(info.id > 0){
+       
+        if (info.patient_diagnosis.length == 0) {
+          this.patient_diagnose = []
+        } else {
+          this.patient_diagnose = []
+          for (let i = 0; i < info.patient_diagnosis.split(",").length; i++) {
+           
+            if(info.patient_diagnosis.split(',')[i].length > 0) {
+              this.patient_diagnose.push(parseInt(info.patient_diagnosis.split(',')[i]))
+            }
+
+          }
+
+        }
+        console.log("hhahahahah",this.patient_diagnose)
+      }
 
       this.state1 = info.sick_type
       if (this.state1 == 0 || this.state1 == '') {
@@ -2316,6 +2370,10 @@ export default {
 
 
             this.$emit('editKeepLoad', true)
+            var str = ""
+            if(this.patient_diagnoses!=""){
+              str =this.patient_diagnose.join(',')
+            }
             let params = {
               p_type: 2,
               patient_id: this.patientInfo.id,
@@ -2327,8 +2385,9 @@ export default {
               record_date: this.record_date,
               his_patient_id: this.hisPatientInfo.id,
               reg_type: this.register_type,
+              patient_diagnose:str
             }
-
+            
             for (let i = 0; i < this.prescriptions.length; i++) {
               if (this.prescriptions[i].advices.length > 0 && this.prescriptions[i].project.length == 0) {
                 this.prescriptions[i]['type'] = 1
@@ -2656,6 +2715,7 @@ export default {
 
                 if(project_arr.length > 0){
                     let objInfo = {};
+
                     project_arr.forEach((item, index) => {
                     let { project_id } = item.project_id;
                     if (!objInfo[project_id]) {
@@ -2737,7 +2797,11 @@ export default {
             this.$message.error('科室不能为空')
             return
           }
-
+          
+          var str = ""
+          if(patient_diagnose!=""){
+             str = this.patient_diagnose.join(',')
+          }
           if (index == 1) {
             let params = {
               patient_id: this.patientInfo.id,
@@ -2749,7 +2813,8 @@ export default {
               record_date: this.end_time,
               his_patient_id: this.hisPatientInfo.id,
               reg_type: this.register_type,
-              p_type: 2
+              p_type: 2,
+              patient_diagnose:str
             }
 
             var month_prescriptions = this.deepClone(this.month_prescriptions)

src/xt_pages/outpatientDoctorStation/components/dialysisIndex.vue

@@ -63,6 +63,7 @@
           :lastAssessment="lastAssessment"
           :stockType="stockType"
           :mode_id="mode_id"
+          :record_date="date"
         >
         </nav-igation>
 

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -136,7 +136,6 @@
 
             <!-- <el-button size="small" ref="button_four"  @click="open(5)" type="primary" :disabled='prescriptions && prescriptions[0].advices && prescriptions[0].project ? prescriptions[0].advices.length == 0 && prescriptions[0].project.length == 0 : false'>存模板</el-button> -->
           </div>
-          
           <div class="mainCell fixedCell" style="float:right" v-if="titleType == '电子病历'">
             <el-button size="small" @click="opentwo(1)" type="primary">保存</el-button>
             <el-button size="small" @click="opentwo(2)" type="primary">打印</el-button>
@@ -166,7 +165,7 @@
                            :org_id="org_id"
                            ref="prescriptions" :prescriptions="prescriptions" :patientInfo="patientInfo"
                            v-on:getSunziValue = "getSunziValue"
-                           :hisPatientInfo="hisPatientInfo" @event1="changetwo($event)" @editKeepLoad="editKeepLoad"
+                           :hisPatientInfo="hisPatientInfo" :patient_diagnoses="patient_diagnoses" @event1="changetwo($event)" @editKeepLoad="editKeepLoad"
                            v-if="titleType == '电子处方'" style="flex:1;"></desk-prescription>
 
 
@@ -608,6 +607,7 @@ export default {
       printList:[],
       printDate:'',
       anticoagulants_confit:null,
+      patient_diagnoses:[]
     }
   },
 
@@ -1442,6 +1442,15 @@ export default {
             this.diagnoses = []
           }
 
+          var patientDiagnose = response.data.data.patientDiagnose
+
+          if(patientDiagnose!=null && patientDiagnose.length >0){
+            this.patient_diagnoses = []
+            this.patient_diagnoses = patientDiagnose.sort(this.compare('sort'))
+          }else{
+            this.patient_diagnoses = []
+          }
+
           this.additions = response.data.data.additions
 
         }
@@ -1460,8 +1469,8 @@ export default {
         'record_date': this.record_date,
         'type': this.radio,
         'sch_type': this.schedule_type
-
       }
+      
       this.un_cure_data = []
       this.cure_data = []
       this.all_data = []
@@ -1756,8 +1765,7 @@ export default {
               // }
 
               var preTime = nowTime
-
-              if (this.$store.getters.xt_user.org.id != 9919){
+              if ( this.org_id != 0 && this.$store.getters.xt_user.org.id != 9919 && this.$store.getters.xt_user.org.id != 10485){
                 if (prescription.pre_time == 0) {
                   if (this.schedule.schedule_type == 1) {
                     preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
@@ -1770,6 +1778,12 @@ export default {
                 } else {
                   preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
                 }
+              }else{
+                if (prescription.pre_time == 0) {
+                  preTime = nowTime
+                } else {
+                  preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
+                }
               }
               console.log("is_medicine")
               console.log(is_medicine)
@@ -1908,7 +1922,7 @@ export default {
                   tempProject.push(obj)
                 }
                 var preTime = nowTime
-                if (this.$store.getters.xt_user.org.id != 9919) {
+                if (this.org_id != 0 && this.$store.getters.xt_user.org.id != 9919 && this.$store.getters.xt_user.org.id != 10485) {
                   if (this.schedule.schedule_type == 1) {
                      preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
                   } else if (this.schedule.schedule_type == 2) {
@@ -1962,7 +1976,7 @@ export default {
             }
           }
           console.log('~~~~~00000222222',this.prescriptions)
-          this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info, this.sick, this.diagnosis)
+          this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info, this.sick, this.diagnosis,this.patient_diagnoses)
         }
       })
 
@@ -2033,7 +2047,7 @@ export default {
                 // this.setMonthPrescription(month_prescriptions)
 
                 this.patientInfo = response.data.data.xt_info
-                console.log("patientInfo++++++++++++++++",this.patientInfo)
+
                 this.hisPatientInfo = response.data.data.his_info
                 this.case_history = response.data.data.case_history
 
@@ -2218,7 +2232,7 @@ export default {
                     // }
 
                     var preTime = nowTime
-                    if (this.$store.getters.xt_user.org.id != 9919) {
+                    if (this.org_id != 0 && this.$store.getters.xt_user.org.id != 9919 && this.$store.getters.xt_user.org.id != 10485 ) {
                       if (prescription.pre_time == 0) {
                         if (this.schedule.schedule_type == 1) {
                           preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
@@ -2230,6 +2244,12 @@ export default {
                       } else {
                         preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
                       }
+                    }else{
+                      if (prescription.pre_time == 0) {
+                        preTime = nowTime
+                      } else {
+                        preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
+                      }
                     }
 
 
@@ -2370,7 +2390,7 @@ export default {
 
                       var preTime = nowTime
                       // var preTime = ''
-                      if(this.org_id != 9919 ) {
+                      if(this.org_id != 0 && this.org_id !=  9919 && this.org_id !=  10485) {
                         if (this.schedule.schedule_type == 1) {
                           preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
                         } else if (this.schedule.schedule_type == 2) {
@@ -2543,7 +2563,7 @@ export default {
                     //   }
                   }
                 }
-                this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info, this.sick, this.diagnosis)
+                this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info, this.sick, this.diagnosis,this.patient_diagnoses)
                 this.$refs.child.watchSign = 0
               }
             })
@@ -3066,7 +3086,7 @@ export default {
                     // }
                   }
                 }
-                this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info, this.sick, this.diagnosis)
+                this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info, this.sick, this.diagnosis,this.patient_diagnoses)
                 this.$refs.child.watchSign = 0
               }
             })
@@ -3580,7 +3600,7 @@ export default {
                   // }
                 }
               }
-              this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info, this.sick, this.diagnosis)
+              this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info, this.sick, this.diagnosis,this.patient_diagnoses)
               this.$refs.child.watchSign = 0
             }
           })
@@ -3876,7 +3896,7 @@ export default {
 
                     var preTime = nowTime
 
-                    if(this.org_id != 9919 ) {
+                    if(this.org_id != 0 && this.org_id != 9919 && this.org_id  != 10485 ) {
                       if (prescription.pre_time == 0) {
                         if (this.schedule.schedule_type == 1) {
                           preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
@@ -3888,6 +3908,12 @@ export default {
                       } else {
                         preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
                       }
+                    }else{
+                      if (prescription.pre_time == 0) {
+                        preTime = nowTime
+                      } else {
+                        preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
+                      }
                     }
 
                     let index = i + 1
@@ -4024,7 +4050,7 @@ export default {
 
                       // var preTime = nowTime
                       var preTime = nowTime
-                      if(this.org_id != 9919 ) {
+                      if( this.org_id != 0 && this.org_id != 9919 &&  this.org_id != 10485) {
                         if (this.schedule.schedule_type == 1) {
                           preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
                         } else if (this.schedule.schedule_type == 2) {
@@ -4197,7 +4223,7 @@ export default {
                     // }
                   }
                 }
-                this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info, this.sick, this.diagnosis)
+                this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info, this.sick, this.diagnosis,this.patient_diagnoses)
               }
             })
 
@@ -4507,7 +4533,7 @@ export default {
 
                     var preTime = nowTime
 
-                    if(this.org_id != 9919) {
+                    if(this.org_id != 0 && this.org_id != 9919 && this.org_id != 10485) {
                       if (prescription.pre_time == 0) {
                         // preTime = nowTime
                         if (this.schedule.schedule_type == 1) {
@@ -4520,6 +4546,13 @@ export default {
                       } else {
                         preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
                       }
+                    }else{
+                      if (prescription.pre_time == 0) {
+                        preTime = nowTime
+
+                      } else {
+                        preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
+                      }
                     }
 
                     let index = i + 1
@@ -4657,7 +4690,7 @@ export default {
 
                       var preTime = nowTime
                       // var preTime = ''
-                      if(this.org_id != 9919 ) {
+                      if(this.org_id != 0 && this.org_id != 9919  && this.org_id != 10485) {
                         if (this.schedule.schedule_type == 1) {
                           preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
                         } else if (this.schedule.schedule_type == 2) {
@@ -4713,7 +4746,7 @@ export default {
 
                   }
                 }
-                this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info, this.sick, this.diagnosis)
+                this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info, this.sick, this.diagnosis,this.patient_diagnoses)
               }
             })
           } else {

src/xt_pages/qcd/basicInformationAnalysis.vue

@@ -762,6 +762,7 @@ export default {
       }
     },
     selectLapseTo(state) {
+      console.log("statt---23-322323",state)
       this.stateType = state;
       this.listQuery.state = state;
       //获取本月当前机构的透析模式
@@ -1338,23 +1339,23 @@ export default {
     },
     selectSource(source) {
       this.sourceType = source
-      this.getDialysisModeType(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
-      this.getTotalLapseCount(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
-      this.getTotalSexCount(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
-      this.getTotalInfectiousCount(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
-      this.getTotalAgeCount(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
-      this.getTotalDialysisCount(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
+      this.getDialysisModeType(this.listQuery.start_time,this.list.listQuery.end_time,this.lapsetoType,this.sourceType)
+      this.getTotalLapseCount(this.listQuery.start_time,this.list.listQuery.end_time,this.lapsetoType,this.sourceType)
+      this.getTotalSexCount(this.listQuery.start_time,this.list.listQuery.end_time,this.lapsetoType,this.sourceType)
+      this.getTotalInfectiousCount(this.listQuery.start_time,this.list.listQuery.end_time,this.lapsetoType,this.sourceType)
+      this.getTotalAgeCount(this.listQuery.start_time,this.list.listQuery.end_time,this.lapsetoType,this.sourceType)
+      this.getTotalDialysisCount(this.listQuery.start_time,this.list.listQuery.end_time,this.lapsetoType,this.sourceType)
       this.getRolloutCount(this.lapsetoType,this.sourceType)
     },
     selectLapseOne(lapseto) {
       console.log("lapseto22222",lapseto)
       this.lapsetoType = lapseto
-      this.getDialysisModeType(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
-      this.getTotalLapseCount(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
-      this.getTotalSexCount(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
-      this.getTotalInfectiousCount(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
-      this.getTotalAgeCount(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
-      this.getTotalDialysisCount(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
+      this.getDialysisModeType(this.listQuery.start_time,this.list.listQuery.end_time,this.lapsetoType,this.sourceType)
+      this.getTotalLapseCount(this.listQuery.start_time,this.list.listQuery.end_time,this.lapsetoType,this.sourceType)
+      this.getTotalSexCount(this.listQuery.start_time,this.list.listQuery.end_time,this.lapsetoType,this.sourceType)
+      this.getTotalInfectiousCount(this.listQuery.start_time,this.list.listQuery.end_time,this.lapsetoType,this.sourceType)
+      this.getTotalAgeCount(this.listQuery.start_time,this.list.listQuery.end_time,this.lapsetoType,this.sourceType)
+      this.getTotalDialysisCount(this.listQuery.start_time,this.list.listQuery.end_time,this.lapsetoType,this.sourceType)
       this.getRolloutCount(this.lapsetoType,this.sourceType)
     },
   },

src/xt_pages/stock/drugs/drugStockInOrder.vue

@@ -175,6 +175,12 @@
           </template>
         </el-table-column>
 
+        <el-table-column label="审核人" align="center"  v-if="org_id == 3877 || org_id == 10318">
+          <template slot-scope="scope">
+            {{ getXuserName(scope.row.checker) }}
+          </template>
+        </el-table-column>
+
         <el-table-column label="入库方式" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.is_sys == 13">调拨入库</span>
@@ -472,6 +478,7 @@ export default {
   name: "drugStockInOrder",
   components: { BreadCrumb },
   created() {
+    this.org_id = this.$store.getters.xt_user.org.id
     if (this.$route.path == "/Pharmacy/drugs/stock/in") {
       this.crumbs = [
         { path: false, name: "药品管理" },
@@ -552,6 +559,7 @@ export default {
         { id: 2, name: "未审核" },
       ],
       exportLoding:false,
+      org_id:0
     };
   },
 

src/xt_pages/stock/drugs/drugStockInOrderDetailPrint.vue

@@ -59,7 +59,7 @@
               <td style="line-height:18px">{{ item.batch_number }}</td>
               <td style="line-height:18px">{{ getTime(item.product_date,'{y}-{m}-{d}')}}</td>
               <td style="line-height:18px">{{ getTime(item.expiry_date,'{y}-{m}-{d}')}}</td>
-              <td style="line-height:18px">{{ getTime(it.ctime,'{y}-{m}-{d}')}}</td>
+              <td style="line-height:18px">{{ getTime(it.warehousing_time,'{y}-{m}-{d}')}}</td>
               <td style="line-height:18px">正常<br>入库</td>
               <td style="line-height:18px">合格</td>
             </tr>

src/xt_pages/stock/stockInOrder.vue

@@ -161,6 +161,12 @@
           </template>
         </el-table-column>
 
+        <el-table-column label="审核人" align="center" v-if="org_id == 3877 || org_id == 10318">
+          <template slot-scope="scope">
+            {{ getXuserName(scope.row.checker) }}
+          </template>
+        </el-table-column>
+
         <el-table-column label="入库方式" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.is_sys == 12">调拨入库</span>
@@ -771,7 +777,7 @@ export default {
       (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
       "-" +
       (nowDay < 10 ? "0" + nowDay : nowDay);
-
+    this.org_id = this.$store.getters.xt_user.org.id
     this.GetWarehouse();
     this.GetConfigInfo();
     this.fetchAllAdminUsers();
@@ -887,6 +893,7 @@ export default {
       ],
       check_id: 0,
       exportLoding:false,
+      org_id:0
     };
 
 

src/xt_pages/stock/stockInOrderDetailPrint.vue

@@ -1,444 +1,444 @@
 <template>
-    <div class="main-contain">
-        <div class="position">
-        <bread-crumb :crumbs="crumbs"></bread-crumb>
-        <el-row style="float:right;">
-            <el-col :span="24">
-            <el-button size="small" icon="el-icon-printer" type="primary" @click="printAction">打印</el-button>
-            </el-col>
-        </el-row>
-        </div>
-        <div class="app-container" style="background-color: white;">
-            <div id="print_content">
-                <div class="print_main_content" v-for="(it,index) in warehousingInfo" :key="index">
-                    <div class="order_title_panl">
-                        <div style="font-size:22px;font-weight:bold;">{{ orgName }}</div>
-                        <span style="font-weight:500;font-size:18px;">耗材入库登记单</span>
+  <div class="main-contain">
+      <div class="position">
+      <bread-crumb :crumbs="crumbs"></bread-crumb>
+      <el-row style="float:right;">
+          <el-col :span="24">
+          <el-button size="small" icon="el-icon-printer" type="primary" @click="printAction">打印</el-button>
+          </el-col>
+      </el-row>
+      </div>
+      <div class="app-container" style="background-color: white;">
+          <div id="print_content">
+              <div class="print_main_content" v-for="(it,index) in warehousingInfo" :key="index" >
+                <div style="margin-bottom: 20px; page-break-after: always;">
+                  <div class="order_title_panl" style="text-align:center;">
+                      <div style="font-size:22px;font-weight:bold;">{{ orgName }}</div>
+                      <span style="font-weight:500;font-size:18px; text-align: center;">耗材入库登记单</span>
+                  </div>
+                  <div style="display:flex;justify-content: space-between;">
+                    <div style="text-align:left;margin-bottom:1px;font-size: 18px;">
+                      单据编号：{{it.warehousing_order}}
                     </div>
-                    <div style="display:flex;justify-content: space-between;">
-                      <div style="text-align:left;margin-bottom:1px;font-size: 18px;">
-                        单据编号：{{it.warehousing_order}}
-                      </div>
-                      <div style="text-align:right;margin-bottom:1px;font-size: 18px;">
-                        打印时间：{{time_now}}
-                      </div>
+                    <div style="text-align:right;margin-bottom:1px;font-size: 18px;">
+                      打印时间：{{time_now}}
                     </div>
-                    
-                    <div class="table_panel">
-                        <table class="table">
-                            <thead>
-                                <tr>
-                                    <td style="line-height:18px;" width="80">耗材<br>名称</td>
-                                    <td style="line-height:18px;" width="80">注册证号/批准文号/备案凭证号</td>
-                                    <td style="line-height:18px;" width="80">规格<br>型号</td>
-                                    <td style="line-height:18px;" width="80">生产<br>厂商</td>
-                                    <td style="line-height:18px;" width="80">经销商</td>
-                                    <td style="line-height:18px;" width="80">单位</td>
-                                    <td style="line-height:18px;" width="80">进货价</td>
-                                    <td style="line-height:18px;" width="80">入库<br>数量</td> 
-                                    <td style="line-height:18px;" width="60">总价</td>
-                                    <td style="line-height:18px;" width="80">批号</td>
-                                    <td style="line-height:18px;" width="120">生产日期</td>
-                                    <td style="line-height:18px;" width="120">有效日期</td>
-                                    <td style="line-height:18px;" width="120">入库日期</td>
-                                    <td style="line-height:18px;" width="60">质检<br>意见</td>
-                                    <td style="line-height:18px;" width="60">验收<br>结论</td>
-                                </tr>
-                            </thead>
-                            <tbody>
-                                <tr v-for='(item,index) in it.child' :key="index">
-                                    <td style="line-height:18px;"><span v-if="item.good_id != 0">{{getTypeNameOne(item.good_id)}}</span></td>
-                                    <td style="line-height:18px;">{{item.register_number}} <span v-if="item.license_number !=''">/</span> {{item.license_number}}</td>
-                                    <td style="line-height:18px;"><span v-if="item.good_id != 0">{{getSpecificationName(item.good_id)}}</span></td>
-                                    <td style="line-height:18px;">{{ getManufacturer(item.good_id) }}</td>
-                                    <td style="line-height:18px;">{{ getDeatl(item.dealer) }}</td>
-                                    <td style="line-height:18px;"><span v-if="item.good_id!=0">{{item.GoodInfo.packing_unit}}</span></td>
-                                    <td style="line-height:18px;">{{item.price}}</td>
-                                    <td style="line-height:18px;">{{item.warehousing_count}}</td> 
-                                    <td style="line-height:18px;">{{(item.warehousing_count*item.price).toFixed(2)}}</td>
-                                    <td style="line-height:18px;">{{ item.number }}</td>
-                                    <td style="line-height:18px;">{{ getTime(item.product_date) }}</td>
-                                    <td style="line-height:18px;">{{ getTime(item.expiry_date) }}</td>
-                                    <td style="line-height:18px;">{{ getTime(item.ctime) }}</td>
-                                    <td style="line-height:18px;">正常<br>入库</td>
-                                    <td style="line-height:18px;">合格</td>
-                                </tr>
-                                <tr>
-                                  <td>合计</td>
-                                  <td colspan="7" style="text-align:center;"></td>
-                                  <td style="text-align:right;">{{getAllPice(it.id).toFixed(2)}}</td>
-                                  <td colspan="6" style="text-align:center"></td>
-                               </tr>
-                            </tbody>
-                        </table>
+                  </div>
+                  
+                  <div class="table_panel">
+                      <table class="table">
+                          <thead>
+                              <tr>
+                                  <td style="line-height:18px;" width="80">耗材<br>名称</td>
+                                  <td style="line-height:18px;" width="80">注册证号/批准文号/备案凭证号</td>
+                                  <td style="line-height:18px;" width="80">规格<br>型号</td>
+                                  <td style="line-height:18px;" width="80">生产<br>厂商</td>
+                                  <td style="line-height:18px;" width="80">经销商</td>
+                                  <td style="line-height:18px;" width="80">单位</td>
+                                  <td style="line-height:18px;" width="80">进货价</td>
+                                  <td style="line-height:18px;" width="80">入库<br>数量</td> 
+                                  <td style="line-height:18px;" width="60">总价</td>
+                                  <td style="line-height:18px;" width="80">批号</td>
+                                  <td style="line-height:18px;" width="120">生产日期</td>
+                                  <td style="line-height:18px;" width="120">有效日期</td>
+                                  <td style="line-height:18px;" width="120">入库日期</td>
+                                  <td style="line-height:18px;" width="60">质检<br>意见</td>
+                                  <td style="line-height:18px;" width="60">验收<br>结论</td>
+                              </tr>
+                          </thead>
+                          <tbody>
+                              <tr v-for='(item,index) in it.child' :key="index">
+                                  <td style="line-height:18px;"><span v-if="item.good_id != 0">{{getTypeNameOne(item.good_id)}}</span></td>
+                                  <td style="line-height:18px;">{{item.register_number}} <span v-if="item.license_number !=''">/</span> {{item.license_number}}</td>
+                                  <td style="line-height:18px;"><span v-if="item.good_id != 0">{{getSpecificationName(item.good_id)}}</span></td>
+                                  <td style="line-height:18px;">{{ getManufacturer(item.good_id) }}</td>
+                                  <td style="line-height:18px;">{{ getDeatl(item.dealer) }}</td>
+                                  <td style="line-height:18px;"><span v-if="item.good_id!=0">{{item.GoodInfo.packing_unit}}</span></td>
+                                  <td style="line-height:18px;">{{item.price}}</td>
+                                  <td style="line-height:18px;">{{item.warehousing_count}}</td> 
+                                  <td style="line-height:18px;">{{(item.warehousing_count*item.price).toFixed(2)}}</td>
+                                  <td style="line-height:18px;">{{ item.number }}</td>
+                                  <td style="line-height:18px;">{{ getTime(item.product_date) }}</td>
+                                  <td style="line-height:18px;">{{ getTime(item.expiry_date) }}</td>
+                                  <td style="line-height:18px;">{{ getTime(it.warehousing_time) }}</td>
+                                  <td style="line-height:18px;">正常<br>入库</td>
+                                  <td style="line-height:18px;">合格</td>
+                              </tr>
+                              <tr>
+                                <td>合计</td>
+                                <td colspan="7" style="text-align:center;"></td>
+                                <td style="text-align:right;">{{getAllPice(it.id).toFixed(2)}}</td>
+                                <td colspan="6" style="text-align:center"></td>
+                             </tr>
+                          </tbody>
+                      </table>
 
-                        <div style="display:flex;margin-top:1px;float:right;">
-                            <div style="width:50px;">审批：</div><div style="width:100px;"></div>
-                            <div style="width:80px;" v-if='orgId != 10024'>药材主任：</div><div style="width:100px;"></div>
-                            <div style="width:50px;">会计：</div><div style="width:100px;"><span v-if='orgId == 10024'>徐立琼</span></div>
-                            <div style="width:50px;">审核：</div><div style="width:100px;"><span v-if='orgId == 10024'>徐立琼</span></div>
-                            <div style="width:70px;">制单人：</div><div style="width:100px;">{{ getXuserName(it.creater) }}</div>
-                       </div>
-                    </div>
+                      <div style="display:flex;margin-top:1px;float:right;">
+                          <div style="width:50px;">审批：</div><div style="width:100px;"></div>
+                          <div style="width:80px;" v-if='orgId != 10024'>药材主任：</div><div style="width:100px;"></div>
+                          <div style="width:50px;">会计：</div><div style="width:100px;"><span v-if='orgId == 10024'>徐立琼</span></div>
+                          <div style="width:50px;">审核：</div><div style="width:100px;"><span v-if='orgId == 10024'>徐立琼</span></div>
+                          <div style="width:70px;">制单人：</div><div style="width:100px;">{{ getXuserName(it.creater) }}</div>
+                     </div>
+                  </div>
                 </div>
-            </div>
-        </div>
-    </div>
+              </div>
+          </div>
+      </div>
+  </div>
 </template>
 
 <script>
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
 import {
-  GetAllConfig,
-  getWarehouseInfoList,
-  getGoodInfoList
+GetAllConfig,
+getWarehouseInfoList,
+getGoodInfoList
 } from "@/api/stock";
 import { fetchAllAdminUsers } from "@/api/doctor";
 import print from 'print-js'
 const moment = require('moment')
 import { uParseTime } from '@/utils/tools'
 export default {
-    components:{
-        BreadCrumb
-    },
-    data(){
-        return{
-          crumbs: [
-            { path: false, name: '库存管理' },
-            { path: false, name: '耗材管理' },
-            { path: false, name: '入库单打印' },
-          ],
-            isEdit: 0,
-            checked: false,
-            signAndWeighBoxPatients: "sign-and-weigh-box-patients",
-            goodType: [],
-            goodInfo: [],
-            manufacturer: [],
-            dealer: [],
-            Warehouse: {
-                loading: false,
-                warehouseDate: [],
-                tableCurrentIndex: ""
-            },
-
-            WarehouseInfo: {
-                loading: false,
-                warehouseInfoDate: [],
-                warehouse: {}
-            },
-            time_now:moment(new Date()).add('year',0).format("YYYY-MM-DD"),
-            allPrice:0,
-            page: 1,
-            limit: 10000,
-            keyword: "",
-            is_use:"",
-            good_kind:"",
-            is_charge:"",
-            list:[],
-            orgName:'',
-            orgId:'',
-            adminUserOptions:[],
-            warehousingInfo:[],
-            warehousList:[]
-        }
-    },
-    methods:{
-      printAction: function() {
-          const style = '@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 14px; padding: 1px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 12px; padding: 10px 5px; white-space: pre-line;} .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } }'
-          printJS({
-          printable: 'print_content',
-          type: 'html',
-          documentTitle: '  ',
-          style: style,
-          scanStyles: false
-          })
-      },
-
-      getTime(val) {
-         if(val < 0){
-           return ""
-         }
-         if(val == ""){
-          return ""
-         }else {
-          return uParseTime(val, '{y}-{m}-{d}')
-         }
-      },
-      
-        GetConfigInfo: function() {
-        GetAllConfig().then(response => {
-            if (response.data.state == 0) {
-            this.$message.error(response.data.msg);
-            return false;
-            } else {
-            this.manufacturer = response.data.data.manufacturer;
-            this.dealer = response.data.data.dealer;
-            this.goodInfo = response.data.data.goodInfo;
-            this.goodType = response.data.data.goodType;
-           
-           for(let i=0;i<this.goodInfo.length;i++){
-               this.goodInfo[i].manufacturer_name = ""
-            }
-            for(let i=0;i<this.goodInfo.length;i++){
-               for(let j=0;j<this.manufacturer.length;j++){
-                  if(this.goodInfo[i].manufacturer == this.manufacturer[j].id){
-                     this.goodInfo[i].manufacturer_name = this.manufacturer[j].manufacturer_name
-                  }
-                
-               } 
-            }
-             console.log("商品信息",this.goodInfo)
-            }
-        });
-        },
-       
-     GetOrderDetail: function(order_id) {
+  components:{
+      BreadCrumb
+  },
+  data(){
+      return{
+        crumbs: [
+          { path: false, name: '库存管理' },
+          { path: false, name: '耗材管理' },
+          { path: false, name: '入库单打印' },
+        ],
+          isEdit: 0,
+          checked: false,
+          signAndWeighBoxPatients: "sign-and-weigh-box-patients",
+          goodType: [],
+          goodInfo: [],
+          manufacturer: [],
+          dealer: [],
+          Warehouse: {
+              loading: false,
+              warehouseDate: [],
+              tableCurrentIndex: ""
+          },
 
-        const params = {
-            id: order_id
-        };
-        getWarehouseInfoList(params).then(response => {
-            if (response.data.state == 0) {
-            this.$message.error(response.data.msg);
-            return false;
-            } else {
-             var info = response.data.data.info
-             console.log("info2222",info)
-             var warehousing = response.data.data.warehousing
-             console.log("warehousing",warehousing)
-             this.warehousList = info
-             for(let i=0;i<warehousing.length;i++){
-                warehousing[i].child = []
-              for(let j=0;j<info.length;j++){
-                if(warehousing[i].id == info[j].warehousing_id){
-                   warehousing[i].child.push(info[j])
-                }
-              }
-             }
-             
-             this.warehousingInfo = warehousing
-          
-            }
-        });
-       },
-      
-    getSpecificationName: function(id) {
-      let name = "";
-      for (let i = 0; i < this.goodInfo.length; i++) {
-        if (this.goodInfo[i].id == id) {
-          name = this.goodInfo[i].specification_name;
-        }
+          WarehouseInfo: {
+              loading: false,
+              warehouseInfoDate: [],
+              warehouse: {}
+          },
+          time_now:moment(new Date()).add('year',0).format("YYYY-MM-DD"),
+          allPrice:0,
+          page: 1,
+          limit: 10000,
+          keyword: "",
+          is_use:"",
+          good_kind:"",
+          is_charge:"",
+          list:[],
+          orgName:'',
+          orgId:'',
+          adminUserOptions:[],
+          warehousingInfo:[],
+          warehousList:[]
       }
-      return name;
+  },
+  methods:{
+    printAction: function() {
+        const style = '@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 14px; padding: 1px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 12px; padding: 10px 5px; white-space: pre-line;} .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } }'
+        printJS({
+        printable: 'print_content',
+        type: 'html',
+        documentTitle: '  ',
+        style: style,
+        scanStyles: false
+        })
     },
-    getTypeName: function(id) {
-      let name = "";
-      for (let i = 0; i < this.goodType.length; i++) {
-        if (this.goodType[i].id == id) {
-          name = this.goodType[i].type_name;
-        }
-      }
-      return name;
+
+    getTime(val) {
+       if(val < 0){
+         return ""
+       }
+       if(val == ""){
+        return ""
+       }else {
+        return uParseTime(val, '{y}-{m}-{d}')
+       }
     },
-    getTypeNameOne:function(id){
-      let name = "";
-      for (let i = 0; i < this.goodInfo.length; i++) {
-        if (this.goodInfo[i].id == id) {
-          name = this.goodInfo[i].good_name;
-        }
-      }
-      return name;
-     },
-     getList() {
-        this.goodInfo.loading = true
-        let params = {
-          page: this.page,
-          limit: this.limit,
-          keyword: this.keywords,
-          is_use:this.is_use,
-          good_kind:this.good_kind,
-          is_charge: this.is_charge,
-        }
-        getGoodInfoList(params).then(response => {
+    
+      GetConfigInfo: function() {
+      GetAllConfig().then(response => {
           if (response.data.state == 0) {
-           
-            this.$message.error(response.data.msg)
-            return false
+          this.$message.error(response.data.msg);
+          return false;
           } else {
-            this.list = []
-            for (let i = 0; i < response.data.data.list.length; i++) {
-              this.list.push(response.data.data.list[i])
-            }
-            console.log("list22222",this.list)
+          this.manufacturer = response.data.data.manufacturer;
+          this.dealer = response.data.data.dealer;
+          this.goodInfo = response.data.data.goodInfo;
+          this.goodType = response.data.data.goodType;
+         
+         for(let i=0;i<this.goodInfo.length;i++){
+             this.goodInfo[i].manufacturer_name = ""
           }
-        })
-      },
-      getUnit(id){
-        var name = ""
-        for(let i=0;i<this.list.length;i++){
-          if(id == this.list[i].id){
-             name = this.list[i].good_unit
+          for(let i=0;i<this.goodInfo.length;i++){
+             for(let j=0;j<this.manufacturer.length;j++){
+                if(this.goodInfo[i].manufacturer == this.manufacturer[j].id){
+                   this.goodInfo[i].manufacturer_name = this.manufacturer[j].manufacturer_name
+                }
+              
+             } 
           }
-        }
-        return this.getGoodUnit(name)
-      },
-      getGoodUnit(id){
-        for (let i = 0; i <this.$store.getters.good_unit.length; i++ ){
-          if(id == this.$store.getters.good_unit[i].id){
-
-            return this.$store.getters.good_unit[i].name
+           console.log("商品信息",this.goodInfo)
           }
-        }
-        return ""
-      },
-      // getManufacturer(id){
-      //   let name = ''
-      //   this.manufacturer.map(item => {
-      //     if(item.id == id){
-      //       name = item.manufacturer_name
-      //     }
-      //   })
-      //   return name
-      // },
-     getManufacturer(id){
-         let name = ""
-         for(let i=0;i<this.goodInfo.length;i++){
-            if(id == this.goodInfo[i].id){
-              name  =this.goodInfo[i].manufacturer_name
-            }
-         }
-         return name
+      });
       },
-      fetchAllAdminUsers() {
-        fetchAllAdminUsers().then(response => {
-          console.log(response);
-          if (response.data.state == 1) {
-            this.adminUserOptions = response.data.data.users;
-            var alen = this.adminUserOptions.length;
-            for (let index = 0; index < alen; index++) {
-              if (this.adminUserOptions[index].user_type == 2) {
-                // this.doctorOptions.push(this.adminUserOptions[index]);
+     
+   GetOrderDetail: function(order_id) {
+
+      const params = {
+          id: order_id
+      };
+      getWarehouseInfoList(params).then(response => {
+          if (response.data.state == 0) {
+          this.$message.error(response.data.msg);
+          return false;
+          } else {
+           var info = response.data.data.info
+           console.log("info2222",info)
+           var warehousing = response.data.data.warehousing
+           console.log("warehousing",warehousing)
+           this.warehousList = info
+           for(let i=0;i<warehousing.length;i++){
+              warehousing[i].child = []
+            for(let j=0;j<info.length;j++){
+              if(warehousing[i].id == info[j].warehousing_id){
+                 warehousing[i].child.push(info[j])
               }
             }
+           }
+           
+           this.warehousingInfo = warehousing
+        
           }
-        });
-      },
-      getXuserName(id) {
-        if (id <= 0) {
-          return "";
+      });
+     },
+    
+  getSpecificationName: function(id) {
+    let name = "";
+    for (let i = 0; i < this.goodInfo.length; i++) {
+      if (this.goodInfo[i].id == id) {
+        name = this.goodInfo[i].specification_name;
+      }
+    }
+    return name;
+  },
+  getTypeName: function(id) {
+    let name = "";
+    for (let i = 0; i < this.goodType.length; i++) {
+      if (this.goodType[i].id == id) {
+        name = this.goodType[i].type_name;
+      }
+    }
+    return name;
+  },
+  getTypeNameOne:function(id){
+    let name = "";
+    for (let i = 0; i < this.goodInfo.length; i++) {
+      if (this.goodInfo[i].id == id) {
+        name = this.goodInfo[i].good_name;
+      }
+    }
+    return name;
+   },
+   getList() {
+      this.goodInfo.loading = true
+      let params = {
+        page: this.page,
+        limit: this.limit,
+        keyword: this.keywords,
+        is_use:this.is_use,
+        good_kind:this.good_kind,
+        is_charge: this.is_charge,
+      }
+      getGoodInfoList(params).then(response => {
+        if (response.data.state == 0) {
+         
+          this.$message.error(response.data.msg)
+          return false
+        } else {
+          this.list = []
+          for (let i = 0; i < response.data.data.list.length; i++) {
+            this.list.push(response.data.data.list[i])
+          }
+          console.log("list22222",this.list)
         }
-        var name = "";
-        if (
-          this.adminUserOptions == null ||
-          typeof this.adminUserOptions.length === "undefined"
-        ) {
-          return name;
+      })
+    },
+    getUnit(id){
+      var name = ""
+      for(let i=0;i<this.list.length;i++){
+        if(id == this.list[i].id){
+           name = this.list[i].good_unit
         }
-        var leng = this.adminUserOptions.length;
-        if (leng == 0) {
-          return name;
+      }
+      return this.getGoodUnit(name)
+    },
+    getGoodUnit(id){
+      for (let i = 0; i <this.$store.getters.good_unit.length; i++ ){
+        if(id == this.$store.getters.good_unit[i].id){
+
+          return this.$store.getters.good_unit[i].name
         }
-        for (let index = 0; index < leng; index++) {
-          if (this.adminUserOptions[index].id == id) {
-            name = this.adminUserOptions[index].name;
-            break;
+      }
+      return ""
+    },
+    // getManufacturer(id){
+    //   let name = ''
+    //   this.manufacturer.map(item => {
+    //     if(item.id == id){
+    //       name = item.manufacturer_name
+    //     }
+    //   })
+    //   return name
+    // },
+   getManufacturer(id){
+       let name = ""
+       for(let i=0;i<this.goodInfo.length;i++){
+          if(id == this.goodInfo[i].id){
+            name  =this.goodInfo[i].manufacturer_name
+          }
+       }
+       return name
+    },
+    fetchAllAdminUsers() {
+      fetchAllAdminUsers().then(response => {
+        console.log(response);
+        if (response.data.state == 1) {
+          this.adminUserOptions = response.data.data.users;
+          var alen = this.adminUserOptions.length;
+          for (let index = 0; index < alen; index++) {
+            if (this.adminUserOptions[index].user_type == 2) {
+              // this.doctorOptions.push(this.adminUserOptions[index]);
+            }
           }
         }
+      });
+    },
+    getXuserName(id) {
+      if (id <= 0) {
+        return "";
+      }
+      var name = "";
+      if (
+        this.adminUserOptions == null ||
+        typeof this.adminUserOptions.length === "undefined"
+      ) {
         return name;
-      },
-      getAllPice(id){
-        var  total_price = 0 
-        for(let i=0;i<this.warehousList.length;i++){
-          if(id == this.warehousList[i].warehousing_id){
-             total_price += this.warehousList[i].warehousing_count * this.warehousList[i].price
-          }
+      }
+      var leng = this.adminUserOptions.length;
+      if (leng == 0) {
+        return name;
+      }
+      for (let index = 0; index < leng; index++) {
+        if (this.adminUserOptions[index].id == id) {
+          name = this.adminUserOptions[index].name;
+          break;
         }
-        return total_price
-      },
-      getDeatl(id){
-        console.log("23323233223",id)
-        var dealer_name = ""
-        for(let i=0;i<this.dealer.length;i++){
-          if(id == this.dealer[i].id){
-            dealer_name = this.dealer[i].dealer_name
-          }
+      }
+      return name;
+    },
+    getAllPice(id){
+      var  total_price = 0 
+      for(let i=0;i<this.warehousList.length;i++){
+        if(id == this.warehousList[i].warehousing_id){
+           total_price += this.warehousList[i].warehousing_count * this.warehousList[i].price
         }
-        return dealer_name
       }
+      return total_price
     },
-    created(){
-      this.orgName = this.$store.getters.xt_user.org.org_name;
-      this.orgId = this.$store.getters.xt_user.org.id;
-      const order_id = this.$route.query.id;
-
-      this.fetchAllAdminUsers()
-      this.GetConfigInfo();
-      this.GetOrderDetail(order_id);
-      this.getList()
+    getDeatl(id){
+      console.log("23323233223",id)
+      var dealer_name = ""
+      for(let i=0;i<this.dealer.length;i++){
+        if(id == this.dealer[i].id){
+          dealer_name = this.dealer[i].dealer_name
+        }
+      }
+      return dealer_name
     }
+  },
+  created(){
+    this.orgName = this.$store.getters.xt_user.org.org_name;
+    this.orgId = this.$store.getters.xt_user.org.id;
+    const order_id = this.$route.query.id;
+
+    this.fetchAllAdminUsers()
+    this.GetConfigInfo();
+    this.GetOrderDetail(order_id);
+    this.getList()
+  }
 }
 </script>
 
 
 <style rel="stylesheet/scss" lang="scss" scoped>
 .print_main_content {
-  background-color: white;
-  max-width: 1500px;
-  margin: 0 auto;
-  padding: 0 0 20px 0;
+background-color: white;
+max-width: 1500px;
+margin: 0 auto;
+padding: 0 0 20px 0;
 
-  .order_title_panl {
-    text-align: center;
-
-    .main_title {
-      font-size: 18px;
-      line-height: 40px;
-      font-weight: 500;
-    }
+.order_title_panl {
+  text-align: center;
+  .main_title {
+    font-size: 18px;
+    line-height: 40px;
+    font-weight: 500;
   }
-  .table_panel {
-    .table {
-      width: 100%;
-      border: 1px solid;
-      border-collapse: collapse;
-      padding: 2px;
-      
+}
+.table_panel {
+  .table {
+    width: 100%;
+    border: 1px solid;
+    border-collapse: collapse;
+    padding: 2px;
+    
 
-      thead {
-        tr {
-          td {
-            border: 1px solid;
-            text-align: center;
-            font-size: 18px;
-            padding: 1px 5px;
-          }
+    thead {
+      tr {
+        td {
+          border: 1px solid;
+          text-align: center;
+          font-size: 18px;
+          padding: 1px 5px;
         }
       }
-      tbody {
-        tr {
-          td {
-            border: 1px solid;
-            text-align: center;
-            font-size: 18px;
-            padding: 10px 5px;
-            white-space: pre-line;
-            .proj {
-              padding: 5px 0;
-              text-align: left;
+    }
+    tbody {
+      tr {
+        td {
+          border: 1px solid;
+          text-align: center;
+          font-size: 18px;
+          padding: 10px 5px;
+          white-space: pre-line;
+          .proj {
+            padding: 5px 0;
+            text-align: left;
 
-              .proj_title {
-                font-size: 16px;
-                font-weight: 500;
-                line-height: 25px;
-              }
+            .proj_title {
+              font-size: 16px;
+              font-weight: 500;
+              line-height: 25px;
+            }
 
-              .proj_item {
-                font-size: 15px;
-                line-height: 20px;
+            .proj_item {
+              font-size: 15px;
+              line-height: 20px;
 
-                .zone_name {
-                  font-weight: 500;
-                }
+              .zone_name {
+                font-weight: 500;
               }
             }
           }
@@ -447,4 +447,5 @@ export default {
     }
   }
 }
+}
 </style>

src/xt_pages/stock/stockOutOrderEdit.vue

@@ -711,6 +711,7 @@
 
 
             var warehout_id = parseInt(this.$route.query.id)
+           
             editWarehouseoutInfo(params, this.warehouse_out_time, warehout_id, this.$route.query.type, this.form.manufacturer, this.form.dealer,this.storehouse_id).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
@@ -722,6 +723,8 @@
                   this.$message.success('保存成功')
                   // this.$router.back(-1)
                   loading.close()
+                  const order_id = this.$route.query.id
+                  this.getSingleOutOrderDetail(order_id)
                 }
 
                 if(response.data.data.msg == 5){
@@ -839,7 +842,7 @@
       }
     },
      getSingleOutOrderDetail(order_id){
-
+      this.recordInfo.recordData = []
         const loading = this.$loading({
           lock: true,
           text: "Loading",

src/xt_pages/user/components/PatientDetail.vue

@@ -279,8 +279,20 @@
                     >{{ item.label }}</el-checkbox
                   >
                 </el-checkbox-group>
-              </el-form-item> </el-col
-            ><el-col :span="6">
+              </el-form-item>
+             </el-col>
+
+             <el-col :span="24">
+              <el-form-item label="病历号 : " prop="record_number">
+                <el-input
+                  style="width: 200px;"
+                  v-model="form.record_number"
+                  disabled
+                ></el-input>
+              </el-form-item>
+             </el-col>
+
+              <el-col :span="6">
               <el-form-item
                 label="本院前透析频率 : "
                 prop="pre_hospital_dialysis_frequency"
@@ -841,10 +853,10 @@
           <div class="order_title">{{ orgname }} 血液透析门诊病历</div>
           <div >
             <table >
-              <thead>
-                <!-- 用 thead 规定好宽度 -->
+              <!-- 用 thead 规定好宽度 -->
+              <!-- <thead>
                 <tr v-show="false">
-                  <td width="5%"></td>
+                  <td width="7%"></td>
                   <td width="10%"></td>
                   <td width="5%"></td>
                   <td width="10%"></td>
@@ -853,91 +865,137 @@
                   <td width="5%"></td>
                   <td width="30%"></td>
                 </tr>
-              </thead>
+              </thead> -->
               <tbody>
                 <tr>
-                  <td valign="top"><div class="td_proj_title">姓名</div></td>
-                  <td valign="top">
-                    <div class="td_proj_content">{{ patientPrint.name }}</div>
+                  <!--  -->
+                  <td style="width:8%;padding: 3px 0px;font-size: 17px;font-weight: 500;">
+                    姓名
+                    <!-- <div class="td_proj_title">姓名</div> -->
+                  </td> 
+                  <td style="padding: 3px 0px;font-size: 17px;">
+                    {{ patientPrint.name }}
+                    <!-- <div class="td_proj_content">{{ patientPrint.name }}</div> -->
                   </td>
-                  <td valign="top"><div class="td_proj_title">性别</div></td>
-                  <td valign="top">
-                    <div class="td_proj_content">{{ patientPrint.gender }}</div>
+                  <td style="padding: 3px 0px;font-size: 17px;">
+                    性别
+                    <!-- <div class="td_proj_title">性别</div> -->
                   </td>
-                  <td valign="top"><div class="td_proj_title">年龄</div></td>
-                  <td valign="top">
-                    <div class="td_proj_content">{{ patientPrint.age }}岁</div>
+                  <td style="padding: 3px 0px;font-size: 17px;">
+                    {{ patientPrint.gender }}
+                    <!-- <div class="td_proj_content">{{ patientPrint.gender }}</div> -->
                   </td>
-                  <td valign="top"><div class="td_proj_title">籍贯</div></td>
-                  <td valign="top">
-                    <div class="td_proj_content td_align_left">
+                  <td style="padding: 3px 0px;font-size: 17px;font-weight: 500;">
+                    年龄
+                    <!-- <div class="td_proj_title">年龄</div> -->
+                  </td>
+                  <td style="padding: 3px 0px;font-size: 17px;">
+                    {{ patientPrint.age }}岁
+                    <!-- <div class="td_proj_content">{{ patientPrint.age }}岁</div> -->
+                  </td>
+                  <td style="padding: 3px 0px;font-size: 17px;font-weight: 500;">
+                    籍贯
+                    <!-- <div class="td_proj_title">籍贯</div> -->
+                  </td>
+                  <td style="padding: 3px 0px;font-size: 17px;">
+                    {{ patientPrint.native_place }}
+                    <!-- <div class="td_proj_content td_align_left">
                       {{ patientPrint.native_place }}
-                    </div>
+                    </div> -->
                   </td>
                 </tr>
                 <tr>
-                  <td valign="top"><div class="td_proj_title">职业</div></td>
-                  <td valign="top">
-                    <div class="td_proj_content">
+                  <td style="padding: 3px 0px;font-size: 17px;font-weight: 500;">
+                    职业
+                    <!-- <div class="td_proj_title">职业</div> -->
+                  </td>
+                  <td style="padding: 3px 0px;font-size: 17px;">
+                    {{ patientPrint.profession }}
+                    <!-- <div class="td_proj_content">
                       {{ patientPrint.profession }}
-                    </div>
+                    </div> -->
                   </td>
-                  <td valign="top"><div class="td_proj_title">婚姻</div></td>
-                  <td valign="top">
-                    <div class="td_proj_content">
+                  <td style="padding: 3px 0px;font-size: 17px;font-weight: 500;">
+                    婚姻
+                    <!-- <div class="td_proj_title">婚姻</div> -->
+                  </td>
+                  <td style="padding: 3px 0px;font-size: 17px;">
+                    {{ patientPrint.marital_status }}
+                    <!-- <div class="td_proj_content">
                       {{ patientPrint.marital_status }}
-                    </div>
+                    </div> -->
+                  </td>
+                  <td style="padding: 3px 0px;font-size: 17px;font-weight: 500;">
+                    透析号
+                    <!-- <div class="td_proj_title">透析号</div> -->
                   </td>
-                  <td valign="top"><div class="td_proj_title">透析号</div></td>
-                  <td valign="top">
-                    <div class="td_proj_content">
+                  <td style="padding: 3px 0px;font-size: 17px;">
+                    {{ patientPrint.dialysis_no }}
+                    <!-- <div class="td_proj_content">
                       {{ patientPrint.dialysis_no }}
-                    </div>
+                    </div> -->
                   </td>
-                  <td valign="top">
-                    <div class="td_proj_title">身份证号</div>
+                  <td style="padding: 3px 0px;font-size: 17px;font-weight: 500;">
+                    身份证号
+                    <!-- <div class="td_proj_title">身份证号</div> -->
                   </td>
-                  <td valign="top">
-                    <div class="td_proj_content td_align_left">
+                  <td style="padding: 3px 0px;font-size: 17px;">
+                    {{ patientPrint.id_card_no }}
+                    <!-- <div class="td_proj_content td_align_left">
                       {{ patientPrint.id_card_no }}
-                    </div>
+                    </div> -->
                   </td>
                 </tr>
                 <tr>
-                  <td valign="top"><div class="td_proj_title">民族</div></td>
-                  <td valign="top">
-                    <div class="td_proj_content">{{ patientPrint.nation }}</div>
+                  <td  style="padding: 3px 0px;font-size: 17px;font-weight: 500;">
+                    民族
+                    <!-- <div class="td_proj_title">民族</div>  valign="top" -->
                   </td>
-                  <td valign="top"><div class="td_proj_title">电话</div></td>
-                  <td valign="top" colspan="3">
-                    <div class="td_proj_content td_align_left">
-                      {{ patientPrint.phone }}
-                    </div>
+                  <td style="padding: 3px 0px;font-size: 17px;">
+                    {{ patientPrint.nation }}
+                    <!-- <div class="td_proj_content">{{ patientPrint.nation }}</div> -->
                   </td>
-                  <td valign="top">
-                    <div class="td_proj_title">家属电话</div>
+                  <td style="padding: 3px 0px;font-size: 17px;font-weight: 500;">
+                    电话
+                    <!-- <div class="td_proj_title">电话</div> -->
                   </td>
-                  <td valign="top">
-                    <div class="td_proj_content td_align_left">
+                  <td  colspan="3" style="padding: 3px 0px;font-size: 17px;">
+                    {{ patientPrint.phone }}
+                    <!-- <div class="td_proj_content td_align_left">
+                      {{ patientPrint.phone }}
+                    </div> -->
+                   </td>
+                 <td style="padding: 3px 0px;font-size: 17px;font-weight: 500;">
+                    家属电话
+                    <!-- <div class="td_proj_title">家属电话</div> -->
+                  </td>
+                  <td style="padding: 3px 0px;font-size: 17px;">
+                    {{ patientPrint.home_telephone }}
+                    <!-- <div class="td_proj_content td_align_left">
                       {{ patientPrint.home_telephone }}
-                    </div>
+                    </div> -->
                   </td>
                 </tr>
                 <tr>
-                  <td><div class="td_proj_title">地址</div></td>
-                  <td colspan="7">
-                    <div class="td_proj_content td_align_left">
+                  <td style="padding: 3px 0px;font-size: 17px;font-weight: 500;">地址</td>
+                  <td colspan="7" style="text-align: left; padding:0px 5px;font-size: 17px;">
+                    <!-- class="td_proj_content td_align_left" -->
+                    <!-- <div > -->
                       {{ patientPrint.home_address }}
-                    </div>
+                    <!-- </div> -->
                   </td>
                 </tr>
                 <tr>
-                  <td><div class="td_proj_title">主诉</div></td>
-                  <td colspan="7">
-                    <div
-                      class="td_proj_content td_align_left"
+                  <td style="padding: 3px 0px;font-size: 17px; font-weight: 500;">
+                    主诉
+                    <!-- <div class="td_proj_title">主诉</div> -->
+                  </td>
+                  <!-- class="td_proj_content td_align_left" -->
+                  <td colspan="7" style="text-align: left; padding:0px 5px ;font-size: 17px;"> 
+                    {{ patientPrint.patient_complains }}
+                    <!-- <div style="padding: 0px 0px;"
                       v-html="patientPrint.patient_complains"
-                    ></div>
+                    ></div> -->
                   </td>
                 </tr>
                 <tr >
@@ -945,6 +1003,9 @@
                     <div class="td_proj_title">现<br />病<br />史</div>
                   </td>
                   <td colspan="7">
+                    <!-- <div class="td_proj_content td_align_left">{{patientPrint.present_history}}</div> -->
+
+                    
                     <div
                       class="td_proj_content td_align_left"
                       v-html="patientPrint.present_history"
@@ -957,10 +1018,11 @@
                     <div class="td_proj_title">既<br />往<br />史</div>
                   </td>
                   <td colspan="7">
-                    <div
-                      class="td_proj_content td_align_left"
-                      v-html="patientPrint.past_history"
-                    ></div>
+                    
+                    <div class="td_proj_content td_align_left">
+                      {{ patientPrint.past_history }}
+                    </div>
+                    <!--  v-html="patientPrint.past_history" -->
                   </td>
                 </tr>
                 <tr>
@@ -1086,6 +1148,7 @@
 <script>
 import { getDataConfig } from "@/utils/data";
 import { getToken } from "@/api/qiniu";
+// import print from "print-js";
 import {
   getFileExtension,
   isCardNo,
@@ -1173,6 +1236,7 @@ const defaultForm = {
   zb_patient_id: "",
   treatment_plan: "",
   doctor:"",
+  record_number:"",
 };
 
 export default {
@@ -1383,7 +1447,7 @@ export default {
             // if (patietInfo.is_infectious == 1) {
             //   this.form.remind_cycle = 0;
             // }
-            console.log("222222", this.form.remind_cycle);
+            // console.log("222222", this.form.remind_cycle);
             this.form.user_sys_before_count = patietInfo.user_sys_before_count;
 
             this.infections = response.data.data.infections;
@@ -1498,6 +1562,7 @@ export default {
             this.form.contact_name = patietInfo.contact_name;
             this.form.tell_phone = patietInfo.tell_phone;
             this.form.dialysis_age = patietInfo.dialysis_age;
+            this.form.record_number = patietInfo.record_number
             if (patietInfo.expense_kind == 0) {
               this.form.expense_kind = "";
             } else {
@@ -1558,7 +1623,7 @@ export default {
 
             var contagionsArr = response.data.data.contagions;
             var diseasesArr = response.data.data.diseases;
-
+              // console.log('123456',response.data.data);
             this.patientPrint = patietInfo;
 
             var sourceLen = this.sourceOptions.length;
@@ -1609,11 +1674,13 @@ export default {
               "{y}-{m}-{d}"
             );
             this.patientPrint.age = jsGetAge(this.patientPrint.birthday, "-");
-
+            
             this.patientPrint.patient_complains =
               patietInfo.patient_complains.replace(/\n/g, "<br/>");
+              // console.log('qwerewqrt',patietInfo.present_history);
             this.patientPrint.present_history =
               patietInfo.present_history.replace(/\n/g, "<br/>");
+              console.log('qwerewqrt',patietInfo.past_history);
             this.patientPrint.past_history = patietInfo.past_history.replace(
               /\n/g,
               "<br/>"
@@ -2140,8 +2207,8 @@ export default {
   background-color: white;
   width: 960px;
   margin: 0 auto;
-  padding: 0 0 20px 0;
-  /* page-break-after: always; */
+  padding: 0 0 0 0;
+  page-break-after: always;
 }
 .print_main_content .order_title {
   text-align: center;
@@ -2159,16 +2226,16 @@ export default {
   border: 1px solid;
   text-align: center;
   /* font-size: 17px; */
-  padding: 10px 8px;
+  /* padding: 10px 8px; */
 }
 .td_proj_title {
-  font-size: 18px;
-  line-height: 25px;
+  font-size: 17px;
+  /* line-height: 20px; */
   font-weight: 500;
 }
 .td_proj_content {
-  font-size: 18px;
-  line-height: 25px;
+  font-size: 17px;
+  /* line-height: 20px; */
 }
 .td_align_left {
   text-align: left;

src/xt_pages/user/components/PatientForm.vue

@@ -333,6 +333,16 @@
                 </el-checkbox-group>
               </el-form-item>
             </el-col>
+            
+            <el-col :span="24">
+              <el-form-item label="病历号 : " prop="record_number">
+                <el-input
+                  style="width: 200px;"
+                  v-model="form.record_number"
+                ></el-input>
+              </el-form-item>
+             </el-col>
+
             <el-col :span="6" :style="isEdit ? 'width:360px' : ''">
               <el-form-item
                 label="本院前透析频率 : "
@@ -1037,7 +1047,7 @@ const defaultForm = {
   diagnose: "",
   is_infectious: 1,
   age: "",
-
+  record_number:"",
   response_result: "",
   remind_cycle: 0,
   record_date: "",
@@ -1896,6 +1906,7 @@ export default {
             // if (patietInfo.registrars_id > 0) {
             //   this.form.registrars = patietInfo.registrars_id;
             // }
+            this.form.record_number = patietInfo.record_number
             this.form.doctor = patietInfo.doctor
             if(this.form.doctor == 0){
               this.form.doctor = ""

src/xt_pages/user/courseOfDisease.vue

@@ -700,7 +700,9 @@
               <el-input v-model="title" style="width: 420px"></el-input>
             </div>
 
-
+            <div style="margin-top: 10px;">
+              <el-button type="primary" size="small" @click="toAuto" v-if="org_id == 3877 || org_id == 10440" >自动生成</el-button>
+            </div>
             <div class="textarea_panel">
               <keep-alive>
                 <editor ref="editor"
@@ -777,17 +779,18 @@
   import PatientSidebar from './components/PatientSidebar'
   import Editor from '@/components/Editor'
   const moment = require('moment')
-
+  import { getDataConfig } from "@/utils/data";
   import {
     createCourseOfDiseaseRecord,
     deleteCourseOfDiseaseRecords,
     getCourseOfDiseaseRecords,
     modifyCourseOfDiseaseRecord,
-    GetCoursePrintData
+    GetCoursePrintData,
+    getPatientDialysisInfor
   } from '@/api/patient'
   import { parseTime } from '@/utils'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
-
+  import { uParseTime } from '@/utils/tools'
   export default {
     name: 'CourseOfDisease',
     components: {
@@ -821,10 +824,12 @@
         edit_title: '',
         ids:"",
         idArr:[],
+        org_id:0
       }
     },
     created() {
       this.patient_id = parseInt(this.$route.query.id)
+      this.org_id = this.$store.getters.xt_user.template_info.org_id;
       if (isNaN(this.patient_id) || this.patient_id <= 0) {
         this.$notify.error({
           title: '错误',
@@ -1040,8 +1045,239 @@
           return
         }
         this.$router.push({ path: "/course/print?ids="+this.ids+"&patient_id="+this.patient_id});
-        // this.$router.push({ path: "/physique/print?ids="+this.ids+"&patient_id="+this.patient_id});
+       
+      },
+      toAuto(){
+       
+         var params=  {
+           patient_id:parseInt(this.$route.query.id),
+           record_date:this.course_of_disease_time.slice(0,10),
+         }
+         console.log("param2222owoowwow",params)
+        getPatientDialysisInfor(params).then(response=>{
+          if(response.data.state== 1){
+            var patient = response.data.data.patient
+            var prescription = response.data.data.prescription
+            var predialysis_evaluation =  response.data.data.assessmentBefor
+            var dialysis_order =  response.data.data.order
+            var monitors = response.data.data.monitor
+            var doctor_advices = response.data.data.advice
+            var assessment_after_dislysis =  response.data.data.afterDislysis
+           
+           var str_one = ""
+          if(dialysis_order!=null){
+            if(dialysis_order.puncture_nurse_id >0){
+              str_one = "护士穿刺成功!"
+            }
+          }
+        
+          var total =0 
+          if(predialysis_evaluation!=null){
+            total = (predialysis_evaluation.weight_before - predialysis_evaluation.dry_weight).toFixed(1)
+          }
+  
+
+        var monitor_one =[]
+        var monitor_two = []
+        var monitor_three = []
+
+        if(monitors!=null && monitors.length > 0){
+          var monitor_one =  monitors.sort(function (a,b) {
+            return b.systolic_bp - a.systolic_bp
+          })
+          var monitor_two =  monitors.sort(function (a,b) {
+            return b.diastolic_bp - a.diastolic_bp
+          })
+
+          var monitor_three = monitors.sort(function (a,b) {
+            return b.pulse_frequency - a.pulse_frequency
+          })
+
+        }
+  
+        var doc_str = ""
+      
+        if(doctor_advices!=null && doctor_advices.length > 0){
+        
+          
+          for(let i=0;i<doctor_advices.length;i++){
+            doc_str +=doctor_advices[i].advice_name +" "+doctor_advices[i].prescribing_number+doctor_advices[i].prescribing_number_unit+" "+doctor_advices[i].delivery_way
+          }
+        }
+
+        if(predialysis_evaluation.blood_access_part_id == -2){
+          predialysis_evaluation.blood_access_part_id = ""
+        }
+      
+        var str = " 患者今日来我科行血液透析治疗,血管通路选择:"+predialysis_evaluation.blood_access_part_id+ " "+this.QueryOperaById(predialysis_evaluation.blood_access_part_opera_id) +",透析模式:"+this.getModeId(prescription.mode_id)+
+        ",透前检查:"+predialysis_evaluation.internal_fistula +predialysis_evaluation.catheter + str_one +" "+ ",透析器:"+prescription.dialyzer_perfusion_apparatus + ",抗凝剂:"+this.GetAnticoagulant(prescription.anticoagulant) +",总量:"+prescription.anticoagulant_zongliang+"iu"+
+        ",透前体重:"+predialysis_evaluation.weight_before+"kg"+",间期体重增长:"+total +"kg"+",目标脱水量:"+prescription.target_ultrafiltration +"ml" +",血流量:"+prescription.blood_flow_volume+"ml/min" + ",透析开始时间:"+this.getTime(dialysis_order.start_time) +",透析过程中血压波动,"+"最大收缩压:"+monitor_one[0].systolic_blood_pressure+"mmHg"+",最小收缩压:"+monitor_one[monitor_one.length-1].systolic_blood_pressure
+        +"mmHg" +",最小舒张压:" +monitor_two[0].diastolic_blood_pressure+"mmHg" + ",最大舒张压:" + monitor_two[monitor_two.length-1].diastolic_blood_pressure +"mmHg" + ",最大脉搏:"+monitor_three[0].pulse_frequency+"次/分"+",最小脉搏:"+monitor_three[monitor_three.length-1].pulse_frequency+"次/分"+",透析结束时间:"+this.getTime(dialysis_order.end_time) +
+        ",实际治疗时长:"+ assessment_after_dislysis.actual_treatment_hour +"时"+assessment_after_dislysis.actual_treatment_minute+"分" +",实际超滤量:"+assessment_after_dislysis.actual_ultrafiltration+"ml"+",透后体重:"+assessment_after_dislysis.weight_after+"kg"+",透析过程顺利，安全下机" + " "
+        +",今日使用药品:"+doc_str +",患者下机后测血压,"+"收缩压:"+assessment_after_dislysis.systolic_blood_pressure+"mmHg"+",舒张压:"+assessment_after_dislysis.diastolic_blood_pressure+"mmHg"+",脉搏:"+assessment_after_dislysis.pulse_frequency +"次/分"
+
+        console.log("str000000000000000000222o2o2",str)
+           this.new_content =str
+          }
+        })
+
+      },
+
+    QueryOperaById(val){
+       var blood_access_part_opera = getDataConfig('hemodialysis', 'vascular_access_desc')
+       var name = ""
+       for(let i=0;i<blood_access_part_opera.length;i++){
+         if(val == blood_access_part_opera[i].id){
+            name = blood_access_part_opera[i].name
+         }
+       }
+       return name
+    },
+    getModeId(mode_id){
+      var mode_name = ""
+      if(mode_id == 1){
+         mode_name ="HD"
+      }
+      if(mode_id == 2){
+         mode_name ="HDF"
+      }
+      if(mode_id == 3){
+         mode_name ="HD+HP"
+      }
+      if(mode_id == 4){
+         mode_name ="HP"
+      }
+      if(mode_id == 5){
+         mode_name ="HF"
+      }
+      if(mode_id == 6){
+         mode_name ="SCUF"
+      }
+      if(mode_id == 7){
+         mode_name ="IUF"
       }
+      if(mode_id == 8){
+         mode_name ="HFHD"
+      }
+      if(mode_id == 9){
+         mode_name ="HFHD+HP"
+      }
+      if(mode_id == 10){
+         mode_name ="PHF"
+      }
+      if(mode_id == 11){
+         mode_name ="HFR"
+      }
+      if(mode_id == 12){
+         mode_name ="HDF+HP"
+      }
+      if(mode_id == 13){
+         mode_name ="CRRT"
+      }
+      if(mode_id == 14){
+         mode_name ="腹水回输"
+      }
+      if(mode_id == 19){
+         mode_name ="IUF+HD"
+      }
+      if(mode_id == 20){
+         mode_name ="UF"
+      }
+      if(mode_id == 21){
+         mode_name ="HD+"
+      }
+      if(mode_id == 22){
+         mode_name ="血浆胆红素吸附+HDF"
+      }
+      if(mode_id == 23){
+         mode_name ="血浆胆红素吸附"
+      }
+      if(mode_id == 24){
+         mode_name ="I-HDF"
+      }
+      if(mode_id == 25){
+         mode_name ="HD高通"
+      }
+      if(mode_id == 26){
+         mode_name ="CVVH"
+      }
+      if(mode_id == 27){
+         mode_name ="CVVHD"
+      }
+      if(mode_id == 28){
+         mode_name ="CVVHDF"
+      }
+      if(mode_id == 29){
+         mode_name ="PE"
+      }
+      if(mode_id == 30){
+         mode_name ="血浆胆红素吸附+HP"
+      }
+      if(mode_id == 31){
+         mode_name ="HPD"
+      }
+      if(mode_id == 32){
+         mode_name ="HDP"
+      }
+      return mode_name
+    },
+    GetAnticoagulant(id){
+      var  anticoagulant_name = ""
+      if(id == 1){
+       anticoagulant_name = "无肝素"
+      }
+      if(id == 2){
+         anticoagulant_name = "普通肝素"
+      }
+      if(id == 3){
+        anticoagulant_name = "低分子肝素"
+      } 
+      if(id == 4){
+        anticoagulant_name = "阿加曲班"
+      } 
+
+      if(id == 5){
+       anticoagulant_name = "枸橼酸钠"
+      }
+      if(id == 6){
+         anticoagulant_name = "低分子肝素钙"
+      }
+      if(id == 7){
+        anticoagulant_name = "低分子肝素钠"
+      } 
+      if(id == 8){
+        anticoagulant_name = "依诺肝素"
+      } 
+
+      if(id == 9){
+        anticoagulant_name = "达肝素"
+      } 
+      if(id == 10){
+        anticoagulant_name = "体外抗凝"
+      } 
+
+      if(id == 11){
+        anticoagulant_name = "那屈肝素"
+      } 
+      if(id == 12){
+        anticoagulant_name = "无抗凝剂"
+      } 
+
+      if(id == 13){
+        anticoagulant_name = "那屈肝素钙"
+      } 
+      if(id == 14){
+        anticoagulant_name = "肝素钙注射液"
+      } 
+      if(id == 15){
+        anticoagulant_name = "甲磺酸萘莫司他"
+      } 
+
+      return anticoagulant_name
+    },
+    getTime (time) {
+     return uParseTime(time, '{y}-{m}-{d} {h}:{i}')
+    },
     }
   }
 </script>

src/xt_pages/user/dialysisSolution.vue

@@ -527,6 +527,12 @@
             </el-form-item>
           </el-col>
 
+          <el-col :span="8" v-if="isShows('加糖')">
+            <el-form-item label="加糖:">
+              <el-input v-model="addPlan.chaptalization"></el-input>
+            </el-form-item>
+          </el-col>
+
           <el-col :span="8" v-if="isShows('碳酸氢盐')">
             <el-form-item label="碳酸氢盐（mmol/L）: " prop="bicarbonate">
               <el-input v-model="addPlan.bicarbonate"></el-input>
@@ -1084,6 +1090,7 @@
           max_ultrafiltration_rate:"",
           amylaceum:"",
           dialysis_strainer:"",
+          chaptalization:"",
         },
         childPlan: {
           mode: '',
@@ -1214,6 +1221,7 @@
         dialysis_dialyszers:'',
         dialysis_irrigation:"",
         dialysis_strainer:"",
+        chaptalization:"",
         dialysisStrainerList:[],
         plasmaSeparatorList:[],
         bilirubinAdsorptionColumn:[],
@@ -1756,6 +1764,8 @@
                 this.current_solution.max_ultrafiltration_rate = response.data.data.solution.max_ultrafiltration_rate
                 this.current_solution.remark = response.data.data.solution.remark
                 this.current_solution.dialysis_strainer = response.data.data.dialysis_strainer
+
+                this.current_solution.chaptalization = response.data.data.chaptalization
                 this.FindePatientDialysisLongSolutions()
                 return false
               }
@@ -1776,6 +1786,7 @@
             this.addPlan.dialysis_irrigation = this.dialysis_irrigation
             this.addPlan.dialysis_strainer = this.dialysis_strainer
             this.addPlan.mode_id = parseInt(this.addPlan.mode_id)
+         
             console.log("add",this.addPlan)
             createPatientDialysisSolution(
               this.patientID,
@@ -1826,7 +1837,7 @@
         this.getDialysisSolutionDetailList()
       },
       openEdit(index, row) {
-        console.log("row-------",row)
+       
         this.current_index = index
         this.addPlan.id = row.id
         this.addPlan.mode = row.mode_id
@@ -2006,6 +2017,9 @@
         }
         this.addPlan.dialysate_formulation = row.dialysate_formulation
         this.dialysisTimeShow = new Date(2018,1,1,this.addPlan.dialysis_duration_hour,this.addPlan.dialysis_duration_minute)
+
+        this.addPlan.amylaceum = row.amylaceum
+        this.addPlan.chaptalization = row.chaptalization
       },
       isShows(name) {
         var filedList = store.getters.xt_user.fileds
@@ -2086,6 +2100,7 @@
           created_time:"",
           plasma_separator:"",
           bilirubin_adsorption_column:"",
+          chaptalization:"",
         }
         this.addPlanTypeChange()
 

src/xt_pages/user/doctorAdvice.vue

@@ -2050,6 +2050,7 @@
 import PatientSidebar from "./components/PatientSidebar";
 import EditGroupAdvice from "./components/EditGroupAdvice";
 import { fetchAllAdminUsers, fetchAllDoctorAndNurse } from "@/api/doctor";
+import printJS from "print-js";
 import {
   CheckGroupAdvice,
   CreateNewDoctorAdvice,
@@ -3519,6 +3520,17 @@ export default {
           this.adviceTableData = response.data.data.advices;
           console.log("数据是什么", this.adviceTableData);
           var advice = response.data.data.advices;
+          var is_open = response.data.data.is_open
+          if(is_open == 1){
+            var longAdvice =  response.data.data.longAdvice
+            console.log("longAdvice--------------",longAdvice)
+            if(longAdvice!=null && longAdvice.length > 0){
+              for(let i=0;i<longAdvice.length;i++){
+                advice.push(longAdvice[i])
+              }
+            }
+          }
+         
           var one = response.data.data.advicetwo;
           let dataInfo = {};
           one.forEach((item, index) => {

src/xt_pages/user/ktv.vue

@@ -785,9 +785,9 @@ export default {
     },
     submitNew(formName) {
       let valueSix = 0
-      for(let i = 0; i < items.length; i++){
-        if(items[i].item_name == "KT/V"){
-          valueSix = items[i].value
+      for(let i = 0; i < this.items.length; i++){
+        if(this.items[i].item_name == "KT/V"){
+          valueSix = this.items[i].value
         }
       }
       if(valueSix.length == 0){

src/xt_pages/workforce/appointment.vue

@@ -67,7 +67,8 @@
     <div class="position">
       <bread-crumb :crumbs="crumbs"></bread-crumb>
       <div style="display:flex;align-items:center">
-        <el-button type="primary" size="small" icon="el-icon-printer" @click="printScheduleAction">打印排班</el-button>
+        <el-button type="primary" size="small" icon="el-icon-printer" @click="printScheduleAction" v-if="activeName !='historyWeek'">打印排班</el-button>
+        <el-button type="primary" size="small" icon="el-icon-printer" @click="printScheduleActionOne" v-if="activeName == 'historyWeek'">打印排班</el-button>
         <!-- <schedule-upload-excel style="margin-right:10px;" :on-success='handleSuccess' v-if="is_edit"></schedule-upload-excel> -->
         <!-- <el-button @click="printTable" type="primary" size="small">打印排班</el-button> -->
         <el-button v-if="isShow()" type="primary" size="small" @click="export_file()" :loading="downloadLoading">
@@ -898,7 +899,9 @@ export default {
       } else if (this.activeName == 'nextTwoWeek') {
         date = date + 14 * 24 * 60 * 60 * 1000
       }
-      console.log("whhwhwhwhwhwh",this.templateObj.template_id)
+      console.log("whhwhwhwhwhwh",date)
+      console.log("this.templateObj.template_id == 1",this.templateObj.template_id)
+      console.log("week2333333333333333",this.week_date)
       if (this.templateObj.template_id == 1) {
         this.$router.push({path: '/workforce/schedule/print', query: {date: date}})
       }
@@ -913,6 +916,21 @@ export default {
       }
 
     },
+    printScheduleActionOne:function(){
+       
+      var start_time = this.$refs.tableDataZero.start_time
+
+      var end_time =  this.$refs.tableDataZero.end_time
+
+      var partition_id = this.$refs.tableDataZero.partition_id
+
+      var nextTwoWeek = "nextTwoWeek"
+
+      var week_date = []
+
+    
+      this.$router.push({path:'/scheduleTablePrintThree?partition_id='+partition_id+"&weekTime="+nextTwoWeek+"&week_date="+week_date+"&start_time="+start_time+"&end_time="+end_time})
+    },
     isShow() {
       let isShow = false
       if (Object.keys(this.partitions).length != 0) {

src/xt_pages/workforce/components/historyWeekTable.vue

@@ -2829,7 +2829,7 @@ export default {
       return uParseTime(val, '{y}-{m}-{d}')
     },
     changeWeek(val) {
-      console.log('11111',val)
+      console.log('效果国233232',val)
       this.newDay = []
       var start = this.getTimestamp(val) - 86400
       var end = start + 518400
@@ -2839,6 +2839,9 @@ export default {
 
       this.newDay.push(this.start_time)
       this.newDay.push(this.end_time)
+
+      console.log("sart323232我的",this.start_time)
+      console.log("end_timewowowo",this.end_time)
       this.scheduleZone=[]
       // this.$nextTick(() => {
         this.getAllZones()
@@ -2894,15 +2897,16 @@ export default {
         patitionid: str,
         schedule_type: this.schedule_type,
       }
-    //  console.log("str--------",str)
+     console.log("params232323232",params)
       getSchedulesOne(params).then(response => {
         // console.log('getSchedulesOne',response.data.data);
         if (response.data.state == 1) {
           this.weekTitle = response.data.data.weekTitle;
           this.weekTitle = []
-
+          console.log("first_day23333333333333",this.start_time)
           var first = this.getTimestamp(this.start_time)
           var first_day =  this.getTime(first, "{y}-{m}-{d}")
+          console.log("first_day23333333333333",first_day)
           this.weekTitle.push(first_day)
 
           var second = this.getTimestamp(this.start_time) + 86400