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

src/api/patient.js

     method:"get",
     params:params
   })
+}
+
+export function getPatientAllagic(id,params){
+  return request({
+    url:"/api/patient/getpatientallagic?id="+id,
+    method:"get",
+    params:params
+  })
 }

src/xt_pages/user/components/PatientDetail.vue

                 </el-form-item>
               </el-col>
 
+
+              <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
+                <el-form-item
+                  label="流转地: "
+                >
+                <el-select v-model="form.patient_address" placeholder="请选择">
+                    <el-option
+                      v-for="item in liuAddresslist"
+                      :key="item.id"
+                      :label="item.name"
+                      :value="item.name">
+                    </el-option>
+                 </el-select>
+                </el-form-item>
+              </el-col>
+           
+
               <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
                 <el-form-item
-                  label="患者去向时间 : "
+                  label="流转开始时间 : "
                 >
                 <el-date-picker
                   size="small"
-                  disabled
                   v-model="form.patient_start_time"
                   prefix-icon="el-icon-date"
                   :editable="false"
                 </el-form-item>
               </el-col>
 
+              <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
+                <el-form-item
+                  label="流转结束时间 : "
+                >
+                <el-date-picker
+                  size="small"
+                  v-model="form.patient_end_time"
+                  prefix-icon="el-icon-date"
+                  :editable="false"
+                  style="width: 150px;"
+                  type="date"
+                  placeholder="选择日期时间"
+                  align="right"
+                  format="yyyy-MM-dd"
+                  value-format="yyyy-MM-dd"
+                  @change="startTimeChange"
+                 ></el-date-picker>
+                </el-form-item>
+              </el-col> 
+
                 <el-col :span="8" style="margin-bottom: 20px;">
                 <el-form-item
                   label="备注 : "
                 </el-checkbox-group>
               </el-form-item>
 
+              <el-col :span="24">
+                 <el-form-item label="传染病细分:" v-if="form.is_infectious == '2'">
+                    <el-input v-model="form.infectious_remark"></el-input>
+                 </el-form-item>
+              </el-col>
+
               <el-form-item label="疑难内瘘:">
                 <el-radio-group v-model="form.troble_shoot" disabled>
                   <el-radio :label="1">是</el-radio>
               </el-form-item>
             </el-col>
           </el-row>
+          <el-row :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="过敏史 : " prop="past_history">
+                <el-input
+                  type="textarea"
+                  :rows="3"
+                  v-model="form.allergic_history"
+                  resize="none"
+                  placeholder=""
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
           <el-row :gutter="24">
             <el-col :span="24">
               <el-form-item label="体格检查">
                 </tr>
                 <tr>
                   <td>
-                    <div class="td_proj_title" v-if="org_id !=10278 && org_id!=10138 && org_id!=0">传<br />染<br />病</div>
-                    <div class="td_proj_title" v-if="org_id==10138 || org_id == 10278 || org_id == 0">过<br />敏<br />史</div>
+                    <div class="td_proj_title">过敏史</div>
+                    <!-- <div class="td_proj_title" v-if="org_id !=10278 && org_id!=10138 && org_id!=0">传<br />染<br />病</div>
+                    <div class="td_proj_title" v-if="org_id==10138 || org_id == 10278 || org_id == 0">过<br />敏<br />史</div> -->
                   </td>
                   <td colspan="7">
                     <div class="td_proj_content td_align_left">
-                      {{ patientPrint.contagions }}
+                      {{ patientPrint.allergic_history }}
                     </div>
                   </td>
                 </tr>
   record_number:"",
   patient_source:"",
   patient_start_time:"",
+  patient_end_time:"",
+  patient_address:"",
+  infectious_remark:"",
+  allergic_history:"",
 };
 
 export default {
         {value:1,label:"门诊"},
         {value:2,label:"住院"},
         {value:3,label:"请假"},
-        {value:4,label:"备注"}
+        {value:4,label:"流转"}
       ],
       generic_info_fold: true,
       treat_info_fold: true,
         { id: 2, name: "否" },
       ],
       operators:[],
