2 Ревизии c311064561 ... c84a20a0a8

Автор SHA1 Съобщение Дата
  陈少旭 c84a20a0a8 Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch преди 4 дни
  陈少旭 ef101428f8 1111 преди 4 дни
променени са 3 файла, в които са добавени 74 реда и са изтрити 37 реда
  1. 17 0
      src/store/modules/globalConfig.js
  2. 13 3
      src/xt_pages/user/components/PatientDetail.vue
  3. 44 34
      src/xt_pages/user/components/PatientForm.vue

+ 17 - 0
src/store/modules/globalConfig.js Целия файл

@@ -47890,6 +47890,23 @@ const global_config = {
47890 47890
         "status":"0",
47891 47891
         "create_name":null
47892 47892
       },
47893
+      {
47894
+        "create_time":"2021-09-01T11:04:17",
47895
+        "area_code":"440118_new",
47896
+        "label":"增城区",
47897
+        "sort":null,
47898
+        "type":"admdvs",
47899
+        "version":null,
47900
+        "valiFlag":null,
47901
+        "create_id":null,
47902
+        "createUser":null,
47903
+        "id":10000,
47904
+        "parentValue":null,
47905
+        "value":"440118",
47906
+        "createDate":null,
47907
+        "status":"0",
47908
+        "create_name":null
47909
+      },
47893 47910
       {
47894 47911
         "create_time":"2021-09-01T11:04:22",
47895 47912
         "area_code":"340200_new",

+ 13 - 3
src/xt_pages/user/components/PatientDetail.vue Целия файл

@@ -724,6 +724,11 @@
724 724
                   <el-input v-model="form.healthCareNo" disabled></el-input>
725 725
                 </el-form-item>
726 726
               </el-col>
727
+              <el-col :span="8">
728
+                <el-form-item label="参保区划代码: " prop="insuplc_admdvs">
729
+                  <el-input v-model="form.insuplc_admdvs" disabled></el-input>
730
+                </el-form-item>
731
+              </el-col>
727 732
               <el-col :span="8">
728 733
                 <el-form-item label="教育程度 : " prop="educationOptions">
729 734
                   <el-select v-model="form.education" disabled>
@@ -1035,9 +1040,9 @@
1035 1040
             <el-form-item label="病历图册:" prop="gallery">
1036 1041
              <div style="display: flex;">
1037 1042
               <div v-for="item in fileList" style="margin-left: 10px;">
1038
-                <el-image 
1043
+                <el-image
1039 1044
                   style="width: 100px; height: 100px"
1040
-                  :src="item" 
1045
+                  :src="item"
1041 1046
                   :preview-src-list="fileList">
1042 1047
                </el-image>
1043 1048
               </div>
@@ -1629,6 +1634,7 @@ const defaultForm = {
1629 1634
   age: "",
1630 1635
   reimbursementWayID: "",
1631 1636
   healthCareNo: "",
1637
+  insuplc_admdvs:"",
1632 1638
   healthCareDueDate: "",
1633 1639
   height: "",
1634 1640
   blood: "",
@@ -1936,7 +1942,7 @@ export default {
1936 1942
         }
1937 1943
       });
1938 1944
     },
