Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -1412,6 +1412,9 @@
                         <span v-if="record.prescription.anticoagulant == 16"
                           >mg</span
                         >
+                        <span v-if="record.prescription.anticoagulant == 15"
+                          >mg</span
+                        >
                         <span v-if="record.prescription.anticoagulant == 17"
                           >U</span
                         >

src/xt_pages/dialysis/batch_print/batch_print_order_sixtyeight.vue

@@ -1181,6 +1181,9 @@
                         <span v-if="record.prescription.anticoagulant == 1"
                           >mg</span
                         >
+                        <span v-if="record.prescription.anticoagulant == 15"
+                          >mg</span
+                        >
                       </div>
                       <div class="inline_block" style="margin-left: 20px" v-if=" record.prescription.anticoagulant !=1">
                         维持：
@@ -1229,6 +1232,9 @@
                         <span v-if="record.prescription.anticoagulant == 1"
                           >mg/h</span
                         >
+                        <span v-if="record.prescription.anticoagulant == 15"
+                          >mg/h</span
+                        >
                       </div>
                       <div class="inline_block" style="margin-left: 20px" v-if=" record.prescription.anticoagulant !=1">
                         总量：
@@ -1255,6 +1261,9 @@
                         <span v-if="record.prescription.anticoagulant == 1"
                           >mg</span
                         >
+                        <span v-if="record.prescription.anticoagulant == 15"
+                          >mg</span
+                        >
                       </div>
 
                       <div class="inline_block" style="margin-left: 20px">

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -173,13 +173,13 @@
         </li> -->
 
 
-        <li v-if="isShow('处方脱水量') && this.$store.getters.xt_user.template_info.org_id != 10597 && this.$store.getters.xt_user.template_info.org_id != 10571  && this.$store.getters.xt_user.template_info.org_id != 10612 && this.$store.getters.xt_user.template_info.org_id != 10598 && this.$store.getters.xt_user.template_info.org_id != 10677 && this.$store.getters.xt_user.template_info.org_id != 10679 && this.$store.getters.xt_user.template_info.org_id != 10702 && this.$store.getters.xt_user.template_info.org_id != 10635">
+        <li v-if="isShow('处方脱水量') && this.$store.getters.xt_user.template_info.org_id != 10597 && this.$store.getters.xt_user.template_info.org_id != 10571  && this.$store.getters.xt_user.template_info.org_id != 10612 && this.$store.getters.xt_user.template_info.org_id != 10598 && this.$store.getters.xt_user.template_info.org_id != 10677 && this.$store.getters.xt_user.template_info.org_id != 10679 && this.$store.getters.xt_user.template_info.org_id != 10702 && this.$store.getters.xt_user.template_info.org_id != 10635 && this.$store.getters.xt_user.template_info.org_id != 10721">
           <label>处方脱水量 : </label>
           <span class="content">{{ prescription_water != "0" ? prescription_water : "" }}</span>
           <span class="unit">{{ prescription_water != "0" ? "ml" : "" }}</span>
         </li>
 
-        <li v-if="isShow('处方脱水量') && this.$store.getters.xt_user.template_info.org_id == 10597 ||  this.$store.getters.xt_user.template_info.org_id == 10571 || this.$store.getters.xt_user.template_info.org_id == 10612  || this.$store.getters.xt_user.template_info.org_id == 10598 || this.$store.getters.xt_user.template_info.org_id == 10677 || this.$store.getters.xt_user.template_info.org_id == 10679 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10635">
+        <li v-if="isShow('处方脱水量') && this.$store.getters.xt_user.template_info.org_id == 10597 ||  this.$store.getters.xt_user.template_info.org_id == 10571 || this.$store.getters.xt_user.template_info.org_id == 10612  || this.$store.getters.xt_user.template_info.org_id == 10598 || this.$store.getters.xt_user.template_info.org_id == 10677 || this.$store.getters.xt_user.template_info.org_id == 10679 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10635 || this.$store.getters.xt_user.template_info.org_id == 10721">
           <label>处方脱水量 : </label>
           <span class="content">{{ prescription_water != "0" ? prescription_water : "" }}</span>
           <span class="unit">{{ prescription_water != "0" ? "L" : "" }}</span>

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

