新分支

src/store/modules/globalConfig.js

@@ -179,6 +179,14 @@ const global_config = {
       {
         id: 10,
         name: '无业'
+      },
+      {
+        id: 11,
+        name: '灵活就业人员'
+      },
+      {
+        id: 12,
+        name: '退休人员'
       }
     ],
     induction_options: [ // 诱导期

src/xt_pages/data/components/editInspection.vue

@@ -337,7 +337,7 @@
                 this.$message.success('保存成功')
                 this.visible = false
                 this.projectList = []
-                // this.$parent.getlist()
+                this.$parent.getlist()
               }
             })
           }

src/xt_pages/dialysis/details/consumable/dialysisGood.vue

@@ -685,6 +685,7 @@
                    }
 
                  }
+                 console.log("list--------------------",list)
                  this.list = list
                }
              }

src/xt_pages/dialysis/template/DialysisPrintOrderTen.vue

@@ -239,6 +239,12 @@
                         {{ predialysis.catheter ? predialysis.catheter : "/" }}
                       </div>
                     </div>
+                    <div class="inline_block" style="flex:4;" v-if="org_id == 10081">
+                      穿刺点：
+                      <div class="under_line" style="min-width: 120px;text-align: center">
+                        {{ predialysis.point_puncture ? predialysis.point_puncture : "/" }}
+                      </div>
+                    </div>
                   </div>
                   <div class="row" style="padding: 2px 0;line-height:23px;display:flex;">
                     <div class="inline_block" style="flex:1;">
@@ -911,6 +917,8 @@
                         {{ afterdialysis.catheter ? afterdialysis.catheter : "/" }}
                       </div>
                     </div>
+
+                    
                   </div>
 
                   <div class="row" style="padding: 2px 0;line-height:23px;display:flex;">
@@ -1177,7 +1185,8 @@ export default {
         zongliang_unit: "mg",
         gaimingcheng_unit: "",
         gaijiliang_unit: ""
-      }
+      },
+      org_id:0,
     };
   },
   methods: {
@@ -1964,6 +1973,7 @@ export default {
     }
   },
   created() {
+    this.org_id = this.$store.getters.xt_user.org.id;
     this.way_arr = getDataConfig("hemodialysis", "way");
     this.consciousness_arr = getDataConfig("hemodialysis", "consciousness");
     this.appetite_arr = getDataConfig("hemodialysis", "appetite");

src/xt_pages/hospitalStation/components/deskPrescription.vue

@@ -3493,12 +3493,19 @@ export default {
         if (response.data.state == 1) {
           var team = response.data.data.team
           this.tabPrjectTeam = team
-          this.allTabPrjectTeam = team
+          this.allTabPrjectTeam = team.sort(this.compare("sort"))
 
           this.projectList = team
         }
       })
     },
+    compare (property) {
+        return function (a, b) {
+            var value1 = a[property]
+            var value2 = b[property]
+            return value1 - value2
+        }
+     },
     selectTeam(row) {
       console.log(row)
       // var arr = []

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -3514,13 +3514,21 @@
         getAllProjectTeam().then(response => {
           if (response.data.state == 1) {
             var team = response.data.data.team
-            this.tabPrjectTeam = team
+            
+            this.tabPrjectTeam = team.sort(this.compare("sort"))
             this.allTabPrjectTeam = team
 
             this.projectList = team
           }
         })
       },
+      compare (property) {
+        return function (a, b) {
+            var value1 = a[property]
+            var value2 = b[property]
+            return value1 - value2
+        }
+      },
       selectTeam(row) {
         console.log(row)
         // var arr = []

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -1754,19 +1754,21 @@ export default {
               //   tempAddition.push(obj)
               // }
 
-              var preTime = ''
-
-              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'
-                } else if (this.schedule.schedule_type == 2) {
-                  preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
-                } else if (this.schedule.schedule_type == 3) {
-                  preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
+              var preTime = nowTime
+
+              if (this.$store.getters.xt_user.org.id != 9919){
+                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'
+                  } else if (this.schedule.schedule_type == 2) {
+                    preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
+                  } else if (this.schedule.schedule_type == 3) {
+                    preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
+                  }
+                  // preTime = nowTime
+                } else {
+                  preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
                 }
-                // preTime = nowTime
-              } else {
-                preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
               }
               console.log("is_medicine")
               console.log(is_medicine)
@@ -1904,13 +1906,15 @@ export default {
                   }
                   tempProject.push(obj)
                 }
