解决404

.env.production

@@ -6,5 +6,6 @@ ENV = 'production'
 
 VUE_APP_BASE_API = 'http://39.105.121.97:8080/api'
 VUE_APP_BASE_WSS = 'ws://39.105.121.97:8002/ws'
+
 # VUE_APP_BASE_API = 'http://106.74.15.131:81/api'
 # VUE_APP_BASE_WSS = 'ws://106.74.15.131:8002/ws'

src/views/medicalRecords/recordDetailDialog.vue

@@ -11,57 +11,57 @@
     >
     <div class="df_box">
       <div class="left_box">
-        <div style="display: flex; margin-top: 10px">
+        <div style="display: flex;">
           <div style="width: 80px; font-weight: 700">主诉：</div>
           <div style="flex: 1">
             {{ recordDetailObj.chiefComplaintContent }}
           </div>
         </div>
-        <div style="display: flex; margin-top: 10px">
+        <div style="display: flex; margin-top: 30px">
           <div style="width: 80px; font-weight: 700">现病史：</div>
           <div style="flex: 1">
             {{ recordDetailObj.presentIllnessContent }}
           </div>
         </div>
-        <div style="display: flex; margin-top: 10px">
+        <div style="display: flex; margin-top: 30px">
           <div style="width: 80px; font-weight: 700">既往史：</div>
           <div style="flex: 1">
             {{
-              recordDetailObj.doctorPastHistory.length > 0 ? recordDetailObj.doctorPastHistory.join() : '无'
+            recordDetailObj.doctorPastHistory ? recordDetailObj.doctorPastHistory.join() : '无'
             }}
           </div>
         </div>
-        <div style="display: flex; margin-top: 10px">
+        <div style="display: flex; margin-top: 30px">
           <div style="width: 80px; font-weight: 700">家族史：</div>
           <div style="flex: 1">
-            {{recordDetailObj.doctorFamilyHistory.length > 0 ? recordDetailObj.doctorFamilyHistory.join() : '无'}}
+            {{recordDetailObj.doctorFamilyHistory ? recordDetailObj.doctorFamilyHistory.join() : '无'}}
           </div>
         </div>
-        <div style="display: flex; margin-top: 10px">
+        <div style="display: flex; margin-top: 30px">
           <div style="width: 80px; font-weight: 700">过敏史：</div>
           <div style="flex: 1">
-            {{recordDetailObj.doctorAllergyHistory.length > 0 ? recordDetailObj.doctorAllergyHistory.join() : '无'}}
+            {{recordDetailObj.doctorAllergyHistory ? recordDetailObj.doctorAllergyHistory.join() : '无'}}
           </div>
         </div>
-        <div style="display: flex; margin-top: 10px">
+        <div style="display: flex; margin-top: 30px">
           <div style="width: 80px; font-weight: 700">检查：</div>
           <div style="flex: 1; display: flex; flex-direction: column">
             {{ recordDetailObj.inspectContent }}
           </div>
         </div>
-        <div style="display: flex; margin-top: 10px">
+        <div style="display: flex; margin-top: 30px">
           <div style="width: 80px; font-weight: 700">诊断：</div>
           <div style="flex: 1; display: flex; flex-direction: column">
             {{ recordDetailObj.diagnosisContent }}
           </div>
         </div>
-        <div style="display: flex; margin-top: 10px">
+        <div style="display: flex; margin-top: 30px">
           <div style="width: 80px; font-weight: 700">治疗计划：</div>
           <div style="flex: 1; display: flex; flex-direction: column">
             {{ recordDetailObj.treatmentPlanningContent }}
           </div>
         </div>
-        <div style="display: flex; margin-top: 10px">
+        <div style="display: flex; margin-top: 30px">
           <div style="width: 80px; font-weight: 700">
             处置：
           </div>
@@ -69,7 +69,7 @@
             {{ recordDetailObj.disposeContent }}
           </div>
         </div>
-        <div style="display: flex; margin-top: 10px">
+        <div style="display: flex; margin-top: 30px">
           <div style="width: 80px; font-weight: 700">便签：</div>
           <div style="flex: 1; display: flex; flex-direction: column">
             {{ recordDetailObj.noteContent }}
@@ -78,25 +78,25 @@
       </div>
       <div class="rigth_box">
         <el-card style="height: 100%; padding: 20px">
-          <div style="display: flex; margin-top: 10px">
+          <div style="display: flex;">
             <div style="width: 80px; font-weight: 700">科室：</div>
             <div style="flex: 1">
               {{ recordDetailObj.department }}
             </div>
           </div>