1939
-   
1945
+
1940 1946
     fetchPatient(id) {
1941 1947
       fetchPatient(id)
1942 1948
         .then((response) => {
@@ -2008,6 +2014,8 @@ export default {
2008 2014
               this.form.reimbursementWayID = patietInfo.reimbursement_way_id;
2009 2015
             }
2010 2016
             this.form.healthCareNo = patietInfo.health_care_no;
2017
+            this.form.insuplc_admdvs = patietInfo.insuplc_admdvs;
2018
+
2011 2019
             this.form.phone = patietInfo.phone;
2012 2020
             this.form.homeTelephone = patietInfo.home_telephone;
2013 2021
             this.form.relative_phone = patietInfo.relative_phone;
@@ -2560,6 +2568,8 @@ export default {
2560 2568
       var dialysisNo = this.patientPrint.dialysis_no;
2561 2569
       var phone = this.patientPrint.phone;
2562 2570
       var healthCareNo = this.patientPrint.health_care_no;
2571
+      // var insuplc_admdvs = this.patientPrint.insuplc_admdvs;
2572
+
2563 2573
 
2564 2574
       // Base64加密
2565 2575
       var epatientID = this.Base64.encode(patientID);

+ 44 - 34
src/xt_pages/user/components/PatientForm.vue Целия файл

@@ -288,7 +288,7 @@
288 288
                 </el-form-item>
289 289
               </el-col>
290 290
 
291
-             
291
+
292 292
             <el-col :span="6" :style="isEdit ? 'width:360px' : ''">
293 293
               <el-form-item
294 294
                 label="本院首次透析 : "
@@ -382,7 +382,7 @@
382 382
                 </el-form-item>
383 383
             </el-col>
384 384
 
385
-            
385
+
386 386
             <el-col :span="24">
387 387
               <el-form-item label="病历号 : " prop="record_number">
388 388
                 <el-input
@@ -392,7 +392,7 @@
392 392
               </el-form-item>
393 393
              </el-col>
394 394
 
395
-            
395
+
396 396
              <el-col :span="24">
397 397
               <el-form-item label="主管护士 : " prop="record_number">
398 398
                 <el-select v-model="form.nurse" style="width:200px">
@@ -437,7 +437,7 @@
437 437
                 ></el-date-picker>
438 438
               </el-form-item>
439 439
             </el-col>
440
-         
440
+
441 441
 
442 442
               <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
443 443
                 <el-form-item
@@ -475,8 +475,8 @@
475 475
                 </el-form-item>
476 476
               </el-col>
477 477
 
478
-              
479
-      
478
+
479
+
480 480
               <!-- <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
481 481
                 <el-form-item
482 482
                   label="患者去向 : "
@@ -492,9 +492,9 @@
492 492
                   </el-radio-group>
493 493
                 </el-form-item>
494 494
               </el-col> -->
495
-           
496 495
 
497
-            
496
+
497
+
498 498
               <!-- <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
499 499
                 <el-form-item
500 500
                   label="流转地: "
@@ -509,9 +509,9 @@
509 509
                  </el-select>
510 510
                 </el-form-item>
511 511
               </el-col> -->
512
-           
513
- 
514
-             
512
+
513
+
514
+
515 515
                 <!-- <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
516 516
                 <el-form-item
517 517
                   label="流转开始时间 : "
@@ -551,8 +551,8 @@
551 551
                  ></el-date-picker>
552 552
                 </el-form-item>
553 553
               </el-col>  -->
554
-           
555
-             
554
+
555
+
556 556
 
557 557
               <!-- <el-col :span="8" style="margin-bottom: 20px;" :style="isEdit ? 'width:360px' : ''">
558 558
                 <el-form-item
@@ -719,7 +719,7 @@
719 719
                 </el-form-item>
720 720
               </el-col>
721 721
 
722
-            
722
+
723 723
 
724 724
               <div v-show="!generic_info_fold">
725 725
                 <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
@@ -762,7 +762,7 @@
762 762
                   <!-- <el-form-item label=" " style="float:left;" label-width="30px">
763 763
                   </el-form-item>-->
764 764
                 </el-col>
765
-               
765
+
766 766
                 <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
767 767
                   <el-form-item label="医保类型 : " prop="reimbursementWayID">
768 768
                     <el-select v-model="form.reimbursementWayID">
@@ -780,6 +780,11 @@
780 780
                     <el-input v-model="form.healthCareNo"></el-input>
781 781
                   </el-form-item>
782 782
                 </el-col>
783
+                <el-col :span="8">
784
+                  <el-form-item label="参保区划代码: " prop="insuplc_admdvs">
785
+                    <el-input v-model="form.insuplc_admdvs"></el-input>
786
+                  </el-form-item>
787
+                </el-col>
783 788
                 <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
784 789
                   <el-form-item label="教育程度 : " prop="educationOptions">
785 790
                     <el-select v-model="form.education">
@@ -853,7 +858,7 @@
853 858
                     </el-select>
854 859
                   </el-form-item>
855 860
                 </el-col>
856
-                
861
+
857 862
                 <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
858 863
                   <el-form-item label="单位地址 : " prop="unit_address">
859 864
                     <el-input v-model="form.unit_address"></el-input>
@@ -1055,7 +1060,7 @@
1055 1060
           </el-col>
1056 1061
         </el-row>
1057 1062
 
1058
-          
1063
+
1059 1064
 
1060 1065
           <el-row>
1061 1066
             <el-col :span="24" style="height:100%;">
@@ -1071,7 +1076,7 @@
1071 1076
               </el-form-item>
1072 1077
          </el-col>
1073 1078
         </el-row>
1074
-      
1079
+
1075 1080
         <el-row>
1076 1081
           <el-col :span="24">
1077 1082
             <el-form-item label="登记人员 : ">
@@ -1110,11 +1115,11 @@
1110 1115
                     :before-upload="beforeGalleryUpload">
1111 1116
                     <i class="el-icon-plus"></i>
1112 1117
                 </el-upload>
1113
-                
1118
+
1114 1119
             </el-form-item>
1115 1120
         </el-col>
1116 1121
       </el-row>
1117
-      
1122
+
1118 1123
        <el-row>
1119 1124
           <el-col :span="24" align="right" class="newCol">
1120 1125
             <el-form-item>
@@ -1152,7 +1157,7 @@
1152 1157
             </el-form-item>
1153 1158
           </el-col>
1154 1159
         </el-row>
1155
-        
1160
+
1156 1161
       </el-form>
1157 1162
     </div>
1158 1163
   </div>
@@ -1195,6 +1200,7 @@ const defaultForm = {
1195 1200
   admissionNumber: "",
1196 1201
   reimbursementWayID: "",
1197 1202
   healthCareNo: "",
1203
+  insuplc_admdvs:"",
1198 1204
   phone: "",
1199 1205
   homeTelephone: "",
1200 1206
   relative_phone: "",
@@ -1394,7 +1400,7 @@ const defaultForm = {
1394 1400
   dbp: "",
1395 1401
   showOne:true,
1396 1402
   treatment_plan:"",
1397
-  
1403
+
1398 1404
 };
1399 1405
 
1400 1406
 export default {
@@ -1605,7 +1611,7 @@ export default {
1605 1611
     this.liuAddresslist = getDataConfig('hemodialysis', 'liu_address')
1606 1612
     console.log("liuAddresslist",this.liuAddresslist)
1607 1613
    this.fetchAllAdminUsers();
1608
- 
1614
+
1609 1615
 
1610 1616
     if(this.isEdit == true){
1611 1617
        this.showLapseto = false
@@ -1625,7 +1631,7 @@ export default {
1625 1631
     this.professionOptions.push(obj)
1626 1632
     this.professionOptions.push(objOne)
1627 1633
 
1628
-  
1634
+
1629 1635
     // this.inductionOptions = this.$store.getters.induction_options;
1630 1636
     this.contagionList = this.$store.getters.contagions;
1631 1637
     this.checkDisease = this.$store.getters.disease;
@@ -1785,14 +1791,14 @@ export default {
1785 1791
       }
1786 1792
       this.form.org_logo = ""
1787 1793
       this.form.org_logo = log_str
1788
-    
1794
+
1789 1795
     },
1790 1796
     fetchAllAdminUsers() {
1791 1797
       fetchAllAdminUsers().then((response) => {
1792 1798
         if (response.data.state === 1) {
1793 1799
           this.form.doctor = this.$store.getters.xt_user.user.id
1794 1800
           this.adminUserOptions = response.data.data.users;
1795
-          
1801
+
1796 1802
 
1797 1803
         }
1798 1804
       });
@@ -1873,9 +1879,9 @@ export default {
1873 1879
             if(this.form.patient_source == "NaN"){
1874 1880
               this.form.patient_source = 1
1875 1881
             }
1876
-            
1877
-          
1878
-            
1882
+
1883
+
1884
+
1879 1885
             if(this.form.avatar.indexOf('?imageView2/2/w/500/h/500/q/90')!=-1){
1880 1886
                this.form.avatar = this.form.avatar
1881 1887
             }else{
@@ -1887,7 +1893,7 @@ export default {
1887 1893
                this.form.patient_type = parseInt(this.form.patient_type)
1888 1894
             }
1889 1895
             console.log("form===============",this.form)
1890
-            
1896
+
1891 1897
             editPatient(this.patientID, this.form).then(response => {
1892 1898
                 if (response.data.state == 0) {
1893 1899
                   this.$message.error(response.data.msg);
@@ -2125,7 +2131,7 @@ export default {
2125 2131
               this.form.gender = patietInfo.gender;
2126 2132
             }
2127 2133
             this.form.birth = uParseTime(patietInfo.birthday, "{y}-{m}-{d}");
2128
-           
2134
+
2129 2135
             this.form.nation = patietInfo.nation;
2130 2136
             this.form.native_place = patietInfo.native_place;
2131 2137
             this.form.height = patietInfo.height + "";
@@ -2139,6 +2145,10 @@ export default {
2139 2145
               this.form.reimbursementWayID = patietInfo.reimbursement_way_id;
2140 2146
             }
2141 2147
             this.form.healthCareNo = patietInfo.health_care_no;
2148
+
2149
+            this.form.insuplc_admdvs = patietInfo.insuplc_admdvs;
2150
+
2151
+
2142 2152
             this.form.phone = patietInfo.phone;
2143 2153
             this.form.homeTelephone = patietInfo.home_telephone;
2144 2154
             this.form.relative_phone = patietInfo.relative_phone;
@@ -2208,7 +2218,7 @@ export default {
2208 2218
             this.form.dbp = patietInfo.dbp;
2209 2219
 
2210 2220
             this.form.response_result = patietInfo.response_result;
2211
-           
2221
+
2212 2222
             this.form.is_infectious = patietInfo.is_infectious;
2213 2223
             console.log("哈哈哈哈",patietInfo.is_infectious)
2214 2224
             // if(this.form.is_infectious == 1){
@@ -2299,9 +2309,9 @@ export default {
2299 2309
               this.form.doctor = ""
2300 2310
             }
2301 2311
 
2302
-         
2312
+
2303 2313
             this.form.patient_source = patietInfo.patient_source
2304
-          
2314
+
2305 2315
             if (patietInfo.patient_start_time != 0) {
2306 2316
               this.form.patient_start_time = uParseTime(
2307 2317
                 patietInfo.patient_start_time,