-
-                if (this.schedule.schedule_type == 1) {
-                  var preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
-                } else if (this.schedule.schedule_type == 2) {
-                  var preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
-                } else if (this.schedule.schedule_type == 3) {
-                  var preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
+                var preTime = nowTime
+                if (this.$store.getters.xt_user.org.id != 9919) {
+                  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) {
+                     preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
+                  } else if (this.schedule.schedule_type == 3) {
+                     preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
+                  }
                 }
 
                 let index = i + 1
@@ -2133,7 +2137,7 @@ export default {
                     let tempAdvice = []
                     let tempProject = []
                     let tempAddition = []
-                    var is_medicine  = false
+                    var is_medicine = false
                     //药品
                     for (let b = 0; b < prescription.advices.length; b++) {
                       let obj = {
@@ -2156,11 +2160,9 @@ export default {
                         execution_state: prescription.advices[b].execution_state,
                         is_medicine: prescription.advices[b].is_medicine,
 
-
-
                       }
                       tempAdvice.push(obj)
-                      if (prescription.advices[b].is_medicine == 1){
+                      if (prescription.advices[b].is_medicine == 1) {
                         is_medicine = true
                       }
                     }
@@ -2214,21 +2216,22 @@ export default {
                     //   tempAddition.push(obj)
                     // }
 
-                    var preTime = ''
-
-                    if (prescription.pre_time == 0) {
-                      // preTime = nowTime
-                      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) {
-                        preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
-                      } else if (this.schedule.schedule_type == 3) {
-                        preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
+                    var preTime = nowTime
+                    if (this.$store.getters.xt_user.org.id != 9919) {
+                      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'
+                        } else if (this.schedule.schedule_type == 2) {
+                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
+                        } else if (this.schedule.schedule_type == 3) {
+                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
+                        }
+                      } else {
+                        preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
                       }
-                    } else {
-                      preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
                     }
 
+
                     let index = i + 1
                     let obj = {
                       id: prescription.id,
@@ -2364,14 +2367,16 @@ export default {
                         tempProject.push(obj)
                       }
 
-                      // var preTime = nowTime
-                      var preTime = ''
-                      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) {
-                        preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
-                      } else if (this.schedule.schedule_type == 3) {
-                        preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
+                      var preTime = nowTime
+                      // var preTime = ''
+                      if(this.org_id != 9919 ) {
+                        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) {
+                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
+                        } else if (this.schedule.schedule_type == 3) {
+                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
+                        }
                       }
 
                       let index = i + 1
@@ -3870,19 +3875,20 @@ export default {
                     //   tempAddition.push(obj)
                     // }
 
-                    var preTime = ''
+                    var preTime = nowTime
 
-                    if (prescription.pre_time == 0) {
-                      // preTime = nowTime
-                      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) {
-                        preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
-                      } else if (this.schedule.schedule_type == 3) {
-                        preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
+                    if(this.org_id != 9919 ) {
+                      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'
+                        } else if (this.schedule.schedule_type == 2) {
+                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
+                        } else if (this.schedule.schedule_type == 3) {
+                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
+                        }
+                      } else {
+                        preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
                       }
-                    } else {
-                      preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
                     }
 
                     let index = i + 1
@@ -4018,13 +4024,15 @@ export default {
                       }
 
                       // var preTime = nowTime
-                      var preTime = ''
-                      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) {
-                        preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
-                      } else if (this.schedule.schedule_type == 3) {
-                        preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
+                      var preTime = nowTime
+                      if(this.org_id != 9919 ) {
+                        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) {
+                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
+                        } else if (this.schedule.schedule_type == 3) {
+                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
+                        }
                       }
 
                       let index = i + 1
@@ -4498,19 +4506,21 @@ export default {
                     //   tempAddition.push(obj)
                     // }
 
-                    var preTime = ''
+                    var preTime = nowTime
 
-                    if (prescription.pre_time == 0) {
-                      // preTime = nowTime
-                      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) {
-                        preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
-                      } else if (this.schedule.schedule_type == 3) {
-                        preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
+                    if(this.org_id != 9919) {
+                      if (prescription.pre_time == 0) {
+                        // preTime = nowTime
+                        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) {
+                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
+                        } else if (this.schedule.schedule_type == 3) {
+                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
+                        }
+                      } else {
+                        preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
                       }
-                    } else {
-                      preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
                     }
 
                     let index = i + 1
@@ -4646,14 +4656,16 @@ export default {
                         tempProject.push(obj)
                       }
 
-                      // var preTime = nowTime
-                      var preTime = ''
-                      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) {
-                        preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
-                      } else if (this.schedule.schedule_type == 3) {
-                        preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
+                      var preTime = nowTime
+                      // var preTime = ''
+                      if(this.org_id != 9919 ) {
+                        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) {
+                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
+                        } else if (this.schedule.schedule_type == 3) {
+                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
+                        }
                       }
 
                       let index = i + 1

src/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail.vue

@@ -1801,11 +1801,18 @@
           if (response.data.state == 1) {
             var team = response.data.data.team
             console.log('team2222', team)
-            this.tabPrjectTeam = team
+            this.tabPrjectTeam = team.sort(this.compare("sort"))
             this.projectList = team
           }
         })
       },
