新分支

src/xt_pages/data/components/consumables.vue

@@ -81,14 +81,14 @@
         >点击导出
         </el-button>
 
-        <!-- <el-button
+       <!-- <el-button
           style="margin-left:10px;"
           @click="jiaoBen()"
           class="filter-item"
           type="primary"
           size="small"
         >脚本
-        </el-button> -->
+        </el-button>  -->
       </div>
 
     <el-table

src/xt_pages/dialysis/batch_print/batch_print_order_forty.vue

@@ -490,7 +490,7 @@
                                 <td width="20">mg</td>
                                 <td width="10">)</td>
                                 <td width="100">
-                                    <label-box :isChecked="record.prescription.anticoagulant==3?true:false" showValue='低分子肝素'></label-box> 
+                                    <label-box :isChecked="record.prescription.anticoagulant==3 || record.prescription.anticoagulant==6 || record.prescription.anticoagulant==7?true:false" showValue='低分子肝素'></label-box> 
                                 </td>
                                 
                                 <td width="10">(</td>

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

@@ -1511,8 +1511,10 @@ export default {
 
       if(predialysis != null && predialysis.id == 0){
         if (last_after != null) {
-          for (var key in last_after){
-            if (key != 'actual_treatment_hour' && key != 'actual_treatment_minute' && key != 'weight_loss' && key != 'weight_after'  && key != 'systolic_blood_pressure' && key != 'diastolic_blood_pressure' && key != 'pulse_frequency'  && key != 'actual_ultrafiltration'  ){
+          
+          if(this.$store.getters.xt_user.template_info.org_id==10101){
+            for (var key in last_after){
+            if (key != 'actual_treatment_hour' && key != 'actual_treatment_minute' && key != 'weight_loss' && key != 'weight_after'  && key != 'systolic_blood_pressure' && key != 'diastolic_blood_pressure' && key != 'pulse_frequency' ){
               this.$set(
                 this.form,
                 key,
@@ -1521,6 +1523,20 @@ export default {
 
             }
           }
+          }else{
+            for (var key in last_after){
+            if (key != 'actual_treatment_hour' && key != 'actual_treatment_minute' && key != 'weight_loss' && key != 'weight_after'  && key != 'systolic_blood_pressure' && key != 'diastolic_blood_pressure' && key != 'pulse_frequency'  && key != 'actual_ultrafiltration'  ){
+              this.$set(
+                this.form,
+                key,
+                last_after[key]
+              )
+
+             }
+           }
+          }
+        
+
         }
         // 5.15
         if(last_after.id > 0){

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

@@ -387,7 +387,7 @@
                 org_id == 10599 || 
                 org_id == 10612 ||
                 org_id == 10617 ||
-                org_id ==10580 || org_id ==10629 || org_id==10677 || org_id ==10667 || org_id ==10697 || org_id ==10635 || org_id ==10702) &&
+                org_id ==10580 || org_id ==10629 || org_id==10677 || org_id ==10667 || org_id ==10697 || org_id ==10635 || org_id ==10702 || org_id ==10090) &&
                 org_id!=10387
             "
           >
@@ -458,7 +458,7 @@
               && org_id!=10432 && org_id!=10445
               && org_id!=10410 && org_id!=10495 &&
                org_id!=10485 && org_id!=10395 && org_id!=10375
-               && org_id!=10480  && org_id!=10551 && org_id!=10597 && org_id!=10599 && org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10629 && org_id!=10677 && org_id!=10667 && org_id!=10697 && org_id!=10635  && org_id!=10702)
+               && org_id!=10480  && org_id!=10551 && org_id!=10597 && org_id!=10599 && org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10629 && org_id!=10677 && org_id!=10667 && org_id!=10697 && org_id!=10635  && org_id!=10702  && org_id!=10090)
               || org_id == 10387
             "
           >
@@ -529,7 +529,7 @@
                 org_id == 10410 ||
                 org_id == 10495  ||
                 org_id == 10395
-                || org_id == 10485 || org_id == 10375 || org_id ==10480 || org_id ==10551 || org_id ==10597 || org_id ==10599 || org_id ==10612 || org_id==10617 || org_id ==10580 || org_id ==10629 || org_id ==10677 || org_id == 10667 || org_id == 10693 || org_id == 10697 || org_id ==10635 || org_id ==10702)
+                || org_id == 10485 || org_id == 10375 || org_id ==10480 || org_id ==10551 || org_id ==10597 || org_id ==10599 || org_id ==10612 || org_id==10617 || org_id ==10580 || org_id ==10629 || org_id ==10677 || org_id == 10667 || org_id == 10693 || org_id == 10697 || org_id ==10635 || org_id ==10702 || org_id == 10090)
                 && org_id!=10387
             "
           >
@@ -584,7 +584,7 @@
               org_id!=10432 &&
               org_id!=10445 &&
               org_id!=10410 && org_id!=10495
-              && org_id!=10485 && org_id!=10395 && org_id!=10375 && org_id!=10480 && org_id!=10551 && org_id!=10597 && org_id!=10599&& org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10629 && org_id!=10677 && org_id!=10667 && org_id!=10693  && org_id!=10697  && org_id!=10635  && org_id!=10702) ||
+              && org_id!=10485 && org_id!=10395 && org_id!=10375 && org_id!=10480 && org_id!=10551 && org_id!=10597 && org_id!=10599&& org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10629 && org_id!=10677 && org_id!=10667 && org_id!=10693  && org_id!=10697  && org_id!=10635  && org_id!=10702 && org_id!=10090) ||
               org_id == 10387
             "
           >