-          <div style="display: flex; margin-top: 10px">
+          <div style="display: flex; margin-top: 30px">
             <div style="width: 80px; font-weight: 700">医生：</div>
             <div style="flex: 1">
               {{ recordDetailObj.attendingDoctorName }}
             </div>
           </div>
-          <div style="display: flex; margin-top: 10px">
+          <div style="display: flex; margin-top: 30px">
             <div style="width: 80px; font-weight: 700">费用：</div>
             <div style="flex: 1">
               {{ recordDetailObj.cost }} 元
             </div>
           </div>
-          <div style="display: flex; margin-top: 10px">
+          <div style="display: flex; margin-top: 30px">
             <div style="width: 80px; font-weight: 700">诊所：</div>
             <div style="flex: 1">
               {{ recordDetailObj.outpatientService }}
@@ -142,6 +142,7 @@ export default {
   display: flex;
   max-height: 70vh;
   overflow: auto;
+  padding: 20px 0px;
 
   .left_box {
     flex: 1;

src/views/operationsAnalysis/index.vue

@@ -30,11 +30,11 @@
         <p>预约个数： {{ tableForm.patientAppointmentCount }}</p>
       </el-col>
       <el-col :span="8" class="two_box">
-        <p>应收费用：{{ tableForm.receivableCost }}</p>
+        <p>应收费用：{{ tableForm.receivableCost }}（元）</p>
         <p>就诊数： {{ tableForm.medicalRecordCount }}</p>
       </el-col>
       <el-col :span="8" class="two_box">
-        <p>实收费用： {{ tableForm.netReceiptsCost }}</p>
+        <p>实收费用： {{ tableForm.netReceiptsCost }}（元）</p>
         <p>回访数： {{ tableForm.patientFollowUpCount }}</p>
       </el-col>
     </el-row>
@@ -212,7 +212,7 @@ export default {
               position: 'top' // 标签位置顶部
             },
             type: 'bar',
-            barWidth: '5%'
+            barWidth: '25%'
           }
         ]
       }

src/views/patientCenter/medical/index.vue

@@ -24,9 +24,9 @@
       >
         <el-card>
           <el-collapse>
-            <el-collapse-item  >
+            <el-collapse-item>
               <template slot="title">
-                <div style="display: flex; align-items: center">
+                <div style="display: flex; max-width: 1200px; align-items: center;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;">
                   <span> {{ item.visitType == 1 ? '初诊' : '复诊' }} </span>
                   <span class="span_heigth"> </span>
                   <span> 诊断：{{ item.diagnosisContent }} </span>
@@ -104,7 +104,7 @@
                   <div style="display: flex; margin-top: 10px">
                     <div style="width: 80px; font-weight: 700">处置：</div>
                     <div style="flex: 1; display: flex; flex-direction: column">
-                        {{ item.treatmentPlanningContent }}
+                        {{ item.disposeContent }}
                     </div>
                   </div>
                   <div style="display: flex; margin-top: 10px">
@@ -131,7 +131,7 @@
                     <div style="display: flex; margin-top: 10px">
                       <div style="width: 80px; font-weight: 700">费用：</div>
                       <div style="flex: 1">
-                        {{ item.cost}} 元
+                        {{ item.cost}} （元）
                       </div>
                     </div>
                     <div style="display: flex; margin-top: 10px">

src/views/returnVisit/addVisitDialog.vue

@@ -313,28 +313,28 @@
                     <el-collapse>
                       <el-collapse-item>
                         <template slot="title">
-                          <div style="display: flex; align-items: center">
+                          <div style="display: flex;width: 620px; align-items: center;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;">
                             <span>
                               {{ item.visitType == 1 ? '初诊' : '复诊' }}
                             </span>
                             <span class="span_heigth"> </span>
-                            <span> 诊断：{{ item.diagnosisTypeCn }} </span>
+                            <span> 诊断：{{ item.diagnosisContent }} </span>
                             <span class="span_heigth"> </span>
-                            <span> 治疗：{{ item.treatment }} </span>
+                            <span> 治疗：{{ item.treatmentPlanningContent }} </span>
                           </div>
 
-                          <div
+                          <!-- <div
                             class="white dayin_box"
                             @click.prevent.stop="print(item.id)"
                           >
                             打印病历
-                          </div>
-                          <div v-if="item.status == 2" class="zhang_box">
+                          </div> -->
+                          <!-- <div v-if="item.status == 2" class="zhang_box">
                             已完成治疗
                           </div>
                           <div v-if="item.status == 1" class="zhang_box">
                             待复诊
-                          </div>
+                          </div> -->
                         </template>
                         <div class="df_box">
                           <div class="left_box">
@@ -343,12 +343,7 @@
                                 主诉：
                               </div>
                               <div style="flex: 1">
