Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web

src/components/charge/RecordsLog.vue

@@ -9,10 +9,10 @@
                 <el-tooltip
                     class="box-item"
                     effect="dark"
-                    :content="item.diagnosisMedicalRecord.diagnosisSummary"
+                    :content="item.diagnosisMedicalRecord?.diagnosisSummary"
                     placement="bottom-start"
                 >
-                  <span class="disease-name">{{ item.diagnosisMedicalRecord.diagnosisSummary }}</span>
+                  <span class="disease-name">{{ item.diagnosisMedicalRecord?.diagnosisSummary }}</span>
                 </el-tooltip>
                 <!--                <span class="doctor">{{ item.patientId }}</span>-->
                 <!--                <span class="time">{{ item.createDatetime }}</span>-->
@@ -37,9 +37,10 @@ const list = ref<any>([])
 
 const init = (patientId: any) => {
   const query = {
-    patientId: patientId
+    patientId: patientId,
+    pageSize:10
   }
-  post('charge/list', {query}).then((res: any) => {
+  post('charge/listDetail', {query}).then((res: any) => {
     list.value = res.list
   })
 }

src/components/charge/RecordsLog/Detail.vue

@@ -61,11 +61,11 @@ const {detail} = defineProps(['detail']);
 const detailObj = ref<any>(detail)
 const sumPrice = ref(0)
 onMounted(() => {
-  const pharmaceuticalTotalAmount = detailObj.value.serviceDetail.reduce((pre: any, cur: any) => {
+  const pharmaceuticalTotalAmount = detailObj.value.serviceDetail?.reduce((pre: any, cur: any) => {
     return pre + cur.number * cur.unitPrice
   }, 0);
 
-  const serviceTotalAmount = detailObj.value.goodsDetail.reduce((pre: any, cur: any) => {
+  const serviceTotalAmount = detailObj.value.goodsDetail?.reduce((pre: any, cur: any) => {
     return pre + cur.number * cur.unitPrice
   }, 0);
   sumPrice.value = pharmaceuticalTotalAmount + serviceTotalAmount;

src/components/charge/Settlement.vue

@@ -8,7 +8,7 @@
         </div>
       </template>
       <div class="panel">
-        <div class="price">￥{{ prop.money }}</div>
+        <div class="price">￥{{ retailOrder.totalPrice }}</div>
         <div class="social" >
           <CardPay v-model="socialCard"/>
         </div>
@@ -50,12 +50,6 @@ import PersonalPayment from "@/components/charge/PersonalPayment.vue";
 import {ElMessage} from "element-plus";
 const wsStore = useWsStore();
 const socialCard =defineModel<any>();
-const prop=defineProps({
-  money: {
-    type: String,
-    default: ''
-  }
-})
 
 const show = ref(false)
 const printReceipt = ref(false);

src/components/outpatient/MedicalHistory.vue

@@ -29,13 +29,12 @@ const list = ref<any>([])
 const init = (patientId: any) => {
   post("medical/record/listByPatient",{patientId:patientId}).then((res: any) => {
     list.value = res
-    emit('initMedicalRecord', res[0].diagnosisMedicalRecord.allergyHistory,res[0].diagnosisMedicalRecord.beforeMedicalHistory)
   })
 }
 const clearList = () => {
   list.value = []
 }
-const emit = defineEmits(['copy','copyItem','copyGoods',"initMedicalRecord"])
+const emit = defineEmits(['copy','copyItem','copyGoods'])
 const copy = (item: any) => {
   emit('copy', item)
 }

src/components/retail/OrderDetail.vue

@@ -155,9 +155,12 @@ import {medTypeJson} from "@/assets/config/constants.ts";
 const show = ref<boolean>(false);
 const orderInfo = ref<any>({});
 
-const init = (order: any) => {
+const init = (code: any) => {
-  orderInfo.value = order;
   show.value = true;
+  post("charge/getByCode", {code: code}).then((res: any)=>{
+    orderInfo.value = res;
+  })
+
 }
 //修改时间格式化
 const formatDate = (isoStr: any) => {

src/views/charge/index.vue

@@ -58,7 +58,6 @@
     </div>
   </div>
   <Settlement
-      :money="formData.totalPrice"
       ref="settlementRef"
       v-model="socialCard"
       @orderCompleted="orderCompleted"

src/views/member/index.vue

@@ -256,7 +256,7 @@ const getChargeList = (id: any) => {
   })
 }
 const openDetail = (row: any, column: any, event: Event) => {
-  orderDetailRef.value.init(row)
+  orderDetailRef.value.init(row.code)
 }
 const statusObj = {
   0: "未完成",

src/views/outpatient/index.vue

@@ -30,7 +30,7 @@
         <MedicalInformation v-model="seeDockerInfo" ref="medicalInformationRef"></MedicalInformation>
       </div>
       <div class="bottom">
-        <MedicalHistory ref="medicalHistoryRef" @copy="copyForm" @copyItem="copyItemList" @copyGoods="copyGoodsList" @initMedicalRecord="initMedicalRecord"></MedicalHistory>
+        <MedicalHistory ref="medicalHistoryRef" @copy="copyForm" @copyItem="copyItemList" @copyGoods="copyGoodsList" ></MedicalHistory>
       </div>
     </div>
   </div>
@@ -181,6 +181,8 @@ const getSeeDockerInfo  = (newValue:any) => {
   if (!registerId.value)return;
   post('medical/record/getSeeDockerInfo', {regisId: newValue}).then((res: any) => {
     seeDockerInfo.value = res
+    formData.value.allergyHistory = res.patientInfo.allergyHistory;
+    formData.value.beforeMedicalHistory = res.patientInfo.beforeMedicalHistory;
   })
 }
 const isShowFrom= ref<any>(false)
@@ -195,10 +197,7 @@ watch(() => registerId.value, (newValue) => {
   getSeeDockerInfo(newValue)
 })
 
-const initMedicalRecord = (allergy:string, before:string) => {
+
-  formData.value.allergyHistory = allergy;
-  formData.value.beforeMedicalHistory = before;
-}
 </script>
 <style scoped lang="scss">
 .container {