Merge remote-tracking branch 'origin/main'

src/components/outpatient/Case.vue

@@ -72,7 +72,7 @@ interface ShowConfig {
   prop: string;
 }
 
-const diagnosisSearchApi = "social/directory/getDiagnosis"
+const diagnosisSearchApi = "social/diagnose/search"
 const diagnosisShowConfig: ShowConfig[] = [
   {
     label: "诊断名称",

src/components/statistics/over/Charge.vue

@@ -3,7 +3,7 @@
     <div class="content">
       <div class="title">
         <el-date-picker
-            v-model="value2"
+            v-model="dateArray"
             type="daterange"
             range-separator="~"
             start-placeholder="开始日期"
@@ -34,45 +34,14 @@
   </div>
 </template>
 <script setup lang="ts">
-import {h, ref, type VNode} from 'vue'
+import {h, onMounted, ref, type VNode} from 'vue'
 import type { TableColumnCtx } from 'element-plus'
-const value2 = ref([])
+import {post} from "@/utils/request.ts";
+import {getThisWeek} from "@/utils/dateUtils.ts";
+
+const dateArray = ref<any>([])
 const tableData: Product[] = [
-  {
-    id: '12987122',
-    name: 'Tom',
-    amount1: '234',
-    amount2: '3.2',
-    amount3: 10,
-  },
-  {
-    id: '12987123',
-    name: 'Tom',
-    amount1: '165',
-    amount2: '4.43',
-    amount3: 12,
-  },
-  {
-    id: '12987124',
-    name: 'Tom',
-    amount1: '324',
-    amount2: '1.9',
-    amount3: 9,
-  },
-  {
-    id: '12987125',
-    name: 'Tom',
-    amount1: '621',
-    amount2: '2.2',
-    amount3: 17,
-  },
-  {
-    id: '12987126',
-    name: 'Tom',
-    amount1: '539',
-    amount2: '4.1',
-    amount3: 15,
-  },
+
 ]
 interface Product {
   id: string
@@ -112,6 +81,17 @@ const getSummaries = (param: SummaryMethodProps) => {
 
   return sums
 }
+const getDailyReport = ()=>{
+  post("charge/dailyChargingReport",{startDate:dateArray.value[0],endDate:dateArray.value[1]} ).then((res:any)=>{
+
+  })
+}
+onMounted(()=>{
+  let thisWeek = getThisWeek()
+  dateArray.value[0] = thisWeek.start
+  dateArray.value[1] = thisWeek.end
+  getDailyReport()
+})
 </script>
 <style scoped lang="scss">
 .title{

src/views/outpatient/index.vue

@@ -6,15 +6,15 @@
     <div class="middle">
       <el-scrollbar>
         <div class="case">
-          <CaseDetail v-if="registerId&&formData" v-model="formData"></CaseDetail>
+          <CaseDetail v-if="registerId&&formData.status == 3" v-model="formData"></CaseDetail>
           <Case v-else v-model="formData"></Case>
         </div>
         <div class="service-items">
-          <ServiceItemsDetail v-if="registerId&&itemList" v-model="itemList"></ServiceItemsDetail>
+          <ServiceItemsDetail v-if="registerId&&formData.status == 3" v-model="itemList"></ServiceItemsDetail>
           <ServiceItems v-else v-model="itemList"></ServiceItems>
         </div>
         <div class="pharmaceutical-consumables">
-          <PharmaceuticalConsumablesDetail v-if="registerId&&goodsList"
+          <PharmaceuticalConsumablesDetail v-if="registerId&&formData.status == 3"
                                            v-model="goodsList"></PharmaceuticalConsumablesDetail>
           <PharmaceuticalConsumables v-else v-model="goodsList"></PharmaceuticalConsumables>
         </div>
@@ -64,10 +64,7 @@ const save = () => {
     adjunctCheck: formData.value.adjunctCheck,
     deal: formData.value.deal,
   }
-  const data = {
-    itemList: itemList.value,
-    goodsList: goodsList.value,
-    patientId: patientId.value,
+  let medicalRecord = {
     json: JSON.stringify(json),
     mainAppeal: formData.value.mainAppeal,
     nowMedicalHistory: formData.value.nowMedicalHistory,
@@ -76,7 +73,14 @@ const save = () => {
     exam: formData.value.exam,
     diagnosisDetail: formData.value.diagnosisDetail,
     diagnosisSummary: formData.value.diagnosisSummary,
-    registrationId: registerId.value
+  }
+  const data = {
+    registrationId: registerId.value,
+    patientId: patientId.value,
+    itemList: itemList.value,
+    goodsList: goodsList.value,
+    diagnosisMedicalRecord: medicalRecord,
+
   }
   post('medical/record/save', {data: data}).then(() => {
     ElMessage.success("保存成功")

src/views/social/directory.vue

@@ -144,7 +144,7 @@ const start_type = () => {
 }
 let download = (ver: any, type: any) => {
   post("social/directory/download", {ver: ver, type: type}).then((res: any) => {
-    if (res == null) {
+    if (res == null || res == "") {
       loading.value = false;
       ElNotification({
         title: '提示',
@@ -153,7 +153,9 @@ let download = (ver: any, type: any) => {
       })
       return
     }
+    get_data_list()
     start_type()
+
   }).catch((err: any) => {
     loading.value = false;
     ElNotification({