+      liuAddresslist:[],
     };
   },
   computed: {
     },
   },
   created() {
+    this.liuAddresslist = getDataConfig('hemodialysis', 'liu_address')
+    console.log("liuAddresslist",this.liuAddresslist)
     this.org_id = this.$store.getters.xt_user.org.id;
     this.form.doctor = this.$store.getters.xt_user.user.id
     console.log("owowow",this.$store.getters.xt_user.user.id)
                 "{y}-{m}-{d}"
               );
             }
+
+            if (patietInfo.patient_end_time != 0) {
+              this.form.patient_end_time = uParseTime(
+                patietInfo.patient_end_time,
+                "{y}-{m}-{d}"
+              );
+            }
+            this.form.patient_address = patietInfo.patient_address
+            this.form.allergic_history = patietInfo.allergic_history
+            this.form.infectious_remark = patietInfo.infectious_remark
             // this.form.initial = patietInfo.initial_dialysis + "";
             // this.form.dialysisTotal = patietInfo.total_dialysis + "";
             // this.form.assessment = patietInfo.evaluate;
               this.patientPrint.hospital_first_dialysis_date = "";
             }
 
-          
+           
 
             this.checkIdCardNo();
           } else {

src/xt_pages/user/components/PatientForm.vue

            
 
             
-              <!-- <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
+              <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
                 <el-form-item
-                  label="流转地址: "
+                  label="流转地: "
                 >
                 <el-select v-model="form.patient_address" placeholder="请选择">
                     <el-option
                     </el-option>
                  </el-select>
                 </el-form-item>
-              </el-col> -->
+              </el-col>
            
  
              
                 </el-form-item>
               </el-col>
 
-              <!-- <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
+              <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
                 <el-form-item
                   label="流转结束时间 : "
                 >
                   @change="startTimeChange"
                  ></el-date-picker>
                 </el-form-item>
-              </el-col> -->
+              </el-col> 
            
              
 
 
               </el-col>
 
-              <!-- <el-col :span="24">
+              <el-col :span="24">
                  <el-form-item label="传染病细分:" v-if="form.is_infectious == '2'">
                     <el-input v-model="form.infectious_remark"></el-input>
                  </el-form-item>
-              </el-col> -->
+              </el-col>
 
               <el-col :span="8">
                 <el-form-item label="疑难内瘘 : " prop="contagions">
               </el-form-item>
             </el-col>
           </el-row>
-          <!-- <el-row :gutter="24">
+          <el-row :gutter="24">
             <el-col :span="24">
               <el-form-item label="过敏史 : " prop="past_history">
                 <el-input
                 ></el-input>
               </el-form-item>
             </el-col>
-          </el-row> -->
+          </el-row>
           <el-row :gutter="24">
             <el-col :span="24">
               <el-form-item label="体格检查">
     }
   },
   created() {
-  // this.liuAddresslist = getDataConfig('hemodialysis', 'liu_address')
-  // console.log("liuAddresslist",this.liuAddresslist)
+    this.liuAddresslist = getDataConfig('hemodialysis', 'liu_address')
+    console.log("liuAddresslist",this.liuAddresslist)
    this.fetchAllAdminUsers();
  
 
               this.form.gender = patietInfo.gender;
             }
             this.form.birth = uParseTime(patietInfo.birthday, "{y}-{m}-{d}");
-            console.log("中共232323232322323我-------------",this.form.birth)
+           
             this.form.nation = patietInfo.nation;
             this.form.native_place = patietInfo.native_place;
             this.form.height = patietInfo.height + "";
                 "{y}-{m}-{d}"
               );
             }
