修改

src/store/modules/tagsView.js

@@ -113,13 +113,13 @@ const actions = {
 
   delView({ dispatch, state }, view) {
     if (view.fullPath == '/task/manualReview') {
-      localStorage.removeItem('routeCheckStatus')
+      localStorage.removeItem('manualReviewquery')
     }
     if (view.fullPath == "/patient/signRecord") {
-      localStorage.removeItem('serviceStatus')
+      localStorage.removeItem('signRecordquery')
     }
     if (view.fullPath == "/task/followup") {
-      localStorage.removeItem('nodeExecuteStatus')
+      localStorage.removeItem('followupquery')
     }
     return new Promise(resolve => {
       dispatch('delVisitedView', view)
@@ -145,13 +145,13 @@ const actions = {
 
   delOthersViews({ dispatch, state }, view) {
     if (view.fullPath != '/task/manualReview') {
-      localStorage.removeItem('routeCheckStatus')
+      localStorage.removeItem('manualReviewquery')
     }
     if (view.fullPath != "/patient/signRecord") {
-      localStorage.removeItem('serviceStatus')
+      localStorage.removeItem('signRecordquery')
     }
     if (view.fullPath != "/task/followup") {
-      localStorage.removeItem('nodeExecuteStatus')
+      localStorage.removeItem('followupquery')
     }
     return new Promise(resolve => {
       dispatch('delOthersVisitedViews', view)

src/views/manage/patientInfo/index.vue

@@ -273,6 +273,7 @@ export default {
       this.$router.push({
         path: "/patient/Portraitedit",
         query: {
+          path: '/patient/patientInfo',
           patientId: row.id,
           cardNo: row.cardNo,
           patientName: row.patientName,

src/views/manage/preHospitalized/index.vue

@@ -633,10 +633,10 @@ export default {
     },
     /** 详情操作 */
     handleAuthRole(row) {
-      console.log(getAge(row.birthDate))
       this.$router.push({
         path: "/patient/patientdetails",
         query: {
+          path: '/patient/preHospitalized',
           patientId: row.patientId,
           cardNo: row.cardNo,
           patientName: row.patientName,
@@ -652,7 +652,6 @@ export default {
       });
     },
     handleHospital(row) {
-      console.log(row, 'row')
       this.resetHospital()
       this.openHospital = true
       if (row.hospitalAgencyId) {
@@ -869,7 +868,6 @@ export default {
       // if (this.formHospital.attendingPhysicianId && this.form_attendingPhysicianlist?.length > 0) {
       //   this.formHospital.attendingPhysicianName = this.form_attendingPhysicianlist.find(e => e.userId == this.formHospital.attendingPhysicianId)?.nickName
       // }
-      console.log(this.formHospital, '888888888')
       // return
       this.$refs["formHospital"].validate(valid => {
         if (valid) {
@@ -979,7 +977,6 @@ export default {
     },
     //选中医院获取院区
     changehospitalAgency(id, type, typetwo) {
-      console.log(id, type, typetwo)
       this.getAgencyListinfo('HOSPITAL', id, type)
       // let query = {
       //   agencyStatus: 'ON',
@@ -987,8 +984,6 @@ export default {
       //   parentId: id,
       // }
       // selectAgencyList(query).then(res => {
-
-      console.log(this.formHospital)
       if (type) {
         if (!typetwo) {
           this.formHospital.campusAgencyId = null

src/views/manage/signRecord/index.vue

@@ -355,8 +355,8 @@ export default {
     };
   },
   created() {
-    if (localStorage.getItem('serviceStatus')) {
+    if (localStorage.getItem('signRecordquery')) {
-      this.queryParams.serviceStatus = localStorage.getItem('serviceStatus')
+      this.queryParams = JSON.parse(localStorage.getItem('signRecordquery'))
     }
     this.selectAgencyinfo();
   },
@@ -374,6 +374,7 @@ export default {
       this.loading = true;
       this.signRecordList = []
       listSignRecord(this.queryParams).then(response => {
+        localStorage.setItem('signRecordquery', JSON.stringify(this.queryParams))
         this.signRecordList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -480,11 +481,11 @@ export default {
     //手动创建任务
     addTask() {
       if (this.addTaskitem) {
-        localStorage.setItem('serviceStatus', this.queryParams.serviceStatus)
         // this.$store.dispatch('tagsView/delView', this.$route).then(({ visitedViews }) => {
         this.$router.push({
           path: "/patient/ManuallyCreatingTasks",
           query: {
+            path: "/patient/signRecord",
             signPatientRecordId: this.addTaskitem.id,
             patientId: this.addTaskitem.patientId,
             patientName: this.addTaskitem.patientName,
@@ -542,7 +543,6 @@ export default {
       }, `signRecord_${new Date().getTime()}.xlsx`)
     },
     handleClick(tab, event) {
-      localStorage.setItem('serviceStatus', this.queryParams.serviceStatus)
       this.intentionalTime = []
       this.queryParams.intentionalTimeStart = null
       this.queryParams.intentionalTimeEnd = null
@@ -557,6 +557,7 @@ export default {
       this.$router.replace({
         path: "/patient/newSigning",
         query: {
+          path: "/patient/signRecord",
           departmentId: row.departmentId,
           patientName: row.patientName,
           patientPhone: row.patientPhone,
@@ -674,6 +675,7 @@ export default {
       this.$router.replace({
         path: "/patient/continueSigning",
         query: {
+          path: "/patient/signRecord",
           hospitalAgencyId: row.hospitalAgencyId,
           hospitalAgencyName: row.hospitalAgencyName,
           patientSignRecordId: row.id,
@@ -686,6 +688,7 @@ export default {
       this.$router.push({
         path: "/patient/patientdetails",
         query: {
+          path: "/patient/signRecord",
           patientId: row.patientId,
           cardNo: row.cardNo,
           patientName: row.patientName,
@@ -705,6 +708,7 @@ export default {
       this.$router.push({
         path: "/patient/Datadetails",
         query: {
+          path: "/patient/signRecord",
           patientId: row.patientId,
           cardNo: row.cardNo,
           patientName: row.patientName,

src/views/manage/visitin/index.vue

@@ -675,6 +675,7 @@ export default {
       this.$router.push({
         path: "/patient/patientdetails",
         query: {
+          path: "/patient/visitin",
           patientId: row.id,
           cardNo: row.cardNo,
           patientName: row.patientName,
@@ -695,8 +696,6 @@ export default {
       const id = row.patientVisitRecordId || this.patientVisitRecordIds
       getPatientInfo(id).then(response => {
         this.form = response.data;
-        console.log(response.data, 'response.data')
-
         if (this.form.hospitalAgencyId) {
           this.changehospitalAgency(this.form.hospitalAgencyId, 1, 2)
         }
@@ -721,16 +720,12 @@ export default {
           this.changehospitalAgency(this.formHospital.hospitalAgencyId, 1, 2)
         }
         if (this.formHospital.campusAgencyId) {
-
           this.changecampusAgency(this.formHospital.campusAgencyId, 1, 2)
         }
         if (this.formHospital.departmentId) {
-
           this.changedepartment(this.formHospital.departmentId, 1, 2)
         }
-        console.log(this.formHospital, 'this.formHospital')
         this.openHospital = true
-
         // this.title = "修改患者信息";
       });
 
@@ -739,7 +734,6 @@ export default {
     getList() {
       this.loading = true;
       this.queryParams.patientType = 'IN_HOSPITAL_PATIENT'
-      console.log(this.queryParams)
       listPatientInfo(this.queryParams).then(response => {
         response.rows.forEach(e => {
           e.birthDate ? e.age = getAge(e.birthDate) : ''
@@ -895,7 +889,6 @@ export default {
       if (this.formHospital.wardId && this.form_wardlist?.length > 0) {
         this.formHospital.wardName = this.form_wardlist.find(e => e.id == this.formHospital.wardId)?.departmentName
       }
-      console.log(this.formHospital, '888888888')
       // return
       this.$refs["formHospital"].validate(valid => {
         if (valid) {
@@ -1025,7 +1018,6 @@ export default {
     },
     //选中医院获取院区
     changehospitalAgency(id, type, typetwo) {
-      console.log(id, type, typetwo)
       this.getAgencyListinfo('HOSPITAL', id, type)
       // let query = {
       //   agencyStatus: 'ON',

src/views/manage/visitout/index.vue

@@ -669,6 +669,7 @@ export default {
       this.$router.push({
         path: "/patient/patientdetails",
         query: {
+          path: "/patient/visitout",
           patientId: row.id,
           cardNo: row.cardNo,
           patientName: row.patientName,

src/views/system/followup/index.vue

@@ -18,7 +18,6 @@
           <el-input v-model="queryParams.patientPhone" placeholder="请输入电话" clearable
             @keyup.enter.native="handleQuery" />
         </el-form-item>
-
         <el-form-item label="医院" prop="hospitalAgencyId">
           <el-select v-model="queryParams.hospitalAgencyId" filterable placeholder="请选择医院" style="width: 200px"
             clearable @clear="clearhospitalAgency" @change="changehospitalAgency">
@@ -50,25 +49,17 @@
           <el-select v-model="queryParams.suitRange" placeholder="请选择就诊类型" clearable @change="change">
             <el-option v-for="item in visitoptions" :key="item.value" :label="item.label" :value="item.value">
             </el-option>
-            <!-- <el-option
-            v-for="dict in dict.type.visit_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          /> -->
           </el-select>
         </el-form-item>
         <el-form-item label="就诊流水号" prop="visitSerialNumber">
           <el-input v-model="queryParams.visitSerialNumber" placeholder="请输入就诊流水号" clearable
             @keyup.enter.native="handleQuery" />
         </el-form-item>
-
         <el-form-item label="门诊/出院时间" prop="intentionalTimeStart">
           <el-date-picker @change="mzchange" v-model="mzTime" type="daterange" range-separator="至"
             start-placeholder="开始日期" style="width: 300px" value-format="yyyy-MM-dd" end-placeholder="结束日期">
           </el-date-picker>
         </el-form-item>
-
         <el-form-item label="入院时间" prop="intentionalTimeStart">
           <el-date-picker v-model="ryTime" type="daterange" range-separator="至" start-placeholder="开始日期"
             style="width: 300px" value-format="yyyy-MM-dd" end-placeholder="结束日期" @change="rychange">
@@ -78,7 +69,6 @@
           <el-input v-model="queryParams.mainDiagnosis" placeholder="请选择诊断" clearable
             @keyup.enter.native="handleQuery" />
         </el-form-item>
-
         <el-form-item label="主治医生" prop="attendingPhysicianId" v-if="queryParams.hospitalAgencyId">
           <el-select v-model="queryParams.attendingPhysicianId" style="width: 200px" filterable placeholder="请选择主治医生"
             clearable>
@@ -87,7 +77,6 @@
             </el-option>
           </el-select>
         </el-form-item>
-
         <el-form-item>
           <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
           <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -110,7 +99,6 @@
         <el-table-column label="院区" align="center" prop="campusAgencyName" />
         <el-table-column label="科室名称" align="center" prop="departmentName" />
         <el-table-column label="病区名称" align="center" prop="wardName" />
-
         <el-table-column label="门诊/住院号" align="center" prop="inHospitalNumber" width="120"
           :show-overflow-tooltip="true" />
         <el-table-column label="就诊流水号" align="center" prop="visitSerialNumber" width="120"
@@ -120,7 +108,8 @@
         <el-table-column label="主治医生" align="center" prop="attendingPhysicianName" width="80" />
         <el-table-column label="就诊类型" align="center" prop="suitRange" width="80">
           <template slot-scope="scope">
-            <span>{{ scope.row.suitRange == "OUTPATIENT_SERVICE" ? "门诊" : "" }}
+            <span>
+              {{ scope.row.suitRange == "OUTPATIENT_SERVICE" ? "门诊" : "" }}
               {{ scope.row.suitRange == "IN_THE_HOSPITAL" ? "在院" : "" }}
               {{ scope.row.suitRange == "DISCHARGE" ? "出院" : "" }}
             </span>
@@ -132,9 +121,9 @@
         </el-table-column>
         <el-table-column label="门诊/出院时间" align="center" prop="visitOrDischargeTime" width="105">
           <template slot-scope="scope">
-            <span>{{
+            <span>
-      parseTime(scope.row.visitOrDischargeTime, "{y}-{m}-{d}")
+              {{ parseTime(scope.row.visitOrDischargeTime, "{y}-{m}-{d}") }}
-    }}</span>
+            </span>
           </template>
         </el-table-column>
         <el-table-column label="随访时间" align="center" prop="executeTime" width="80">
@@ -142,10 +131,8 @@
             <span>{{ parseTime(scope.row.executeTime, "{y}-{m}-{d}") }}</span>
           </template>
         </el-table-column>
-
         <el-table-column label="随访模板" align="center" prop="templateName" width="110">
         </el-table-column>
-
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
           <template slot-scope="scope">
             <el-button v-if="queryParams.nodeExecuteStatus == 'UNEXECUTED'" size="mini" type="text"
@@ -162,12 +149,9 @@
       :indexFromWrap="queryParams.pageNum" @updateCPage="updateCPage"></myPagination>
   </div>
 </template>
-
 <script>
-
 import { manualFollowUpList } from "@/api/system/followup"
 import { usergetList } from "@/api/unitconfig/patientConfiguration";
-
 import { getAge } from "@/utils/age";
 import {
   selectAgencyList, getAgencyList
@@ -194,7 +178,6 @@ export default {
       wardlist: [],
       // 主治医生
       attendingPhysicianlist: [],
-
       // 遮罩层
       loading: true,
       // 选中数组
@@ -225,7 +208,6 @@ export default {
         admissionEndTime: null,
         admissionStartTime: null,
         mainDiagnosis: null,
-
         visitSerialNumber: null,
         attendingPhysicianId: null,
         patientId: null,
@@ -270,8 +252,8 @@ export default {
     };
   },
   created() {
-    if (localStorage.getItem('nodeExecuteStatus')) {
+    if (localStorage.getItem('followupquery')) {
-      this.queryParams.nodeExecuteStatus = localStorage.getItem('nodeExecuteStatus')
+      this.queryParams = JSON.parse(localStorage.getItem('followupquery'))
     }
     this.getList();
     this.selectAgencyinfo();
@@ -287,7 +269,6 @@ export default {
       this.getList();
     },
     handleClick(tab, event) {
-      localStorage.setItem('nodeExecuteStatus', this.queryParams.nodeExecuteStatus)
       this.intentionalTime = []
       this.mzTime = []
       this.ryTime = []
@@ -315,23 +296,15 @@ export default {
       if (e == 'DISCHARGE') {
         this.queryParams.clinicalStartTime = null
         this.queryParams.clinicalEndTime = null
-
       } else if (e == 'OUTPATIENT_SERVICE') {
         this.queryParams.dischargeStartTime = null
         this.queryParams.dischargeEndTime = null
       } else {
-
         this.queryParams.dischargeStartTime = null
         this.queryParams.dischargeEndTime = null
         this.queryParams.clinicalStartTime = null
         this.queryParams.clinicalEndTime = null
       }
-      console.log(e)
-      // DISCHARGE
-      // 出院
-      // OUTPATIENT
-      // 门诊
-
     },
     //主治医生
     usergetListinfo() {
@@ -432,6 +405,7 @@ export default {
     getList() {
       this.loading = true;
       manualFollowUpList(this.queryParams).then((response) => {
+        localStorage.setItem('followupquery', JSON.stringify(this.queryParams))
         this.taskExecuteRecordList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -492,11 +466,8 @@ export default {
         } else if (this.queryParams.suitRange == 'DISCHARGE') {
           this.queryParams.dischargeStartTime = this.mzTime[0]
           this.queryParams.dischargeEndTime = this.mzTime[1]
-
-
           this.queryParams.clinicalStartTime = null
           this.queryParams.clinicalEndTime = null
-
         } else if (this.queryParams.suitRange == 'OUTPATIENT_SERVICE') {
           this.queryParams.dischargeStartTime = null
           this.queryParams.dischargeEndTime = null
@@ -555,7 +526,7 @@ export default {
         campusAgencyId: null,
         departmentId: null,
         wardId: null,
-      },
+      }
       this.handleQuery();
       this.intentionalTime = [];
       this.mzTime = [];
@@ -575,10 +546,10 @@ export default {
     },
     /** 处理按钮操作 */
     handleUpdate(row) {
-      console.log(row)
       this.$router.push({
         path: "/task/followupsee",
         query: {
+          path: "/task/followup",
           patientId: row.patientId,
           taskType: row.taskType,
           templateId: row.templateId,
@@ -597,36 +568,31 @@ export default {
           manageRouteId: row.manageRouteId,
           manageRouteNodeId: row.manageRouteNodeId,
           visitRecordId: row.visitRecordId,
-
           departmentId: row.departmentId,
           departmentName: row.departmentName,
           diseaseTypeId: row.diseaseTypeId ? row.diseaseTypeId : null,
           diseaseTypeName: row.diseaseTypeName ? row.diseaseTypeName : null,
-          followTemplateId:row.followTemplateId?row.followTemplateId:null,
+          followTemplateId: row.followTemplateId ? row.followTemplateId : null,
-          phoneId:row.phoneId?row.phoneId:null,
+          phoneId: row.phoneId ? row.phoneId : null,
         },
       });
-
     },
     // 详情
     handleadtail(row) {
       this.$router.push({
         path: "/task/followupdetails",
         query: {
+          path: "/task/followup",
           patientId: row.patientId,
           taskType: row.taskType,
           templateId: row.templateId,
           manageRouteId: row.manageRouteId,
           manageRouteNodeId: row.manageRouteNodeId,
-
           visitRecordId: row.visitRecordId,
           taskExecuteRecordId: row.taskExecuteRecordId,
           routeHandleRemark: row.routeHandleRemark ? row.routeHandleRemark : null,
         },
       });
-      console.log(row)
-
-
     },
     /** 提交按钮 */
     submitForm() {