@@ -1681,7 +1681,7 @@
                 org_id== 10432 ||
                 org_id== 10445 ||
                 org_id== 10410 ||
-                org_id == 10485 || org_id == 10375 || org_id == 10480 || org_id == 10551 || org_id ==10612 || org_id ==10580 || org_id ==10617 || org_id ==10667 || org_id == 10693 || org_id ==10697 || org_id ==10635 || org_id ==10702) &&
+                org_id == 10485 || org_id == 10375 || org_id == 10480 || org_id == 10551 || org_id ==10612 || org_id ==10580 || org_id ==10617 || org_id ==10667 || org_id == 10693 || org_id ==10697 || org_id ==10635 || org_id ==10702 || org_id == 10090) &&
                 org_id!=10387
             "
           >
@@ -1729,7 +1729,7 @@
               org_id!=10445 &&
               org_id!=10410 &&
               org_id!=10485 &&
-              org_id!=10375 &&  org_id!=10480 &&  org_id!=10551 && org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10667 && org_id!=10693 && org_id!=10697 && org_id!=10635 && org_id!=10702)
+              org_id!=10375 &&  org_id!=10480 &&  org_id!=10551 && org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10667 && org_id!=10693 && org_id!=10697 && org_id!=10635 && org_id!=10702 && org_id!=10090)
               || org_id == 10387
             "
           >
@@ -1802,7 +1802,7 @@
                 org_id == 10599 ||
                 org_id ==10612 || 
                 org_id ==10617 || 
-                org_id==10580 || org_id ==10629 || org_id == 10677 || org_id == 10667 || org_id == 10693 || org_id == 10697 || org_id == 10635 || org_id == 10702)
+                org_id==10580 || org_id ==10629 || org_id == 10677 || org_id == 10667 || org_id == 10693 || org_id == 10697 || org_id == 10635 || org_id == 10702 || org_id == 10090)
                 && org_id!=10387 && org_id!=10694
             "
           >
@@ -1875,7 +1875,8 @@
               org_id!=10693 &&
               org_id!=10697 &&
               org_id!=10635 &&
-              org_id!=10702
+              org_id!=10702 &&
+              org_id!=10090
               )
               || org_id == 10387 || org_id == 10694
             "

src/xt_pages/dialysis/template/DialysisPrintOrderForty.vue

@@ -576,7 +576,7 @@
                   <td width="20">mg</td>
                   <td width="10">)</td>
                   <td width="100">