+
+            if (patietInfo.patient_end_time != 0) {
+              this.form.patient_end_time = uParseTime(
+                patietInfo.patient_end_time,
+                "{y}-{m}-{d}"
+              );
+            }
+            this.form.patient_address = patietInfo.patient_address
+            this.form.allergic_history = patietInfo.allergic_history
+            this.form.infectious_remark = patietInfo.infectious_remark
+
+
             this.checkIdCardNo();
           } else {
             this.$notify.error({

src/xt_pages/user/dialysisSolution.vue

       },
 
       'addPlan.dialysis_duration': function() {
-
-        this.addPlan.anticoagulant_zongliang = calculateAnticoagulantZL(1,
-          this.addPlan.anticoagulant_shouji,
-          this.addPlan.dialysis_duration,
-          this.addPlan.anticoagulant_weichi
-        )
+        
+        if(this.addPlan.id == 0){
+            this.addPlan.anticoagulant_zongliang = calculateAnticoagulantZL(1,
+            this.addPlan.anticoagulant_shouji,
+            this.addPlan.dialysis_duration,
+            this.addPlan.anticoagulant_weichi
+          )
+        }
+      
       },
       'addPlan.anticoagulant_shouji': function() {
-
-        this.addPlan.anticoagulant_zongliang = calculateAnticoagulantZL(1,
-          this.addPlan.anticoagulant_shouji,
-          this.addPlan.dialysis_duration,
-          this.addPlan.anticoagulant_weichi
-        )
-
-        if(this.$store.getters.xt_user.template_info.template_id == 41 && this.addPlan.anticoagulant == 2 ){
-          this.addPlan.anticoagulant_zongliang = ""
-          this.addPlan.anticoagulant_zongliang = parseInt(this.addPlan.anticoagulant_shouji) + parseInt(this.addPlan.anticoagulant_weichi)
+      
+         if(this.addPlan.id == 0){
+            this.addPlan.anticoagulant_zongliang = calculateAnticoagulantZL(1,
+            this.addPlan.anticoagulant_shouji,
+            this.addPlan.dialysis_duration,
+            this.addPlan.anticoagulant_weichi
+          )
+         }
+     
+       
+        if(this.addPlan.id == 0){
+          if(this.$store.getters.xt_user.template_info.template_id == 41 && this.addPlan.anticoagulant == 2 ){
+            this.addPlan.anticoagulant_zongliang = ""
+            this.addPlan.anticoagulant_zongliang = parseInt(this.addPlan.anticoagulant_shouji) + parseInt(this.addPlan.anticoagulant_weichi)
+         }
         }
+      
 
       },
       'addPlan.anticoagulant_weichi': function() {
-        this.addPlan.anticoagulant_zongliang = calculateAnticoagulantZL(
-          1,
-          this.addPlan.anticoagulant_shouji,
-          this.addPlan.dialysis_duration,
-          this.addPlan.anticoagulant_weichi
-        )
 
-        if(this.$store.getters.xt_user.template_info.template_id == 41 && this.addPlan.anticoagulant == 2 ){
-          this.addPlan.anticoagulant_zongliang = ""
-          this.addPlan.anticoagulant_zongliang = parseInt(this.addPlan.anticoagulant_shouji) + parseInt(this.addPlan.anticoagulant_weichi)
-        }
+        if(this.addPlan.id == 0){
+            this.addPlan.anticoagulant_zongliang = calculateAnticoagulantZL(
+            1,
+            this.addPlan.anticoagulant_shouji,
+            this.addPlan.dialysis_duration,
+            this.addPlan.anticoagulant_weichi
+         )
+        }
+      
+        
+        if(this.addPlan.id == 0){
+          if(this.$store.getters.xt_user.template_info.template_id == 41 && this.addPlan.anticoagulant == 2 ){
+            this.addPlan.anticoagulant_zongliang = ""
+            this.addPlan.anticoagulant_zongliang = parseInt(this.addPlan.anticoagulant_shouji) + parseInt(this.addPlan.anticoagulant_weichi)
+         }
+        }
+      
       }
     },
 
         this.getDialysisSolutionDetailList()
       },
       openEdit(index, row) {
-       
+        console.log("rowsoososososso",row)
         this.current_index = index
         this.addPlan.id = row.id
         this.addPlan.mode = row.mode_id
 
         this.addPlan.amylaceum = row.amylaceum
         this.addPlan.chaptalization = row.chaptalization
+
+
       },
       isShows(name) {
         var filedList = store.getters.xt_user.fileds

src/xt_pages/user/patients.vue

             <el-tooltip
               class="item"
               effect="dark"
-              content="预览"
+              content="流转记录"
               placement="top"
             >
               <el-button
                 type="danger"
                 icon="el-icon-tickets"
                 size="small"
-                @click="
-                  OpenView(scope.row.name, scope.row.dialysis_no, scope.row.id)
-                "
+                @click="toOpen(scope.row.id)"
               ></el-button>
             </el-tooltip>
 
           ></el-pagination>
     </el-dialog>
 
+    <el-dialog
+        title="流转记录"
+        :visible.sync="patieintDialogVisible"
+        width="50%">
+        <span>
+          <el-table
+            :data="patientAllgicList"
+            border
+            style="width: 100%">
+            <el-table-column  prop="date" label="流转地"  width="180"  align="center">
+              <template  slot-scope="scope">
+                 {{ scope.row.patient_address }}
+
+              </template>
+            </el-table-column>
+            <el-table-column  prop="name" label="流转开始时间"  width="180"   align="center">
+              <template  slot-scope="scope"  >
+                 {{ getTime(scope.row.start_time) }}
+
+              </template>
+            </el-table-column>
+
+            <el-table-column  prop="name" label="开始流转结束时间"  width="180"   align="center">
+              <template  slot-scope="scope"  >
+                {{ getTime(scope.row.end_time) }}
+
+              </template>
+            </el-table-column>
+            <el-table-column  prop="address"  label="流转地址"   align="center">
+              <template  slot-scope="scope" >
+                {{ scope.row.patient_address }}
+              </template>
+            </el-table-column>
+
+            <el-table-column  prop="address"  label="备注"   align="center">
+              <template  slot-scope="scope">
+                {{ scope.row.remake }}
+              </template>
+            </el-table-column>
+          </el-table>
+
+        </span>
+        <span slot="footer" class="dialog-footer">
+          <el-button @click="patieintDialogVisible = false">取 消</el-button>
+        </span>
+    </el-dialog>
+
   </div>
 </template>
 
 <script>
-  import { code, EditLapseto, fetchList, getMaxDialysisNo, OpenView, postExportPatients,GetRemind } from '@/api/patient'
+  import { code, EditLapseto, fetchList, getMaxDialysisNo, OpenView, postExportPatients,GetRemind,getPatientAllagic } from '@/api/patient'
   import { generateLog } from '@/api/config'
   import QRCode from 'qrcodejs2'
   import Vue from 'vue'
         exportVisible:false,
         phoneVisible:false,
         idCardNoVisible:false,
+        patieintDialogVisible:false,
         wechatbindimg: '',
         isShow:true,
         active: true,
           {value:1,label:"门诊",source:1,lapeseto:1},
           {value:2,label:"住院",source:2,lapeseto:2},
           {value:3,label:"请假",source:3,lapeseto:3},
-          {value:4,label:"备注",source:4,lapeseto:4}
+          {value:4,label:"流转",source:4,lapeseto:4}
        ],
         lapsetoArr: [
           { value: 0, label: '全部', source: 0, lapseto: 0 },
         gridData:[],
         totalOne: 0,
         page: 1,
-        limit: 5
+        limit: 5,
+        patientAllgicList:[]
       }
     },
     created() {
             return false
           } else {
             this.tableData = response.data.data.patients
-
+            console.log("wowowowo",this.tableData)
             this.pageTotal = this.tableData.length
             this.total = response.data.data.total
 
         return jsGetAge(birth, '-');
       }
     },
+    toOpen(id){
+      getPatientAllagic(id).then(response=>{
+        if(response.data.state == 1){
+          var list =  response.data.data.list
+          this.patieintDialogVisible=  true
+          this.patientAllgicList = list
+        }
+      })
+    }
     }
   }
   Vue.prototype.$QRCode = function() {