dev

src/components/outpatient/DiseaseDetails.vue

@@ -10,14 +10,14 @@
         <button class="btn">复制</button>
       </div>
       <div class="content-middle">
-        <p>主诉:{{ detailObj.mainAppeal }}</p>
-        <p>现病:{{ detailObj.nowMedicalHistory }}</p>
-        <p>既往:{{ detailObj.beforeMedicalHistory }}</p>
-        <p>体查:{{ detailObj.exam }}</p>
-        <p>复查:{{ detailObj.allergy }}</p>
-        <p>过敏:{{ detailObj.allergyHistory }}</p>
-        <p>诊断:{{ detailObj.pastMedicalHistory }}</p>
-        <p>处置:{{ detailObj.treatment }}</p>
+        <p>主诉:{{ detailObj.diagnosisMedicalRecord.mainAppeal }}</p>
+        <p>现病:{{ detailObj.diagnosisMedicalRecord.nowMedicalHistory }}</p>
+        <p>既往:{{ detailObj.diagnosisMedicalRecord.beforeMedicalHistory }}</p>
+        <p>体查:{{ detailObj.diagnosisMedicalRecord.exam }}</p>
+        <p>复查:{{ detailObj.diagnosisMedicalRecord.allergy }}</p>
+        <p>过敏:{{ detailObj.diagnosisMedicalRecord.allergyHistory }}</p>
+        <p>诊断:{{ detailObj.diagnosisMedicalRecord.pastMedicalHistory }}</p>
+        <p>处置:{{ detailObj.diagnosisMedicalRecord.treatment }}</p>
       </div>
     </div>
     <div class="content">
@@ -26,11 +26,11 @@
         <button class="btn">复制</button>
       </div>
       <div class="content-middle">
-        <div class="item" v-for="item in detailObj.serviceDetail">
-          <div class="name">{{item.projectName}}</div>
+        <div class="item" v-for="item in detailObj.itemDetail">
+          <div class="name">{{item.name}}</div>
           <div class="price">
-            <div class="price-left">{{item.projectUnit}}次</div>
-            <div class="price-right">￥{{item.projectUnitPrice}}</div>
+            <div class="price-left">{{item.unit}}</div>
+            <div class="price-right">￥{{item.unitPrice}}</div>
           </div>
         </div>
       </div>
@@ -42,10 +42,20 @@
       </div>
       <div class="content-middle">
         <div class="item" v-for="item in detailObj.goodsDetail">
-          <div class="name">{{item.projectName}}</div>
+          <div class="name">{{item.name}}</div>
           <div class="price">
-            <div class="price-left">{{item.projectUnit}}次</div>
-            <div class="price-right">￥{{item.projectUnitPrice}}</div>
+            <div class="price-left">{{ item.selectedNum || 0 }}{{ item.selectedUnit }}</div>
+            <div class="price-right">￥{{item.selectedPrice}}</div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="content">
+      <div class="content-middle">
+        <div class="item">
+          <div class="name">合计</div>
+          <div class="price">
+            <div class="price-right">￥{{sumPrice}}</div>
           </div>
         </div>
       </div>
@@ -53,27 +63,21 @@
   </div>
 </template>
 <script setup lang="ts">
-import {defineProps} from 'vue'
+import {ref, defineProps, onMounted} from 'vue'
 
-interface Detail {
-  mainAppeal: string; // 主诉
-  pastMedicalHistory: string;// 诊断
-  nowMedicalHistory: string; // 现病
-  beforeMedicalHistory: string; // 既往
-  allergyHistory: string; // 过敏
-  exam: string; // 体格检查
-  allergy: string; //辅助检查
-  treatment: string; // 处置
-  serviceDetail: any[];
-  goodsDetail: any[];
-}
+const {detail} = defineProps(['detail']);
+const detailObj = ref<any>(detail)
+const sumPrice = ref(0)
+onMounted(()=>{
+  const pharmaceuticalTotalAmount = detailObj.value.itemDetail.reduce((pre: any, cur: any) => {
+    return pre + cur.unitPrice
+  }, 0);
 
-interface Props {
-  detail: Detail;
-}
-
-const props = defineProps<Props>();
-const detailObj = props.detail
+  const serviceTotalAmount =detailObj.value.goodsDetail.reduce((pre: any, cur: any) => {
+    return pre + cur.selectedNum * cur.selectedPrice
+  }, 0);
+  sumPrice.value = pharmaceuticalTotalAmount + serviceTotalAmount;
+})
 </script>
 <style scoped lang="scss">
 .disease-detail {

src/components/outpatient/MedicalHistory.vue

@@ -37,7 +37,6 @@ const init = (patientId: any) => {
   post("medical/record/listByPatient",{patientId:patientId}).then((res: any) => {
     list.value = res
   })
-  console.log('init')
 }
 defineExpose({init})
 </script>

src/views/outpatient/index.vue

@@ -90,7 +90,6 @@ const getId = (item: any) => {
   registerId.value = item.id
   patientId.value = item.patientInfoId
   nextTick(() => {
-    medicalInformationRef.value?.init(registerId.value);
     medicalHistoryRef.value?.init(patientId.value);
   })
   if (item.status == 1) {