-                                {{
-                                  initToothPosition(
-                                    item.dataList[0].toothPosition
-                                  )
-                                }}
-                                {{ item.dataList[0].data[0].contentInfo }}
+                                {{ item.chiefComplaintContent }}
                               </div>
                             </div>
                             <div style="display: flex; margin-top: 10px">
@@ -356,12 +351,7 @@
                                 现病史：
                               </div>
                               <div style="flex: 1">
-                                {{
-                                  initToothPosition(
-                                    item.dataList[0].toothPosition
-                                  )
-                                }}
-                                {{ item.dataList[0].data[1].contentInfo }}
+                                {{ item.presentIllnessContent }}
                               </div>
                             </div>
                             <div style="display: flex; margin-top: 10px">
@@ -369,12 +359,7 @@
                                 既往史：
                               </div>
                               <div style="flex: 1">
-                                {{
-                                  item.dataList[0].data[2].formattedPartsList
-                                    .length > 0
-                                    ? item.dataList[0].data[2].formattedPartsList.join()
-                                    : '无'
-                                }}
+                                {{ Array.isArray(item.doctorPastHistory) && item.doctorPastHistory.length > 0 ? item.doctorPastHistory.join() : '无' }}
                               </div>
                             </div>
                             <div style="display: flex; margin-top: 10px">
@@ -382,12 +367,7 @@
                                 家族史：
                               </div>
                               <div style="flex: 1">
-                                {{
-                                  item.dataList[0].data[3].formattedPartsList
-                                    .length > 0
-                                    ? item.dataList[0].data[2].formattedPartsList.join()
-                                    : '无'
-                                }}
+                                {{ Array.isArray(item.doctorFamilyHistory) && item.doctorFamilyHistory.length > 0 ? item.doctorFamilyHistory.join() : '无' }}
                               </div>
                             </div>
                             <div style="display: flex; margin-top: 10px">
@@ -395,12 +375,7 @@
                                 过敏史：
                               </div>
                               <div style="flex: 1">
-                                {{
-                                  item.dataList[0].data[4].formattedPartsList
-                                    .length > 0
-                                    ? item.dataList[0].data[2].formattedPartsList.join()
-                                    : '无'
-                                }}
+                                {{ Array.isArray(item.doctorAllergyHistory) && item.doctorAllergyHistory.length > 0 ? item.doctorAllergyHistory.join() : '无' }}
                               </div>
                             </div>
                             <div style="display: flex; margin-top: 10px">
@@ -414,43 +389,7 @@
                                   flex-direction: column;
                                 "
                               >
-                                <span
-                                  v-for="(it, ind) in item.dataList"
-                                  :key="ind"
-                                  style="margin-top: 5px"
-                                >
-                                  {{
-                                    initToothPosition(
-                                      item.dataList[ind].toothPosition
-                                    )
-                                  }}
-                                  {{ it.data[5].contentInfo }}
-                                </span>
-                              </div>
-                            </div>
-                            <div style="display: flex; margin-top: 10px">
-                              <div style="width: 80px; font-weight: 700">
-                                X线片示（影像）：
-                              </div>
-                              <div
-                                style="
-                                  flex: 1;
-                                  display: flex;
-                                  flex-direction: column;
-                                "
-                              >
-                                <span
-                                  v-for="(it, ind) in item.dataList"
-                                  :key="ind"
-                                  style="margin-top: 5px"
-                                >
-                                  {{
-                                    initToothPosition(
-                                      item.dataList[ind].toothPosition
-                                    )
-                                  }}
-                                  {{ it.data[6].contentInfo }}
-                                </span>
+                                {{ item.inspectContent }}
                               </div>
                             </div>
                             <div style="display: flex; margin-top: 10px">
@@ -464,18 +403,7 @@
                                   flex-direction: column;
                                 "
                               >
-                                <span
-                                  v-for="(it, ind) in item.dataList"
-                                  :key="ind"
-                                  style="margin-top: 5px"
-                                >
-                                  {{
-                                    initToothPosition(
-                                      item.dataList[ind].toothPosition
-                                    )
-                                  }}
-                                  {{ it.data[7].contentInfo }}
-                                </span>
+                              {{ item.diagnosisContent }}
                               </div>
                             </div>
                             <div style="display: flex; margin-top: 10px">
@@ -489,43 +417,7 @@
                                   flex-direction: column;
                                 "
                               >