+      compare (property) {
+        return function (a, b) {
+            var value1 = a[property]
+            var value2 = b[property]
+            return value1 - value2
+        }
+      },
       changevalue(val) {
 
         this.$forceUpdate()

src/xt_pages/outpatientDoctorStation/recordPrint.vue

@@ -56,7 +56,7 @@
       >
       <!--  -->
       </printThree>
-      <printFour
+      <!-- <printFour
         v-if="org_id == 10138 || org_id == 10278 || org_id == 0"
         ref="printFour"
         v-bind:childResponse="childResponse"
@@ -65,7 +65,7 @@
         :history="history"
         :patientid="patientid"
       >
-      </printFour>
+      </printFour> -->
     </div>
   </div>
 </template>

src/xt_pages/user/components/PatientDetail.vue

@@ -206,6 +206,102 @@
                 ></el-input>
               </el-form-item>
             </el-col>
+            
+        
+            <el-col :span="6">
+              <el-form-item
+                label="本院首次透析 : "
+                prop="is_hospital_first_dialysis"
+              >
+                <el-radio-group v-model="form.is_hospital_first_dialysis">
+                  <el-radio
+                    v-for="item in isHospitalFirstDialysisOptions"
+                    :key="item.value"
+                    :label="item.value"
+                    :value="item.value"
+                    disabled
+                    >{{ item.label }}</el-radio
+                  >
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item
+                label="系统前透析次数 : "
+                prop="first_dialysis_hospital"
+              >
+                <el-input v-model="form.user_sys_before_count" disabled></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="首次诊治日期 : ">
+                <el-date-picker
+                  v-model="form.first_treatment_date"
+                  type="date"
+                  disabled
+                  format="yyyy-MM-dd"
+                  value-format="yyyy-MM-dd"
+                ></el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="上家透析医院 : " prop="first_dialysis_hospital">
+                <el-input
+                  v-model="form.first_dialysis_hospital"
+                  disabled
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="透析之前情况 : " prop="predialysis_condition">
+                <el-checkbox-group v-model="form.predialysis_condition">
+                  <el-checkbox
+                    v-for="item in predialysisConditionOptions"
+                    :label="item.label"
+                    :key="item.value"
+                    :value="item.label"
+                    disabled
+                    >{{ item.label }}</el-checkbox
+                  >
+                </el-checkbox-group>
+              </el-form-item> </el-col
+            ><el-col :span="6">
+              <el-form-item
+                label="本院前透析频率 : "
+                prop="pre_hospital_dialysis_frequency"
+              >
+                <el-input
+                  v-model="form.pre_hospital_dialysis_frequency"
+                  disabled
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item
+                label="本院前透析次数 : "
+                prop="pre_hospital_dialysis_times"
+              >
+                <el-input
+                  v-model="form.pre_hospital_dialysis_times"
+                  disabled
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item
+                label="本院首次透析 : "
+                prop="hospital_first_dialysis_date"
+              >
+                <el-date-picker
+                  v-model="form.hospital_first_dialysis_date"
+                  type="date"
+                  format="yyyy-MM-dd"
+                  value-format="yyyy-MM-dd"
+                  disabled
+                ></el-date-picker>
+              </el-form-item>
+            </el-col>
+   
             <el-col :span="8" style="height: 59px">
               <el-form-item
                 label="患者来源 : "
@@ -678,7 +774,7 @@
           </el-form-item>
         </el-col>
 
-        <el-col :span="24">
+        <!-- <el-col :span="24">
           <el-form-item label="慢性病 : " prop="diseases">
             <el-checkbox-group v-model="form.diseases">
               <el-checkbox
@@ -691,104 +787,9 @@
               >
             </el-checkbox-group>
           </el-form-item>
-        </el-col>
+        </el-col> -->
       </el-row>
 
-      <div v-show="!treat_info_fold">
-        <el-col :span="6">
-          <el-form-item
-            label="本院首次透析 : "
-            prop="is_hospital_first_dialysis"
-          >
-            <el-radio-group v-model="form.is_hospital_first_dialysis">
-              <el-radio
-                v-for="item in isHospitalFirstDialysisOptions"
-                :key="item.value"
-                :label="item.value"
-                :value="item.value"
-                disabled
-                >{{ item.label }}</el-radio
-              >
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item
-            label="系统前透析次数 : "
-            prop="first_dialysis_hospital"
-          >
-            <el-input v-model="form.user_sys_before_count" disabled></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="首次诊治日期 : ">
-            <el-date-picker
-              v-model="form.first_treatment_date"
-              type="date"
-              disabled
-              format="yyyy-MM-dd"
-              value-format="yyyy-MM-dd"
-            ></el-date-picker>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="首次透析医院 : " prop="first_dialysis_hospital">
-            <el-input
-              v-model="form.first_dialysis_hospital"
-              disabled
-            ></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="24">
-          <el-form-item label="透析之前情况 : " prop="predialysis_condition">
-            <el-checkbox-group v-model="form.predialysis_condition">
-              <el-checkbox
-                v-for="item in predialysisConditionOptions"
-                :label="item.label"
-                :key="item.value"
-                :value="item.label"
-                disabled
-                >{{ item.label }}</el-checkbox
-              >
-            </el-checkbox-group>
-          </el-form-item> </el-col
-        ><el-col :span="6">
-          <el-form-item
-            label="本院前透析频率 : "
-            prop="pre_hospital_dialysis_frequency"
-          >
-            <el-input
-              v-model="form.pre_hospital_dialysis_frequency"
-              disabled
-            ></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item
-            label="本院前透析次数 : "
-            prop="pre_hospital_dialysis_times"
-          >
-            <el-input
-              v-model="form.pre_hospital_dialysis_times"
-              disabled
-            ></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item
-            label="本院首次透析 : "
-            prop="hospital_first_dialysis_date"
-          >
-            <el-date-picker
-              v-model="form.hospital_first_dialysis_date"
-              type="date"
-              format="yyyy-MM-dd"
-              value-format="yyyy-MM-dd"
-              disabled
-            ></el-date-picker>
-          </el-form-item>
-        </el-col>
-      </div>
       <el-col :span="24">
         <el-form-item>
           <el-button type="text" @click="treat_info_fold = !treat_info_fold"

src/xt_pages/user/components/PatientForm.vue

@@ -217,7 +217,7 @@
                 </el-form-item>
               </el-col>
 
-              <el-col :span="6" :style="isEdit ? 'width:380px' : ''">
+              <el-col :span="6" :style="isEdit ? 'width:380px' : ''" v-if="org_id!=0 && org_id!=10138 && org_id!=10278">
                 <el-form-item
                   label="首次肾脏治疗时间:"
                   prop="firstDialysisDate"
@@ -231,6 +231,21 @@
                   ></el-date-picker>
                 </el-form-item>
               </el-col>
+
+              <el-col :span="6" :style="isEdit ? 'width:380px' : ''" v-if="org_id==0||org_id == 10138 || org_id == 10278">
+                <el-form-item
+                  label="首次进入本院时间:"
+                  prop="firstDialysisDate"
+                  label-width="150px"
+                >
+                  <el-date-picker
+                    v-model="form.firstDialysisDate"
+                    type="date"
+                    format="yyyy-MM-dd"
+                    value-format="yyyy-MM-dd"
+                  ></el-date-picker>
+                </el-form-item>
+              </el-col>
               <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
                 <el-form-item
                   label="本人电话 : "
@@ -257,6 +272,100 @@
                 </el-form-item>
               </el-col>
 
+             
+            <el-col :span="6" :style="isEdit ? 'width:360px' : ''">
+              <el-form-item
+                label="本院首次透析 : "
+                prop="is_hospital_first_dialysis"
+              >
+                <el-radio-group v-model="form.is_hospital_first_dialysis">
+                  <el-radio
+                    v-for="item in isHospitalFirstDialysisOptions"
+                    :key="item.value"
+                    :label="item.value"
+                    :value="item.value"
+                    >{{ item.label }}</el-radio
+                  >
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="6" :style="isEdit ? 'width:360px' : ''">
+              <el-form-item
+                label="系统前透析次数 : "
+                prop="user_sys_before_count"
+              >
+                <el-input v-model="form.user_sys_before_count"></el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="6" :style="isEdit ? 'width:360px' : ''">
+              <el-form-item label="首次透析时间 : ">
+                <el-date-picker
+                  v-model="form.first_treatment_date"
+                  type="date"
+                  format="yyyy-MM-dd"
+                  value-format="yyyy-MM-dd"
+                ></el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6" :style="isEdit ? 'width:360px' : ''">
+              <el-form-item
+                label="上家透析医院 : "
+                prop="first_dialysis_hospital"
+              >
+                <el-input v-model="form.first_dialysis_hospital"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item
+                label="透析之前情况 : "
+                prop="predialysis_condition"
+              >
+                <el-checkbox-group v-model="form.predialysis_condition">
+                  <el-checkbox
+                    v-for="item in predialysisConditionOptions"
+                    :label="item.label"
+                    :key="item.value"
+                    :value="item.label"
+                    >{{ item.label }}</el-checkbox
+                  >
+                </el-checkbox-group>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6" :style="isEdit ? 'width:360px' : ''">
+              <el-form-item
+                label="本院前透析频率 : "
+                prop="pre_hospital_dialysis_frequency"
+              >
+                <el-input
+                  v-model="form.pre_hospital_dialysis_frequency"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6" :style="isEdit ? 'width:360px' : ''">
+              <el-form-item
+                label="本院前透析次数 : "
+                prop="pre_hospital_dialysis_times"
+              >
+                <el-input v-model="form.pre_hospital_dialysis_times"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6" :style="isEdit ? 'width:360px' : ''">
+              <el-form-item
+                label="本院首次透析 : "
+                prop="hospital_first_dialysis_date"
+              >
+                <el-date-picker
+                  v-model="form.hospital_first_dialysis_date"
+                  type="date"
+                  format="yyyy-MM-dd"
+                  value-format="yyyy-MM-dd"
+                ></el-date-picker>
+              </el-form-item>
+            </el-col>
+         
+
               <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
                 <el-form-item
                   label="患者来源 : "
@@ -778,7 +887,7 @@
           <!--</el-checkbox-group>-->
           <!--</el-form-item>-->
           <!--</el-col>-->
-          <el-col :span="24">
+          <!-- <el-col :span="24">
             <el-form-item label="慢性病 : " prop="diseases">
               <el-checkbox-group v-model="form.diseases">
                 <el-checkbox
@@ -790,102 +899,10 @@
                 >
               </el-checkbox-group>
             </el-form-item>
-          </el-col>
-
-          <div v-show="!treat_info_fold">
-            <el-col :span="6" :style="isEdit ? 'width:360px' : ''">
-              <el-form-item
-                label="本院首次透析 : "
-                prop="is_hospital_first_dialysis"
-              >
-                <el-radio-group v-model="form.is_hospital_first_dialysis">
-                  <el-radio
-                    v-for="item in isHospitalFirstDialysisOptions"
-                    :key="item.value"
-                    :label="item.value"
-                    :value="item.value"
-                    >{{ item.label }}</el-radio
-                  >
-                </el-radio-group>
-              </el-form-item>
-            </el-col>
+          </el-col> -->
 
-            <el-col :span="6" :style="isEdit ? 'width:360px' : ''">
-              <el-form-item
-                label="系统前透析次数 : "
-                prop="user_sys_before_count"
-              >
-                <el-input v-model="form.user_sys_before_count"></el-input>
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="6" :style="isEdit ? 'width:360px' : ''">
-              <el-form-item label="首次透析时间 : ">
-                <el-date-picker
-                  v-model="form.first_treatment_date"
-                  type="date"
-                  format="yyyy-MM-dd"
-                  value-format="yyyy-MM-dd"
-                ></el-date-picker>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6" :style="isEdit ? 'width:360px' : ''">
-              <el-form-item
-                label="首次透析医院 : "
-                prop="first_dialysis_hospital"
-              >
-                <el-input v-model="form.first_dialysis_hospital"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item
-                label="透析之前情况 : "
-                prop="predialysis_condition"
-              >
-                <el-checkbox-group v-model="form.predialysis_condition">
-                  <el-checkbox
-                    v-for="item in predialysisConditionOptions"
-                    :label="item.label"
-                    :key="item.value"
-                    :value="item.label"
-                    >{{ item.label }}</el-checkbox
-                  >
-                </el-checkbox-group>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6" :style="isEdit ? 'width:360px' : ''">
-              <el-form-item
-                label="本院前透析频率 : "
-                prop="pre_hospital_dialysis_frequency"
-              >
-                <el-input
-                  v-model="form.pre_hospital_dialysis_frequency"
-                ></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6" :style="isEdit ? 'width:360px' : ''">
-              <el-form-item
-                label="本院前透析次数 : "
-                prop="pre_hospital_dialysis_times"
-              >
-                <el-input v-model="form.pre_hospital_dialysis_times"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6" :style="isEdit ? 'width:360px' : ''">
-              <el-form-item
-                label="本院首次透析 : "
-                prop="hospital_first_dialysis_date"
-              >
-                <el-date-picker
-                  v-model="form.hospital_first_dialysis_date"
-                  type="date"
-                  format="yyyy-MM-dd"
-                  value-format="yyyy-MM-dd"
-                ></el-date-picker>
-              </el-form-item>
-            </el-col>
-          </div>
-          <el-col :span="24">
+       
+          <!-- <el-col :span="24">
             <el-form-item>
               <el-button
                 type="text"
@@ -895,7 +912,7 @@
                 <i class="el-icon--right" :class="treat_fold_icon"></i>
               </el-button>
             </el-form-item>
-          </el-col>
+          </el-col> -->
 
           <el-col :span="24">
             <el-form-item label="登记人员 : ">
@@ -1364,6 +1381,7 @@ export default {
         homeAddress: [{ required: true, message: "请填写住址", trigger: "blur" }],
       },
       adminUserOptions:[],
+      org_id:0,
     };
   },
   components: {
@@ -1406,7 +1424,7 @@ export default {
     var xtuser = this.$store.getters.xt_user;
     this.orgname = xtuser.org.org_name;
     this.adminusername = xtuser.user.user_name;
-
+    this.org_id =this.$store.getters.xt_user.org.id
 
     if (this.isEdit) {
       this.submitMsg = "修改患者信息成功";
@@ -1429,13 +1447,13 @@ export default {
 
   },
   watch: {
-    "form.record_date": function(val) {
-      console.log(val);
-      if (val == null || val == "") {
-        console.log("111111");
-        this.form.remind_cycle = "";
-      }
-    }
+    // "form.record_date": function(val) {
+    //   console.log(val);
+    //   if (val == null || val == "") {
+    //     console.log("111111");
+    //     this.form.remind_cycle = "";
+    //   }
+    // }
   },
   methods: {
     fetchAllAdminUsers() {
@@ -1737,6 +1755,7 @@ export default {
             this.form.homeTelephone = patietInfo.home_telephone;
             this.form.relative_phone = patietInfo.relative_phone;
             this.form.relative_relations = patietInfo.relative_relations;
+            this.form.remind_cycle = patietInfo.remind_cycle;
             this.form.homeAddress = patietInfo.home_address;
             this.form.work = patietInfo.work_unit;
             this.form.unit_address = patietInfo.unit_address;
@@ -1801,8 +1820,9 @@ export default {
             this.form.dbp = patietInfo.dbp;
 
             this.form.response_result = patietInfo.response_result;
-            this.form.remind_cycle = patietInfo.remind_cycle;
+           
             this.form.is_infectious = patietInfo.is_infectious;
+            console.log("哈哈哈哈",patietInfo.is_infectious)
             if(this.form.is_infectious == 1){
               this.form.remind_cycle = 0
             }

src/xt_pages/user/sickHistory.vue

@@ -441,7 +441,7 @@ export default {
       let params = {
         patient_id: this.patient_id,
         content: this.new_content,
-        record_time: this.sick_history_time,
+        record_time: this.sick_history_time +" 00:00:00",
         title: this.title,
         is_shenyizhishi:this.is_shenyizhishi,
         is_fumotouxishi:this.is_fumotouxishi,
@@ -529,7 +529,7 @@ export default {
       this.requestSickHistory()
     }, endTimeChange(val) {
       this.requestSickHistory()
-    }, 
+    },
     showDialog(){
       for(let i = 0; i < this.doctorOptions.length; i++){
         if(this.doctorOptions[i].id == this.$store.getters.xt_user.user.id){