-                      <label-box :isChecked="prescription.anticoagulant==3?true:false" showValue='低分子肝素'></label-box> 
+                      <label-box :isChecked="prescription.anticoagulant==3 || prescription.anticoagulant==6 || prescription.anticoagulant==7?true:false" showValue='低分子肝素'></label-box> 
                   </td>
                   
                   <td width="10">(</td>

src/xt_pages/stock/drugs/drugStockInOrder.vue

@@ -291,6 +291,12 @@
             <span v-if="scope.row.is_total == 0"> {{ scope.row.batch_number }}</span>
           </template>
         </el-table-column>
+
+        <el-table-column label="药品追溯码" align="center">
+          <template slot-scope="scope">
+             {{ scope.row.drug_code }}
+          </template>
+        </el-table-column>
         <el-table-column label="仓库名称" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.is_total == 0">

src/xt_pages/user/components/PatientSidebar.vue

@@ -180,10 +180,10 @@ export default {
               name: '1-10',
               label: '出院小结'
             },
-            {
-              name: '1-12',
-              label: '转归记录'
-            }
+            // {
+            //   name: '1-12',
+            //   label: '转归记录'
+            // }
 
           ]
         },
@@ -281,6 +281,10 @@ export default {
             },
           ]
         },
+        {
+          name: '7',
+          label: '转归记录',
+        },
 
       ],
       name:""
@@ -334,8 +338,6 @@ export default {
         this.$router.push({path:'/patient/patient/'+this.id+'/hospitalSummary'})
       } else if(name == '1-11'){
         this.$router.push({path:'/patient/patient/'+this.id+'/firstDisease'})
-      }else if(name == '1-12'){
-        this.$router.push({path:'/patient/patient/'+this.id+'/lapsoSummary'})
       } else if(name == '3-1'){
         this.$router.push({ path: '/patients/sickhistory?id=' + this.id })
 
@@ -386,6 +388,8 @@ export default {
         this.$router.push({path:'/patients/patient/' + this.id+'/Muscleforce'})
       }else if(name == '6-1'){
         this.$router.push({path: '/patients/patient/' + this.id+ '/Informedconsent'})
+      }else if(name == '7'){
+        this.$router.push({path:'/patient/patient/'+this.id+'/lapsoSummary'})
       }
 
     },