@@ -164,7 +164,7 @@
                     </el-col>
 
                     <el-col :span="8"
-                            v-if="isShows('处方脱水量') && this.$store.getters.xt_user.template_info.org_id != 10597&& this.$store.getters.xt_user.template_info.org_id != 10571 && this.$store.getters.xt_user.template_info.org_id != 10612 && this.$store.getters.xt_user.template_info.org_id != 10598 && this.$store.getters.xt_user.template_info.org_id != 10677 && this.$store.getters.xt_user.template_info.org_id != 10679 && this.$store.getters.xt_user.template_info.org_id != 10702 && this.$store.getters.xt_user.template_info.org_id != 10635">
+                            v-if="isShows('处方脱水量') && this.$store.getters.xt_user.template_info.org_id != 10597&& this.$store.getters.xt_user.template_info.org_id != 10571 && this.$store.getters.xt_user.template_info.org_id != 10612 && this.$store.getters.xt_user.template_info.org_id != 10598 && this.$store.getters.xt_user.template_info.org_id != 10677 && this.$store.getters.xt_user.template_info.org_id != 10679 && this.$store.getters.xt_user.template_info.org_id != 10702 && this.$store.getters.xt_user.template_info.org_id != 10635 && this.$store.getters.xt_user.template_info.org_id != 10721">
                         <el-form-item label="处方脱水量(ml)：" prop="prescription_water" :rules="isCheckmust('处方脱水量')">
                             <el-input
                                     type="number"
@@ -174,7 +174,7 @@
                     </el-col>
 
                     <el-col :span="8"
-                            v-if="isShows('处方脱水量') && this.$store.getters.xt_user.template_info.org_id == 10597 || this.$store.getters.xt_user.template_info.org_id ==10571 || this.$store.getters.xt_user.template_info.org_id ==10612 || this.$store.getters.xt_user.template_info.org_id ==10598 || this.$store.getters.xt_user.template_info.org_id ==10612 || this.$store.getters.xt_user.template_info.org_id ==10677 || this.$store.getters.xt_user.template_info.org_id==10679 || this.$store.getters.xt_user.template_info.org_id==10702 || this.$store.getters.xt_user.template_info.org_id==10635">
+                            v-if="isShows('处方脱水量') && this.$store.getters.xt_user.template_info.org_id == 10597 || this.$store.getters.xt_user.template_info.org_id ==10571 || this.$store.getters.xt_user.template_info.org_id ==10612 || this.$store.getters.xt_user.template_info.org_id ==10598 || this.$store.getters.xt_user.template_info.org_id ==10612 || this.$store.getters.xt_user.template_info.org_id ==10677 || this.$store.getters.xt_user.template_info.org_id==10679 || this.$store.getters.xt_user.template_info.org_id==10702 || this.$store.getters.xt_user.template_info.org_id==10635 || this.$store.getters.xt_user.template_info.org_id==10721">
                         <el-form-item label="处方脱水量(L)：" prop="prescription_water" :rules="isCheckmust('处方脱水量')">
                             <el-input
                                     type="number"

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

@@ -537,7 +537,7 @@
               {{
                 scope.row.ultrafiltration_rate
                   ? scope.row.ultrafiltration_rate
-                  : ""
+                  : "0"
               }}
             </template>
           </el-table-column>
@@ -592,7 +592,7 @@
               {{
                 scope.row.ultrafiltration_rate
                   ? scope.row.ultrafiltration_rate
-                  : ""
+                  : "0"
               }}
             </template>
           </el-table-column>

src/xt_pages/dialysis/details/index.vue

@@ -2756,7 +2756,7 @@ export default {
           newArr.sort(this.compare('created_time'))
         }
 