-                                <span
-                                  v-for="(it, ind) in item.dataList"
-                                  :key="ind"
-                                  style="margin-top: 5px"
-                                >
-                                  {{
-                                    initToothPosition(
-                                      item.dataList[ind].toothPosition
-                                    )
-                                  }}
-                                  {{ it.data[8].contentInfo }}
-                                </span>
-                              </div>
-                            </div>
-                            <div style="display: flex; margin-top: 10px">
-                              <div style="width: 80px; font-weight: 700">
-                                处置（基础模版公用）：
-                              </div>
-                              <div
-                                style="
-                                  flex: 1;
-                                  display: flex;
-                                  flex-direction: column;
-                                "
-                              >
-                                <span
-                                  v-for="(it, ind) in item.dataList"
-                                  :key="ind"
-                                  style="margin-top: 5px"
-                                >
-                                  {{
-                                    initToothPosition(
-                                      item.dataList[ind].toothPosition
-                                    )
-                                  }}
-                                  {{ it.data[9].contentInfo }}
-                                </span>
+                              {{ item.treatmentPlanningContent }}
                               </div>
                             </div>
                             <div style="display: flex; margin-top: 10px">
@@ -539,23 +431,12 @@
                                   flex-direction: column;
                                 "
                               >
-                                <span
-                                  v-for="(it, ind) in item.dataList"
-                                  :key="ind"
-                                  style="margin-top: 5px"
-                                >
-                                  {{
-                                    initToothPosition(
-                                      item.dataList[ind].toothPosition
-                                    )
-                                  }}
-                                  {{ it.data[10].contentInfo }}
-                                </span>
+                              {{ item.disposeContent }}
                               </div>
                             </div>
                             <div style="display: flex; margin-top: 10px">
                               <div style="width: 80px; font-weight: 700">
-                                医嘱：
+                                便签：
                               </div>
                               <div
                                 style="
@@ -564,18 +445,7 @@
                                   flex-direction: column;
                                 "
                               >
-                                <span
-                                  v-for="(it, ind) in item.dataList"
-                                  :key="ind"
-                                  style="margin-top: 5px"
-                                >
-                                  {{
-                                    initToothPosition(
-                                      item.dataList[ind].toothPosition
-                                    )
-                                  }}
-                                  {{ it.data[11].contentInfo }}
-                                </span>
+                              {{ item.noteContent }}
                               </div>
                             </div>
                           </div>
@@ -586,7 +456,7 @@
                                   科室：
                                 </div>
                                 <div style="flex: 1">
-                                  {{ list[0].department }}
+                                  {{ item.department }}
                                 </div>
                               </div>
                               <div style="display: flex; margin-top: 10px">
@@ -594,7 +464,7 @@
                                   医生：
                                 </div>
                                 <div style="flex: 1">
-                                  {{ list[0].attendingDoctorName }}
+                                  {{ item.attendingDoctorName }}
                                 </div>
                               </div>
                               <div style="display: flex; margin-top: 10px">
@@ -602,7 +472,7 @@
                                   费用：
                                 </div>
                                 <div style="flex: 1">
-                                  {{ list[0].cost }}
+                                  {{ item.cost }} （元）
                                 </div>
                               </div>
                               <div style="display: flex; margin-top: 10px">
@@ -610,7 +480,7 @@
                                   诊所：
                                 </div>
                                 <div style="flex: 1">
-                                  {{ list[0].clinicName }}
+                                  {{ item.outpatientService }}
                                 </div>
                               </div>
                             </el-card>
@@ -987,7 +857,7 @@ export default {
         patientId: this.patientId,
         queryScope: this.date
       })
-      console.log(res.data,"res.data");
+      console.log(res.data,"res.data3");
       this.list = res.data
     },
     getAgeFromIdCard(idCard) {
@@ -1152,7 +1022,7 @@ export default {
       padding-left: 10px;
     }
     .rigth_box {
-      width: 300px;
+      width: 200px;
     }
   }
 }
@@ -1212,4 +1082,22 @@ ul {
     }
   }
 }
+
+.white {
+  display: inline-block;
+  background-color: #fff;
+  color: #606266;
+  border: 1px solid #dcdfe6;
+  line-height: 30px;
+  border-radius: 5%;
+  min-width: 80px;
+  text-align: center;
+  cursor: pointer;
+}
+
+.dayin_box {
+  position: absolute;
+  left: 85%;
+  top: 5;
+}
 </style>

src/views/system/user/index.vue

@@ -829,9 +829,9 @@ export default {
   created() {
     this.getList()
     this.getDeptTree()
-    this.getConfigKey('sys.user.initPassword').then((response) => {
-      this.initPassword = response.msg
-    })
+    // this.getConfigKey('sys.user.initPassword').then((response) => {
+    //   this.initPassword = response.msg
+    // })
     this.initBusinessDictData()
   },
   methods: {