@@ -528,8 +532,6 @@ export default {
         })
       }else if(patientKey == '1-11'){
        this.$router.push({path: '/patients/patient/' + this.id + '/firstDisease'})
-      }else if(patientKey == '1-12'){
-        this.$router.push({path:'/patient/patient/'+this.id+'/lapsoSummary'})
       }else if (patientKey == '1-5') {
         this.$router.push({ path: '/patients/rescue?id=' + this.id })
       } else if (patientKey == '2-1') {
@@ -550,6 +552,8 @@ export default {
         })
       } else if (patientKey == '3-1') {
         this.$router.push({ path: '/patients/sickhistory?id=' + this.id })
+      }else if(patientKey == '7'){
+        this.$router.push({path:'/patient/patient/'+this.id+'/lapsoSummary'})
       }
 
      }else{

src/xt_pages/user/lapsoSummary.vue

@@ -1,23 +1,25 @@
 <template>
     <div class="patient-container">
-      <patient-sidebar :id="patientID" defaultActive="1-12" v-on:tran-patient="onTranPatient"></patient-sidebar>
+      <patient-sidebar :id="patientID" defaultActive="7" v-on:tran-patient="onTranPatient"></patient-sidebar>
       <div class="patient-app-container advice-container app-container">
         <div style="display:flex;justify-content: space-between;align-items: center;margin-bottom: 12px;">
            <span style="font-weight:bold;">转归记录列表</span>
            <el-button size="medium" type="primary" @click="dialogVisible =true">新增</el-button>
         </div>
         <el-table class="oictable" :data="tableData" border style="width:100%">
-        <el-table-column prop="start_time" label="转出日期" align="center">
+        <el-table-column prop="start_time" label="日期" align="center">
             <template slot-scope="scope">
               <span>{{ getTime(scope.row.record_date)}}</span>
             </template>
        </el-table-column>
         <el-table-column prop="blood_access_part_opera_id" label="转归类型" align="center">
           <template slot-scope="scope">
-             <span v-if="scope.row.lapse_type == 1">转出</span>
-             <span v-if="scope.row.lapse_type == 2">院内转诊</span>
+             <span v-if="scope.row.lapse_type == 1">转入</span>
+             <span v-if="scope.row.lapse_type == 2">转出</span>
+             <span v-if="scope.row.lapse_type == 3">死亡</span>
+             <span v-if="scope.row.lapse_type == 4">院内转诊</span>
           </template>
-       </el-table-column>
+        </el-table-column>
        <el-table-column prop="blood_access_part_id" label="转归分类" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.lapse_class == 1">终止透析</span>
@@ -29,7 +31,7 @@
             <span v-if="scope.row.lapse_class == 7">变更透析医院</span>
           </template>
        </el-table-column>
-        <el-table-column prop="inflow_pass" label="转归原因"  align="center">
+        <el-table-column prop="inflow_pass" label="原因"  align="center">
            <template slot-scope="scope">
               {{ scope.row.lapse_reason }}
            </template>
@@ -78,7 +80,7 @@
           :total="total"></el-pagination>
   
         <el-dialog
-            title="新增"
+            title="新增转归记录"
             :visible.sync="dialogVisible"
             width="65%"
             center>
@@ -98,17 +100,56 @@
                  </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="24">
+            <el-row :gutter="24" v-if="lapseto == 1">
+                <el-col :span="24">
+                    <el-form-item label="转归类型:"> 
+                        <el-radio-group style="padding: 10px;" v-model="lapse_type">
+                            <el-radio  label="2">转出</el-radio>
+                            <el-radio  label="3">死亡</el-radio>
+                            <el-radio  label="4">院内转诊</el-radio>
+                      </el-radio-group>
+                    </el-form-item>
+                </el-col>
+            </el-row>
+            <el-row :gutter="24" v-if="lapseto == 2">
                 <el-col :span="24">
                     <el-form-item label="转归类型:"> 
                         <el-radio-group style="padding: 10px;" v-model="lapse_type">
-                            <el-radio  label="1">转出</el-radio>
-                            <el-radio  label="2">院内转诊</el-radio>
+                            <el-radio  label="1">转入</el-radio>
+                      </el-radio-group>
+                    </el-form-item>
+                </el-col>
+            </el-row>
+
+            <el-row :gutter="24" v-if="lapse_type == 3">
+                <el-col :span="24">
+                    <el-form-item label="住院/门诊:"> 
+                      <el-radio-group style="padding: 10px;" v-model="his_type">
+                            <el-radio  label="1">门诊</el-radio>
+                            <el-radio  label="2">住院</el-radio>
                       </el-radio-group>
                     </el-form-item>
                 </el-col>
             </el-row>
 
+
+            <el-row :gutter="24" v-if="lapse_type == 3 && his_type==2">
+                <el-col :span="24">
+                    <el-form-item label="病区:"> 
+                       <el-input style="width: 200px" v-model="his_zone"></el-input> 
+                    </el-form-item>
+                </el-col>
+            </el-row>
+
+            <el-row :gutter="24" v-if="lapse_type == 3 && his_type==2">
+                <el-col :span="24">
+                    <el-form-item label="床号:"> 
+                        <el-input style="width: 200px" v-model="his_bed"></el-input> 
+                    </el-form-item>
+                </el-col>
+            </el-row>
+
+          
             <el-row :gutter="24">
                 <el-col :span="24">
                     <el-form-item label="转归分类:"> 
@@ -120,22 +161,26 @@
                             <el-radio  label="5">转腹膜透析</el-radio>
                             <el-radio  label="6">其他</el-radio>
                             <el-radio  label="7">变更透析医院</el-radio>
+                            <el-radio  label="8">住院</el-radio>
+                            <el-radio  label="9">转血透科</el-radio>
                       </el-radio-group>
                     </el-form-item>
                 </el-col>
             </el-row>
 
+            
+
             <el-row :gutter="24">
                 <el-col :span="24">
-                    <el-form-item label="转出原因:"> 
-                        <el-input style="width: 300px;height: 50px;"  type="textarea" v-model="lapse_reason"></el-input>
+                    <el-form-item label="原因:"> 
+                        <el-input style="width: 300px;height: 100px;"  type="textarea" v-model="lapse_reason"></el-input>
                     </el-form-item>
                 </el-col>
             </el-row>
 
             <el-row :gutter="24">
                 <el-col :span="24">
-                    <el-form-item label="转出日期:"> 
+                    <el-form-item label="日期:"> 
                         <el-date-picker
                             v-model="record_date"
                             type="date"
@@ -180,7 +225,7 @@
 
 
         <el-dialog
-            title="编辑"
+            title="编辑转归记录"
             :visible.sync="editDialogVisible"
             width="65%"
             center>
@@ -204,13 +249,42 @@
                 <el-col :span="24">
                     <el-form-item label="转归类型:"> 
                         <el-radio-group style="padding: 10px;" v-model="lapse_type">
-                            <el-radio  label="1">转出</el-radio>
-                            <el-radio  label="2">院内转诊</el-radio>
+                            <el-radio  label="2">转出</el-radio>
+                            <el-radio  label="3">死亡</el-radio>
+                            <el-radio  label="4">院内转诊</el-radio>
+                           
                       </el-radio-group>
                     </el-form-item>
                 </el-col>
             </el-row>
 
+            <el-row :gutter="24" v-if="lapse_type == 3">
+                <el-col :span="24">
+                    <el-form-item label="住院/门诊:"> 
+                      <el-radio-group style="padding: 10px;" v-model="his_type">
+                            <el-radio  label="1">门诊</el-radio>
+                            <el-radio  label="2">住院</el-radio>
+                      </el-radio-group>
+                    </el-form-item>
+                </el-col>
+            </el-row>
+
+            <el-row :gutter="24" v-if="lapse_type == 3 && his_type==2">
+                <el-col :span="24">
+                    <el-form-item label="病区:"> 
+                       <el-input style="width: 200px" v-model="his_zone"></el-input> 
+                    </el-form-item>
+                </el-col>
+            </el-row>
+
+            <el-row :gutter="24" v-if="lapse_type == 3 && his_type==2">
+                <el-col :span="24">
+                    <el-form-item label="床号:"> 
+                        <el-input style="width: 200px" v-model="his_bed"></el-input> 
+                    </el-form-item>
+                </el-col>
+            </el-row>
+
             <el-row :gutter="24">
                 <el-col :span="24">
                     <el-form-item label="转归分类:"> 
@@ -222,22 +296,26 @@
                             <el-radio  label="5">转腹膜透析</el-radio>
                             <el-radio  label="6">其他</el-radio>
                             <el-radio  label="7">变更透析医院</el-radio>
+                            <el-radio  label="8">住院</el-radio>
+                            <el-radio  label="9">转血透科</el-radio>
                       </el-radio-group>
                     </el-form-item>
                 </el-col>
             </el-row>
 
+         
+
             <el-row :gutter="24">
                 <el-col :span="24">
-                    <el-form-item label="转出原因:"> 
-                        <el-input style="width: 300px;height: 50px;"  type="textarea" v-model="lapse_reason"></el-input>
+                    <el-form-item label="原因:"> 
+                        <el-input style="width: 300px;height: 100px;"  type="textarea" v-model="lapse_reason"></el-input>
                     </el-form-item>
                 </el-col>
             </el-row>
 
             <el-row :gutter="24">
                 <el-col :span="24">
-                    <el-form-item label="转出日期:"> 
+                    <el-form-item label="日期:"> 
                         <el-date-picker
                             v-model="record_date"
                             type="date"
@@ -392,7 +470,11 @@
           page:1,
           total:0,
           id:0,
-          admin_user_id:this.$store.getters.xt_user.user.id
+          admin_user_id:this.$store.getters.xt_user.user.id,
+          lapseto:0,
+          his_type:"1",
+          his_zone:"",
+          his_bed:"",
         }
       },
       methods: {
@@ -445,7 +527,13 @@
         getPatientById(id).then(response=>{
            if(response.data.state ==1){
              var patient = response.data.data.patients
-            
+             if(patient.lapseto == 1){
+               this.lapse_type="2"
+             }
+             if(patient.lapseto == 2){
+               this.lapse_type="1"
+             }
+             this.lapseto = patient.lapseto
              this.dialysis_no = patient.dialysis_no
              this.name = patient.name
              
@@ -460,7 +548,44 @@
           }
         })
       },
