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

src/components/charge/CardPay.vue

@@ -1,7 +1,6 @@
 <script setup lang="ts">
 
 import {getKey} from "@/utils/discrotyUtil.ts";
-import insutypes from "@/assets/config/directory/insutypes.json";
 import {onMounted, onUnmounted, ref} from "vue";
 import {ElMessage} from "element-plus";
 import {post} from "@/utils/request.ts";

src/components/charge/ChargeQueue.vue

@@ -70,7 +70,7 @@ const clickFirst = () => {
   clickItem(orderList.value[0])
 }
 const getOrderList = () => {
-  post("charge/list", {query: query.value}).then(
+  post("medical/record/getChargeQueue", {query: query.value}).then(
       (res: any) => {
         orderList.value = res.list
         clickFirst()

src/views/charge/index.vue

@@ -10,9 +10,9 @@
         <template #tools>
           <span>{{formData.totalPrice}}</span>
           <el-button type="primary" @click="delDraft()" v-if="formData.id == -1" >删除</el-button>
-          <el-button type="primary" @click="saveAndCharge" v-if="formData.status == 0">收费</el-button>
+          <el-button type="primary" @click="saveAndCharge" >收费</el-button>
-          <el-button type="primary" v-if="formData.status == 0">追溯码</el-button>
+          <el-button type="primary" >追溯码</el-button>
-          <el-button type="primary" v-if="formData.status == 0">挂单</el-button>
+          <el-button type="primary" >挂单</el-button>
         </template>
         <el-form :model="formData" inline label-width="0">
           <el-form-item>
@@ -40,23 +40,23 @@
             <el-button>+</el-button>
           </el-form-item>
           <el-form-item>
-            <el-select v-model="formData.medicalRecord.dockerId" placeholder="医生" style="width: 100px">
+            <el-select v-model="formData.diagnosisMedicalRecord.dockerId" placeholder="医生" style="width: 100px">
               <el-option v-for="item in dockerList" :key="item.id" :label="item.name" :value="item.id"></el-option>
             </el-select>
           </el-form-item>
         </el-form>
         <DiagnosisSearchInput
             v-model="diagnosisKeyword"
-          :request-api="diagnosisSearchApi"
+            :request-api="diagnosisSearchApi"
-          :show-config="diagnosisShowConfig"
+            :show-config="diagnosisShowConfig"
-          @selectedCallBack="diagnosisSelect"
+            @selectedCallBack="diagnosisSelect"
             ref="diagnosisSearchRef"
-          :show-header="false">
+            :show-header="false">
-      </DiagnosisSearchInput>
+        </DiagnosisSearchInput>
 
       </Panel>
       <Panel title="服务项目">
-      <ServiceDetail v-model="formData.serviceDetail" @selectedCallBack =getOrderTotalPrice> </ServiceDetail>
+        <ServiceDetail v-model="formData.itemDetail" @selectedCallBack =getOrderTotalPrice> </ServiceDetail>
 
       </Panel>
       <Panel title="药品耗材">
@@ -90,7 +90,7 @@ import Settlement from "@/components/charge/Settlement.vue";
 const socialCard = ref<any>({payInfo:{}})
 const formData = ref<any>({
   patientInfo:{},
-  medicalRecord:{},
+  diagnosisMedicalRecord:{},
 })
 const diagnosisKeyword = ref("")
 const chargeQueue = ref()
@@ -109,7 +109,7 @@ const saveAndCharge = () => {
   })
 }
 const diagnosisSearchRef = ref()
-const diagnosisSearchApi = "social/directory/getDiagnosis"
+const diagnosisSearchApi = "social/diagnose/search"
 const diagnosisShowConfig = [
   {
     label: "诊断名称",
@@ -122,15 +122,16 @@ const diagnosisShowConfig = [
 ]
 const diagnosisSelect = (list: any) => {
   const diagnosisNames = list.map((item: any) => item.name).join(',')
-  formData.value.diagnosisDetail = JSON.stringify(list)
+  formData.value.diagnosisMedicalRecord.diagnosisDetail = JSON.stringify(list)
-  formData.value.diagnosisSummary = diagnosisNames
+  formData.value.diagnosisMedicalRecord.diagnosisSummary = diagnosisNames
 }
 
 const clickItem = (item: any) => {
   formData.value = item
+  getOrderTotalPrice()
   nextTick(() => {
-    let list = JSON.parse(formData.value.medicalRecord.diagnosisDetail)
+    let list = JSON.parse(formData.value.diagnosisMedicalRecord.diagnosisDetail)
-    let nList = formData.value.medicalRecord.diagnosisSummary.split(',')
+    let nList = formData.value.diagnosisMedicalRecord.diagnosisSummary.split(',')
     diagnosisSearchRef.value?.init(list,nList);
   })
 }
@@ -145,7 +146,7 @@ onMounted(()=>{
 })
 const getOrderTotalPrice = () => {
   let totalPrice = 0
-  formData.value.serviceDetail.forEach((item: any) => {
+  formData.value.itemDetail.forEach((item: any) => {
     totalPrice += item.unitPrice * item.number
   })
   formData.value.goodsDetail.forEach((item: any) => {

src/views/social/directory.vue

@@ -63,7 +63,8 @@ const tabs = [
   {label: '中医疾病', name: 1314},
   {label: '中医证候', name: 1315},
   {label: '中药配方颗粒', name: 1320},
-  {label: '医疗服务项目（新）', name: 1321},
+  {label: 'ICPC诊断项目', name: 1361},
+  {label: 'ICPC服务项目', name: 1362},
 ];
 let tableData: any = ref([])
 let content: any = ref(null);
@@ -104,7 +105,7 @@ function get_data_list() {
       if (item.enddate == null) {
         item.enddate = "长期有效"
       }
-      if (item.json.rx_flag) {
+      if (item.json?.rx_flag) {
         item.json.rx_flag = item.json.rx_flag == 1 ? "是" : "否"
       }
     })