提交merge1.3

openhis-ui-vue3/src/views/patientmanagement/patientmanagement/index.vue

@@ -120,15 +120,9 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
-<<<<<<< HEAD
-          <el-col :span="6">
-            <el-form-item label="" prop="tempFlag">
-              <el-radio-group v-model="form.tempFlag" :disabled="isViewMode" size="small">
-=======
           <el-col :span="7">
             <el-form-item label="活动标识" prop="activeFlag">
               <el-radio-group v-model="form.activeFlag" :disabled="isViewMode">
->>>>>>> v1.3
                 <el-radio v-for="item in tempFlagList" :key="item.value" :label="item.value">
                   {{ item.info }}
                 </el-radio>
@@ -163,29 +157,16 @@
               <el-input v-model="form.birthDate" v-show="false" />
             </el-form-item>
           </el-col>
-<<<<<<< HEAD
-          <el-col :span="6">
-=======
           <el-col :span="8">
->>>>>>> v1.3
             <el-form-item label="年龄" prop="age">
               <el-input
                 v-model="form.age"
                 :disabled="isViewMode"
                 @input="(value) => (form.age = value.replace(/[^0-9]/g, ''))"
-<<<<<<< HEAD
-              >
-                <template #suffix>岁</template>
-              </el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="4">
-=======
               />
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
->>>>>>> v1.3
             <el-form-item label="国家编码" prop="countryCode">
               <el-input v-model="form.countryCode" clearable :disabled="isViewMode" />
             </el-form-item>
@@ -353,11 +334,7 @@
 
 <script setup name="patientManagement">
 import pcas from 'china-division/dist/pcas-code.json';
-<<<<<<< HEAD
-import { ref, computed, onMounted, toRefs, getCurrentInstance, reactive, watch } from 'vue';
-=======
 import { ref, computed, nextTick } from 'vue';
->>>>>>> v1.3
 import { addPatient, listPatient, updatePatient, lists } from './component/api';
 import PatientAddDialog from '@/views/charge/outpatientregistration/components/patientAddDialog';
 
@@ -481,41 +458,6 @@ const findNodeByCode = (data, code) => {
 /** 查询患者列表 */
 function getList() {
   listPatient(queryParams.value).then((response) => {
-<<<<<<< HEAD
-    // 适配门诊挂号接口返回的数据格式
-    // 不同的接口可能返回不同格式，这里做一个通用适配
-    if (response.data && Array.isArray(response.data)) {
-      // 如果返回的直接是数组
-      patientList.value = response.data;
-      total.value = response.data.length;
-    } else if (response.data && response.data.records) {
-      // 如果返回的是分页格式
-      patientList.value = response.data.records;
-      total.value = response.data.total;
-    } else if (response.data && response.data.rows) {
-      // 另一种可能的分页格式
-      patientList.value = response.data.rows;
-      total.value = response.data.total;
-    } else {
-      // 默认处理
-      patientList.value = [];
-      total.value = 0;
-    }
-  });
-  lists().then((response) => {
-    console.log(response);
-    // 确保即使响应格式变化也能正常工作
-    if (response.data) {
-      occupationtypeList.value = response.data.occupationType || [];
-      administrativegenderList.value = response.data.sex || [];
-      bloodtypeaboList.value = response.data.bloodTypeABO || [];
-      bloodtypearhList.value = response.data.bloodTypeRH || [];
-      familyrelationshiptypeList.value = response.data.familyRelationshipType || [];
-      maritalstatusList.value = response.data.maritalStatus || [];
-      tempFlagList.value = response.data.whetherStatus || [];
-      idTypeList.value = response.data.identityDocumentType || [];
-    }
-=======
     patientList.value = response.data.records;
     total.value = response.data.total;
     console.log('patientList======>', JSON.stringify(patientList.value));
@@ -530,7 +472,6 @@ function getList() {
     maritalstatusList.value = response.data.maritalStatus;
     tempFlagList.value = response.data.whetherStatus;
     idTypeList.value = response.data.identityDocumentType;
->>>>>>> v1.3
   });
 }