+      getLapseType(id){
+        var name = ""
+        if(id == 1){
+          name = "终止透析"
+        }
+        if(id == 2){
+          name = "转出院外"
+        }
+        if(id == 3){
+          name = "回居住地透析"
+        }
+        if(id == 4){
+          name = "临时透析"
+        }
+        if(id == 5){
+          name = "转腹膜透析"
+        }
+        if(id == 6){
+          name = "其他"
+        }
+        if(id == 7){
+          name = "变更透析医院"
+        }
+        if(id == 8){
+          name = "住院"
+        }
+        if(id == 9){
+          name = "转血透科"
+        }
+
+        return name
+
+      },
       savePatientLapse(){
+          if(this.lapse_type!=1 && this.lapse_reason == ""){
+             this.$message.error("转出或者死亡原因不能为空!")
+             return false
+          }
           var params = {
             patient_id:this.patientID,
             lapse_type:parseInt(this.lapse_type),
@@ -469,6 +594,10 @@
             record_date:this.record_date,
             admin_user_id:this.admin_user_id,
             remark:this.remark,
+            lapse_type_name:this.getLapseType(this.lapse_type),
+            his_bed:this.his_bed,
+            his_type: parseInt(this.his_type),
+            his_zone:this.his_zone,
           }
           console.log("params=====",params)
         savePatientLapse(params).then(response=>{
@@ -509,6 +638,9 @@
              this.record_date = this.getTime(lapsorecord.record_date)
              this.remark = lapsorecord.remark
              this.admin_user_id = lapsorecord.admin_user_id
+             this.his_bed = lapsorecord.his_bed
+             this.his_zone = lapsorecord.his_zone
+             this.his_type = lapsorecord.his_type
              this.id = lapsorecord.id
              this.editDialogVisible = true
            
@@ -517,16 +649,25 @@
 
       },
       updatePatientLapse(){
+        if (this.lapse_type !=1 &&this.lapse_reason == ""){
+             this.$message.error("转出或者死亡原因不能为空!")
+             return false
+        }
         var params = {
             patient_id:this.patientID,
             lapse_type:parseInt(this.lapse_type),
             lapse_class:parseInt(this.lapse_class), 
+            lapse_type_name:this.getLapseType(this.lapse_type),
             lapse_reason:this.lapse_reason,
             record_date:this.record_date,
             admin_user_id:this.admin_user_id,
             remark:this.remark,
             id:this.id,
+            his_bed:this.his_bed,
+            his_type:parseInt(this.his_type),
+            his_zone:this.his_zone,
           }
+         
         updatePatientLapseRecord(params).then(response=>{
            if(response.data.state== 1){
              var record = response.data.data.record

src/xt_pages/user/patients.vue

@@ -466,6 +466,7 @@
         </el-table-column>
         <el-table-column label="操作" align="center" min-width="140">
           <template slot-scope="scope">
+           
             <el-tooltip
               class="item"
               effect="dark"
@@ -478,6 +479,7 @@
                 size="small"
                 @click="OpenSetLapseto(scope.row, scope.$index)"
               ></el-button>
+              
             </el-tooltip>
             <el-tooltip
               class="item"
@@ -1421,15 +1423,18 @@
         )
       },
       OpenSetLapseto(row, index) {
-        // if(row.lapseto == 1){
-        //   this.lapeseto = "转出"
-        // }
-        // if(row.lapseto == 2){
-        //   this.lapeseto = "留治"
-        // }
-        // if(row.lapeseto == 3){
-        //   this.lapeseto = "死亡"
-        // }
+        //  this.$router.push({path:"/patients/patient/"+row.id})
+        // this.$router.push({path:'/patient/patient/'+row.id+'/lapsoSummary'})
+       
+        if(row.lapseto == 1){
+          this.lapeseto = "转出"
+        }
+        if(row.lapseto == 2){
+          this.lapeseto = "留治"
+        }
+        if(row.lapeseto == 3){
+          this.lapeseto = "死亡"
+        }
         this.patient = row
         this.currentIndex = index
         this.lapsetoForm.lapseto_time = ''