-        if(this.org_id == 0 || this.org_id == 10579 || this.org_id ==10587 || this.org_id == 10679){
+        if(this.org_id == 0 || this.org_id == 10579 || this.org_id ==10587 || this.org_id == 10679 || this.org_id == 10702){
           if(newArr!=null && newArr.length>0){
             for(let i=0;i<newArr.length;i++){
               newArr[i].sort =0

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -1439,6 +1439,7 @@
                      <span v-if="prescription.anticoagulant == 10">iu</span>
                      <span v-if="prescription.anticoagulant == 11">iu</span>
                      <span v-if="prescription.anticoagulant == 13">iu</span>
+                     <span v-if="prescription.anticoagulant == 15">mg</span>
                       <span v-if="prescription.anticoagulant == 4">mg</span>
                       <span v-if="prescription.anticoagulant == 3">iu</span>
                       <span v-if="org_id!=9538&& prescription.anticoagulant == 2">mg</span>
@@ -1463,6 +1464,7 @@
                      <span v-if="prescription.anticoagulant == 10">iu</span>
                      <span v-if="prescription.anticoagulant == 11">iu</span>
                      <span v-if="prescription.anticoagulant == 13">iu</span>
+                     <span v-if="prescription.anticoagulant == 15">mg</span>
                      <span v-if="prescription.anticoagulant == 14 || prescription.anticoagulant == 19">
                       <span v-if="org_id!=10644">mg</span>
                       <span v-if="org_id==10644">iu</span>
@@ -1514,6 +1516,7 @@
                             <span v-if="org_id==10644">iu/h</span>
                           </span>
                           <span v-if="prescription.anticoagulant == 17">U/h</span>
+                          <span v-if="prescription.anticoagulant == 15">mg/h</span>
                       </span>
                       <span v-if="org_id==9675 || org_id==10447 || org_id== 9829 || org_id == 10440 || org_id == 10469 || org_id == 10471 || org_id == 10460">
                         <span v-if="prescription.anticoagulant == 2">mg/h</span>
@@ -1532,6 +1535,7 @@
                             <span v-if="org_id==10644">iu/h</span>
                           </span>
                           <span v-if="prescription.anticoagulant == 17">U/h</span>
+                          <span v-if="prescription.anticoagulant == 15">mg/h</span>
                       </span>
                     </div>
                     <div
@@ -1596,6 +1600,7 @@
                       <span v-if="prescription.anticoagulant == 13">iu</span>
                       <span v-if="prescription.anticoagulant == 4">mg</span>
                       <span v-if="prescription.anticoagulant == 3">iu</span>
+                      <span v-if="prescription.anticoagulant == 15">mg</span>
 
                       <span v-if="org_id!=9538&& prescription.anticoagulant == 2">mg</span>
                       <span v-if="org_id==9538&& prescription.anticoagulant == 2">u</span>
@@ -1623,6 +1628,7 @@
                         <span v-if="org_id==10644">iu</span>
                       </span>
                       <span v-if="prescription.anticoagulant == 17">U</span>
+                      <span v-if="prescription.anticoagulant == 15">mg</span>
                     </span>
                     </div>
                     <div class="inline_block" style="margin-left: 20px" v-if="org_id!=9675 && org_id!=10447">

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyFive.vue

@@ -3715,9 +3715,9 @@ export default {
         //    this.advice_groups.push(group)
         //   }
         // }
-        if (this.doctor_advices.length <= 6) {
-          var nl = 6;
-          this.print_length = 6;
+        if (this.doctor_advices.length <= 4) {
+          var nl = 4;
+          this.print_length = 4;
 
           for (let index = 0; index < nl; index++) {
             if (

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyeight.vue

@@ -1067,8 +1067,9 @@
                      <span v-if="prescription.anticoagulant == 9">iu</span>
                      <span v-if="prescription.anticoagulant == 10">iu</span>
                      <span v-if="prescription.anticoagulant == 11">iu</span>
-                     <span v-if="prescription.anticoagulant == 13">iu</span>
-
+                     <span v-if="prescription.anticoagulant == 13||prescription.anticoagulant == 14">iu</span>
+                     <span v-if="prescription.anticoagulant == 15">mg</span>
+                     
                     </span>
                     </div>
                     <div class="inline_block" style="margin-left: 20px" v-if="prescription.anticoagulant != 1">
@@ -1096,7 +1097,8 @@
                           <span v-if="prescription.anticoagulant == 9">iu/h</span>
                           <span v-if="prescription.anticoagulant == 10">iu/h</span>
                           <span v-if="prescription.anticoagulant == 11">iu/h</span>
-                          <span v-if="prescription.anticoagulant == 13">iu/h</span>
+                          <span v-if="prescription.anticoagulant == 13 || prescription.anticoagulant == 14">iu/h</span>
+                          <span v-if="prescription.anticoagulant == 15">mg/h</span>
                       </span>
                     </div>
                     <div
@@ -1162,7 +1164,8 @@
                        <span v-if="prescription.anticoagulant == 9">iu</span>
                        <span v-if="prescription.anticoagulant == 10">iu</span>
                       <span v-if="prescription.anticoagulant == 11">iu</span>
-                      <span v-if="prescription.anticoagulant == 13">iu</span>
+                      <span v-if="prescription.anticoagulant == 13 || prescription.anticoagulant == 14">iu</span>
+                      <span v-if="prescription.anticoagulant == 15">mg</span>
                     </span>
                     </div>
                     <div class="inline_block" style="margin-left: 20px">

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -15,7 +15,7 @@
       type="primary"
       v-if="orgId !=10480"
       >明细导出
-     
+
     </el-button>
     <el-button
       style="float: right;margin-right:10px"
@@ -24,7 +24,7 @@
       type="primary"
       v-if="orgId ==10480"
       >明细导出
-     
+
     </el-button>
      <el-button
       style="float: right;margin-right:10px"
@@ -142,7 +142,7 @@
             {{ getManufactuerName(scope.row.manufacturer) }}
           </template>
         </el-table-column>
-<!-- 
+<!--
         <el-table-column label="进销商" align="center">
             <template slot-scope="scope">
               {{ getDealerName(scope.row.dealer) }}
@@ -189,13 +189,13 @@
             <span v-if="scope.row.is_total == 0">
               <span v-if="orgId!=9583">{{ scope.row.count }}</span>
               <span v-if="orgId ==9583">{{getStockCount(scope.row.good_id) }}</span>
-            </span> 
+            </span>
             <span v-if="scope.row.is_total == 1">
               {{scope.row.count}}
             </span>
           </template>
         </el-table-column>
-      
+
         <el-table-column label="总价" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.is_total == 0 && scope.row.price > 0">{{getTotal(scope.row.price, scope.row.count)}}</span>
@@ -265,7 +265,7 @@ export default {
     this.fetchAllAdminUsers();
     this.goodUnit = this.$store.getters.good_unit
     var org_id = this.$store.getters.xt_user.org.id
-   
+
     this.orgId = org_id
 
 
@@ -388,7 +388,7 @@ export default {
           this.wareOutList =  response.data.data.list
           this.patientsList = []
           this.patientsList = response.data.data.patientsList
-         
+
           var total = 0
           var objOne = {
             warehouse_out_order_number: "合计",
@@ -408,7 +408,7 @@ export default {
             this.cancelStockDate.push(obj);
             objOne.count += response.data.data.list[i].count
           }
-       
+
           this.cancelStockDate.push(objOne);
 
         }
@@ -479,7 +479,7 @@ export default {
             }
             objOne.count +=response.data.data.list[i].count
             obj["is_total"] = 0;
-            
+
             this.cancelStockDate.push(obj);
           }
 
@@ -602,14 +602,14 @@ export default {
      },
      getDealerNameOne(id){
        var dealer_name = ""
-     
+
        for(let i=0;i<this.dealerList.length;i++){
           if(id == this.dealerList[i].id){
               dealer_name = this.dealerList[i].dealer_name
           }
        }
        return dealer_name
-     }, 
+     },
     getManufactuerName: function(manufacturer_id) {
       for (let i = 0; i < this.manufacturer.length; i++) {
         if (this.manufacturer[i].id == manufacturer_id) {
@@ -755,7 +755,7 @@ export default {
     PrintAction: function() {
       window.sessionStorage.setItem('start',this.start_time)
       window.sessionStorage.setItem('end',this.end_time)
-     
+
       if(this.orgId != 9671){
         this.$router.push({
           path: "/stock/print",
@@ -782,7 +782,7 @@ export default {
           }
         });
       }
-    
+
     },
     // getPrintStockGood(){
     //   const params = {
@@ -887,7 +887,7 @@ export default {
       },
 
     exportList(){
-    
+
        for(let i=0;i<this.tableOut.length;i++){
         this.tableOut[i].index = i+1
         this.tableOut[i].good_name = this.tableOut[i].good_name
@@ -933,32 +933,32 @@ export default {
           this.tableOut[i].total_price = (this.getWarehouseOut(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
         }else if(this.orgId==10445){
           this.tableOut[i].total_price = (this.getStockCount(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
+        }else if(this.orgId==10635){
+           this.tableOut[i].total_price = (this.getWarehouseOut(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
         }else{
           this.tableOut[i].total_price = (this.getStockCount(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
         }
 
         if(this.orgId  == 10265 || this.orgId ==10215 || this.orgId == 9919 || this.orgId == 9671 || this.orgId == 10402 || this.orgId==10138 || this.orgId==10278||this.orgId==10537||this.orgId==10610||this.orgId==0){
-
-         this.tableOut[i].out_count = this.getMySelfCount(this.tableOut[i].good_id)
+            this.tableOut[i].out_count = this.getMySelfCount(this.tableOut[i].good_id)
         }
-        if(this.orgId == 10210 || this.orgId == 9675  || this.orgId == 9956 || this.orgId == 10217 || this.orgId == 10188 || this.orgId == 10191 || this.orgId == 0 || this.orgId ==10489 || this.orgId == 10375 || this.orgId == 10485 || this.org_id ==10635 || this.org_id ==10726 || this.org_id == 10724 || this.org_id ==10635 || this.org_id ==10724 || this.org_id ==10726 || this.org_id ==10721){
+        if(this.orgId == 10210 || this.orgId == 9675  || this.orgId == 9956 || this.orgId == 10217 || this.orgId == 10188 || this.orgId == 10191 || this.orgId == 0 || this.orgId ==10489 || this.orgId == 10375 || this.orgId == 10485 || this.orgId ==10635 || this.orgId ==10726 || this.orgId == 10724 || this.orgId ==10635 || this.orgId ==10724 || this.orgId ==10726 || this.orgId ==10721){
           this.tableOut[i].out_count = this.getWarehouseOut(this.tableOut[i].good_id)
-         
         }
         if(this.orgId ==10445){
           this.tableOut[i].out_count = this.getStockCount(this.tableOut[i].good_id)
         }
-        if(this.orgId!=10265 && this.orgId !=10215  && this.orgId != 9671 &&this.orgId!=10210&&this.orgId!=9675 && this.orgId!=9956&& this.orgId!=10217 && this.orgId!=10188 && this.orgId!=10191 && this.orgId!=9919 && this.orgId!=0&& this.orgId!=10402 && this.orgId != 10489 && this.orgId!=10375 && this.orgId!=10485&&this.orgId!=0&&this.orgId!=10138&&this.orgId!=10278&&this.orgId!=10537&&this.orgId!=10610 &&this.orgId!=10445 &&  this.org_id !=10635  &&  this.org_id !=10724 &&  this.org_id !=10726  &&  this.org_id !=10721){
+        if(this.orgId!=10265 && this.orgId !=10215  && this.orgId != 9671 &&this.orgId!=10210&&this.orgId!=9675 && this.orgId!=9956&& this.orgId!=10217 && this.orgId!=10188 && this.orgId!=10191 && this.orgId!=9919 && this.orgId!=0&& this.orgId!=10402 && this.orgId != 10489 && this.orgId!=10375 && this.orgId!=10485&&this.orgId!=0&&this.orgId!=10138&&this.orgId!=10278&&this.orgId!=10537&&this.orgId!=10610 &&this.orgId!=10445 &&  this.orgId !=10635  &&  this.orgId !=10724 &&  this.orgId !=10726  &&  this.orgId !=10721){
           this.tableOut[i].out_count = this.getStockCount(this.tableOut[i].good_id)
         }
         this.tableOut[i].manufacturer_name = this.getManufacturerNameOne(this.tableOut[i].manufacturer)
-       
+
         this.tableOut[i].dealer_name = this.getDealerNameOne(this.tableOut[i].dealer)
 
         this.tableOut[i].order_time = this.start_time + " ~ " + this.end_time
        }
        console.log("retusoossoso",this.tableOut)
-       
+
        import('@/vendor/Export2Excel').then(excel => {
        const tHeader = ['序号','耗材名称', '规格型号','生产厂商','进销商', '单位','数量','出货价','总价','出库时间','备注']
 
@@ -977,7 +977,7 @@ export default {
      },
      exportListDetail(){
         console.log("hahhdhafhhahdf",this.tableDataList)
-      
+
         var obj = {index:"合计",total_price:0}
         var total = 0
         for(let i=0;i<this.tableDataList.length;i++){
@@ -1007,7 +1007,7 @@ export default {
         }
         obj.total_price = total.toFixed(2)
         console.log("WOHHAHHAHAH",this.tableDataList)
-      
+
         this.tableDataList.push(obj)
        import('@/vendor/Export2Excel').then(excel => {
        const tHeader = ['序号','单据编号', '耗材类型', '耗材名称','规格型号','生产厂商','进销商','批号','生产日期','有效日期','操作时间','制单人','进货价','出货价','使用患者','数量','总价']
@@ -1049,7 +1049,7 @@ export default {
               this.tableDataList[i].ctimeTwo = this.getTimeOne(this.tableDataList[i].ctime)
               this.tableDataList[i].expiry_date = this.getTime(this.tableDataList[i].expiry_date)
               this.tableDataList[i].project_name ="居民报销"
-            
+
               out_total += this.tableDataList[i].count * this.tableDataList[i].price
               in_total += this.tableDataList[i].count *this.tableDataList[i].WarehousingInfoNight.price
 
@@ -1166,7 +1166,7 @@ export default {
       return total
     },
     getPatientName(id){
-     
+
       var name =""
       for(let i=0;i<this.patientsList.length;i++){
         if(id == this.patientsList[i].id){
@@ -1199,7 +1199,7 @@ export default {
 //   display: flex;
 //   flex-direction: column;
 //   .el-table__header-wrapper {
-//     height: 70px !important; 
+//     height: 70px !important;
 //   }
 // }
 </style>

src/xt_pages/user/components/PatientDetail.vue

@@ -393,6 +393,25 @@
               </el-form-item>
             </el-col>
 
+            <el-col :span="24" :style="isEdit ? 'width:600px' : ''">
+                <el-form-item
+                  label="患者类型 : "
+                  class="is-required"
+                  prop="source"
+                >
+                  <el-radio-group v-model="form.patient_type">
+                    <el-radio
+                      v-for="item in patientType"
+                      :key="item.value"
+                      :label="item.value"
+                      :value="item.value"
+                      >{{ item.label }}</el-radio
+                    >
+                  </el-radio-group>
+                </el-form-item>
+              </el-col>
+
+
             <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
                 <el-form-item
                   label="患者去向 : "
@@ -1647,6 +1666,7 @@ const defaultForm = {
   allergic_history:"",
   print_date:"",
   famality_record:"",
+  patient_type:"",
 };
 
 export default {
@@ -1753,6 +1773,7 @@ export default {
       operators:[],
       liuAddresslist:[],
       patientVascularAccessOne:{},
+      patientType: [{ value: 1, label: "血透患者" }, { value: 2, label: "慢病患者" }, { value: 3, label: "会员患者" },{ value: 4, label: "腹透患者" },{ value: 5, label: "CKD患者" },{ value: 6, label: "其他患者" }],
     };
   },
   computed: {
@@ -2036,6 +2057,9 @@ export default {
             this.form.allergic_history = patietInfo.allergic_history
             this.form.infectious_remark = patietInfo.infectious_remark
             this.form.famality_record  = patietInfo.famality_record
+            if(patietInfo.patient_type >0){
+               this.form.patient_type = patietInfo.patient_type
+            }
             // this.form.initial = patietInfo.initial_dialysis + "";
             // this.form.dialysisTotal = patietInfo.total_dialysis + "";
             // this.form.assessment = patietInfo.evaluate;
@@ -2371,6 +2395,7 @@ export default {
             } else {
               this.patientPrint.hospital_first_dialysis_date = "";
             }
+          
             // this.checkIdCardNo();
           } else {
             console.log("patient get err state");

src/xt_pages/user/components/PatientForm.vue

@@ -437,6 +437,26 @@
                   </el-radio-group>
                 </el-form-item>
               </el-col>
+
+              <el-col :span="24" :style="isEdit ? 'width:600px' : ''">
+                <el-form-item
+                  label="患者类型 : "
+                  class="is-required"
+                  prop="source"
+                >
+                  <el-radio-group v-model="form.patient_type">
+                    <el-radio
+                      v-for="item in patientType"
+                      :key="item.value"
+                      :label="item.value"
+                      :value="item.value"
+                      >{{ item.label }}</el-radio
+                    >
+                  </el-radio-group>
+                </el-form-item>
+              </el-col>
+
+              
       
               <!-- <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
                 <el-form-item
@@ -1166,7 +1186,7 @@ const defaultForm = {
   response_result: "",
   remind_cycle: 0,
   record_date: "",
-
+  patient_type:"1",
   tell_phone: "",
   first_treatment_date: "",
   dialysis_age: "",
@@ -1430,6 +1450,7 @@ export default {
       // typeOptions: null,
       // styleOptions: null,
       sourceOptions: [{ value: 1, label: "门诊" }, { value: 2, label: "住院" }, { value: 3, label: "门特" }],
+      patientType: [{ value: 1, label: "血透患者" }, { value: 2, label: "慢病患者" }, { value: 3, label: "会员患者" },{ value: 4, label: "腹透患者" },{ value: 5, label: "CKD患者" },{ value: 6, label: "其他患者" }],
       patientSourceList:[
         {value:1,label:"门诊"},
         {value:2,label:"住院"},
@@ -1711,6 +1732,10 @@ export default {
             }
             console.log("form---",this.form)
 
+            if(this.form.patient_type >0){
+               this.form.patient_type = parseInt(this.form.patient_type)
+            }
+
             editPatient(this.patientID, this.form)
 
               .then(response => {
@@ -1755,6 +1780,10 @@ export default {
             }
             console.log("form233322332w",this.form)
 
+            if(this.form.patient_type >0){
+               this.form.patient_type = parseInt(this.form.patient_type)
+            }
+
             createPatient(this.form)
               .then(response => {
                 if (response.data.state == 0) {
@@ -2113,7 +2142,9 @@ export default {
             this.form.patient_address = patietInfo.patient_address
             this.form.allergic_history = patietInfo.allergic_history
             this.form.infectious_remark = patietInfo.infectious_remark
-          
+            if(patietInfo.patient_type >0){
+              this.form.patient_type = patietInfo.patient_type
+            }
 
             // this.checkIdCardNo();
           } else {