Merge branch 'develop' of https://gitea.gentronhealth.com/py/his into develop

openhis-ui-vue3/src/views/doctorstation/components/adviceBaseList.vue

@@ -87,9 +87,9 @@
 </template>
 
 <script setup>
-import { nextTick, ref, onMounted, getCurrentInstance } from 'vue';
-import { getAdviceBaseInfo, getDeviceList } from './api';
-import { throttle } from 'lodash-es';
+import {getCurrentInstance, nextTick, onMounted, ref} from 'vue';
+import {getAdviceBaseInfo, getDeviceList} from './api';
+import {throttle} from 'lodash-es';
 
 const { proxy } = getCurrentInstance();
 // 使用系统统一的数据字典

openhis-ui-vue3/src/views/doctorstation/components/api.js

@@ -1,4 +1,5 @@
 import request from '@/utils/request';
+
 // 病历相关接口
 /**
  * 获取患者列表
@@ -795,3 +796,35 @@ export function getTestResult(queryParams) {
     params: queryParams,
   });
 }
+
+/**
+ * 获取检验申请单列表
+ */
+export function getInspectionApplicationList(queryParams) {
+  return request({
+    url: '/reg-doctorstation/request-form/get-inspection',
+    method: 'get',
+    params: queryParams,
+  });
+}
+
+/**
+ * 保存检验申请单
+ */
+export function saveInspectionApplication(data) {
+  return request({
+    url: '/doctor-station/inspection/application',
+    method: 'post',
+    data: data,
+  });
+}
+
+/**
+ * 删除检验申请单
+ */
+export function deleteInspectionApplication(id) {
+  return request({
+    url: '/doctor-station/inspection/application/' + id,
+    method: 'delete',
+  });
+}

openhis-ui-vue3/src/views/doctorstation/components/diagnosis/addDiagnosisDialog.vue

@@ -93,7 +93,6 @@ import {
   saveTcmDiagnosis,
   updateTcmDiagnosis,
 } from '@/views/doctorstation/components/api';
-import { update } from 'lodash';
 
 const props = defineProps({
   openAddDiagnosisDialog: {

openhis-ui-vue3/src/views/doctorstation/components/diagnosis/diagnosis.vue

@@ -176,25 +176,24 @@
 </template>
 
 <script setup>
-import { getCurrentInstance } from 'vue';
+import {getCurrentInstance} from 'vue';
 import useUserStore from '@/store/modules/user';
 import {
-  getConditionDefinitionInfo,
-  saveDiagnosis,
-  diagnosisInit,
-  deleteDiagnosisBind,
-  getEncounterDiagnosis,
-  getEmrDetail,
-  getChronicDisease,
-  getTcmDiagnosis,
   delEncounterDiagnosis,
+  deleteDiagnosisBind,
   deleteTcmDiagnosis,
+  diagnosisInit,
+  getChronicDisease,
+  getConditionDefinitionInfo,
+  getEmrDetail,
+  getEncounterDiagnosis,
+  getTcmDiagnosis,
   isFoodDiseasesNew,
+  saveDiagnosis,
 } from '../api';
 import diagnosisdialog from '../diagnosis/diagnosisdialog.vue';
 import AddDiagnosisDialog from './addDiagnosisDialog.vue';
 import diagnosislist from '../diagnosis/diagnosislist.vue';
-import { onMounted, onBeforeUnmount } from 'vue';
 // const diagnosisList = ref([]);
 const allowAdd = ref(false);
 const tree = ref([]);

openhis-ui-vue3/src/views/doctorstation/components/diagnosis/diagnosisdialog.vue

@@ -63,8 +63,8 @@
 </template>
 
 <script setup>
-import { computed } from 'vue';
-import { getDiagnosisDefinitionList, saveDiagnosisBind } from '../api';
+import {computed} from 'vue';
+import {getDiagnosisDefinitionList, saveDiagnosisBind} from '../api';
 
 const radio = ref(1);
 const props = defineProps({

openhis-ui-vue3/src/views/doctorstation/components/diagnosis/diagnosislist.vue

@@ -15,7 +15,7 @@
 </template>
     
 <script setup>
-import { getDiagnosisDefinitionList } from '../api';
+import {getDiagnosisDefinitionList} from '../api';
 
 const props = defineProps({
   diagnosisSearchkey: {

openhis-ui-vue3/src/views/doctorstation/components/emr/emr.vue

@@ -150,12 +150,12 @@
 </template>
 
 <script setup>
-import { saveEmr, getEmrDetail, saveEmrTemplate } from '../api';
+import {getEmrDetail, saveEmr, saveEmrTemplate} from '../api';
 import emrTemplate from '../emr/emrtemplate.vue';
 import emrhistory from '../emr/emrhistory.vue';
 
-import { ref, computed, watch, getCurrentInstance } from 'vue';
-import { formatDate as formatDateUtil } from '@/utils/index';
+import {computed, getCurrentInstance, ref, watch} from 'vue';
+import {formatDate as formatDateUtil} from '@/utils/index';
 
 // Props
 const props = defineProps({

openhis-ui-vue3/src/views/doctorstation/components/emr/emrhistory.vue

@@ -33,8 +33,8 @@
 </template>
 
 <script setup>
-import { formatDate, formatDateymd } from '@/utils/index';
-import { getEmrHistoryList } from '../api';
+import {formatDate} from '@/utils/index';
+import {getEmrHistoryList} from '../api';
 
 const queryParams = ref({
   pageNum: 1,

openhis-ui-vue3/src/views/doctorstation/components/emr/emrtemplate.vue

@@ -28,7 +28,7 @@
 </template>
 
 <script setup>
-import { getEmrTemplateList, deleteEmrTemplate } from '../api';
+import {deleteEmrTemplate, getEmrTemplateList} from '../api';
 
 const queryParams = ref({
   pageSize: 10,

openhis-ui-vue3/src/views/doctorstation/components/eprescriptiondialog.vue

@@ -427,25 +427,22 @@
 </template>
 
 <script setup>
-import { computed, onMounted, ref } from 'vue';
 // import { calculateQuantityByDays, formatNumber } from '@/utils/his';
-import { reactive } from 'vue';
+import {reactive, ref} from 'vue';
 // import { useModal, useDict } from '@/hooks';
-import { parseTime, formatNumber } from '@/utils/his';
-import { queryYbCatalogue, getDiagnosisListEle } from './api';
-import { debounce } from 'lodash-es';
-
+import {formatNumber, parseTime} from '@/utils/his';
 import {
-  prescriptionNoInit,
-  savePrescriptionInfo,
-  getOrgTree,
-  updatePrescriptionInfo,
-  getEncounterDiagnosis,
   deletePrescriptionInfo,
-  getMedicationInfo,
   getChronicDisease,
+  getDiagnosisListEle,
+  getEncounterDiagnosis,
+  getMedicationInfo,
+  prescriptionNoInit,
+  queryYbCatalogue,
+  savePrescriptionInfo
 } from './api';
 import prescriptionMedicineList from './prescription/prescriptionMedicineList';
+
 const { proxy } = getCurrentInstance();
 const radio = ref(1);
 const props = defineProps({

openhis-ui-vue3/src/views/doctorstation/components/eprescriptionlist.vue

@@ -136,18 +136,15 @@
 
 <script setup>
 import {
-  elepPrescriptionInit,
-  getEncounterDiagnosis,
-  getPrescriptionList,
-  getOrgTree,
-  getPrescriptionInfo,
-  updatePrescriptionInfo,
-  getMedicationInfo,
   deletePrescriptionInfo,
+  elepPrescriptionInit,
+  getMedicationInfo,
+  getPrescriptionInfo,
   issuancePrescription,
+  updatePrescriptionInfo,
 } from './api';
 import eprescriptiondialog from './eprescriptiondialog.vue';
-import { getCurrentInstance } from 'vue';
+import {getCurrentInstance} from 'vue';
 
 const total = ref(0);
 const queryParams = ref({

openhis-ui-vue3/src/views/doctorstation/components/hospitalizationDialog.vue

@@ -184,13 +184,7 @@
 </template>
 
 <script setup>
-import {
-  getInit,
-  getOrgList,
-  wardList,
-  getDiagnosisDefinitionList,
-  handleHospitalization,
-} from './api.js';
+import {getDiagnosisDefinitionList, getInit, getOrgList, handleHospitalization, wardList,} from './api.js';
 
 const submitForm = reactive({
   medTypeCode: '21',

openhis-ui-vue3/src/views/doctorstation/components/hospitalizationEmr/components/history.vue

@@ -38,11 +38,11 @@
 </template>
 
 <script setup>
-import { ref, reactive, defineEmits, unref, nextTick } from 'vue';
-import { getRecordByEncounterIdList, deleteRecord } from '../api';
-import { ElTree } from 'element-plus';
-import { ElMessageBox, ElMessage, ElLoading } from 'element-plus';
-import { patientInfo } from '../../store/patient.js';
+import {defineEmits, ref, unref} from 'vue';
+import {deleteRecord, getRecordByEncounterIdList} from '../api';
+import {ElMessage} from 'element-plus';
+import {patientInfo} from '../../store/patient.js';
+
 const emits = defineEmits(['historyClick']);
 const props = defineProps({
   definitionId: {

openhis-ui-vue3/src/views/doctorstation/components/hospitalizationEmr/components/template.vue

@@ -26,11 +26,10 @@
 </template>
 
 <script setup>
-import { ref, reactive, defineEmits, unref } from 'vue';
-import { getListByDefinitionId, deleteTemplate } from '../api';
-import { ElTree } from 'element-plus';
-import { ElMessageBox, ElMessage, ElLoading } from 'element-plus';
-import { patientInfo } from '../../store/patient.js';
+import {defineEmits, ref, unref} from 'vue';
+import {deleteTemplate, getListByDefinitionId} from '../api';
+import {ElMessage} from 'element-plus';
+
 const emits = defineEmits(['templateClick', 'edit']);
 const props = defineProps({
   definitionId: {

openhis-ui-vue3/src/views/doctorstation/components/hospitalizationEmr/components/templateEdit.vue

@@ -40,11 +40,10 @@
   </el-dialog>
 </template>
 <script setup>
-import { ref, onMounted } from 'vue';
-import useUserStore from '@/store/modules/user';
-import { addTemplate, updateTemplate } from '../api';
-import { ElMessage } from 'element-plus';
-import { components } from '@/template';
+import {onMounted, ref} from 'vue';
+import {addTemplate, updateTemplate} from '../api';
+import {ElMessage} from 'element-plus';
+
 const emits = defineEmits(['submitOk']);
 const props = defineProps({
   formData: {

openhis-ui-vue3/src/views/doctorstation/components/hospitalizationEmr/index.vue

@@ -94,15 +94,21 @@
   </div>
 </template>
 <script setup>
-import { nextTick, onMounted, ref, watch } from 'vue';
-import { ElMessage } from 'element-plus';
-import { getTreeList } from '@/views/basicmanage/caseTemplates/api';
-import { saveOrUpdateRecord, addTemplate, getRecordByEncounterIdList, recordPrint } from './api';
-import { patientInfo } from '../store/patient.js';
+import {nextTick, onMounted, ref, watch} from 'vue';
+import {ElMessage} from 'element-plus';
+import {getTreeList} from '@/views/basicmanage/caseTemplates/api';
+import {addTemplate, getRecordByEncounterIdList, recordPrint, saveOrUpdateRecord} from './api';
+import {patientInfo} from '../store/patient.js';
 import dayjs from 'dayjs';
 // 打印工具
-import { simplePrint, PRINT_TEMPLATE } from '@/utils/printUtils.js';
-import { getEncounterDiagnosis } from '../api';
+import {PRINT_TEMPLATE, simplePrint} from '@/utils/printUtils.js';
+import {getEncounterDiagnosis} from '../api';
+import History from './components/history';
+import Template from './components/template';
+import TemplateEdit from './components/templateEdit.vue';
+
+import useUserStore from '@/store/modules/user';
+
 const { proxy } = getCurrentInstance();
 const emits = defineEmits([]);
 const props = defineProps({
@@ -116,11 +122,6 @@ const props = defineProps({
   },
 });
 const state = reactive({});
-import History from './components/history';
-import Template from './components/template';
-import TemplateEdit from './components/templateEdit.vue';
-
-import useUserStore from '@/store/modules/user';
 const userStore = useUserStore();
 // 定义响应式变量
 const templateData = ref([]);

openhis-ui-vue3/src/views/doctorstation/components/patientList.vue

@@ -85,8 +85,8 @@
 </template>
 
 <script setup>
-import { getList, receiveEncounter, leaveEncounter, completeEncounter } from './api';
-import { formatDate, formatDateStr } from '@/utils/index';
+import {completeEncounter, getList, leaveEncounter, receiveEncounter} from './api';
+import {formatDate, formatDateStr} from '@/utils/index';
 
 const date = ref(formatDate(new Date()));
 const queryParams = ref({

openhis-ui-vue3/src/views/doctorstation/components/prescription/orderBindInfo.vue

@@ -71,8 +71,8 @@
 </template>
 
 <script setup>
-import { ElMessageBox, ElMessage } from 'element-plus';
-import { ref, nextTick, onBeforeUnmount } from 'vue';
+import {ElMessage, ElMessageBox} from 'element-plus';
+import {nextTick, onBeforeUnmount, ref} from 'vue';
 import useUserStore from '@/store/modules/user';
 
 const dialogVisible = ref(false);

openhis-ui-vue3/src/views/doctorstation/components/prescription/orderGroupDrawer.vue

@@ -32,7 +32,7 @@
 </template>
 
 <script setup>
-import { getOrderGroup } from '../api';
+import {getOrderGroup} from '../api';
 
 const props = defineProps({
   diagnosis: {

openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionHistory.vue

@@ -69,8 +69,8 @@
 </template>
 
 <script setup>
-import { getAdviceHistoryInfo } from '../api';
-import { formatNumber } from '@/utils/his';
+import {getAdviceHistoryInfo} from '../api';
+import {formatNumber} from '@/utils/his';
 
 const props = defineProps({
   patientInfo: {

openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionInfo.vue

@@ -141,9 +141,10 @@
 </template>
 
 <script setup>
-import { formatDateStr } from '@/utils/index';
+import {formatDateStr} from '@/utils/index';
 //高精度库
 import Decimal from 'decimal.js';
+
 const props = defineProps({
   open: {
     type: Boolean,

openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionMedicineList.vue

@@ -32,9 +32,9 @@
 </template>
         
 <script setup>
-import { getAllMedicationInfo,getAllMedicationUsualInfo} from '../api';
-import { watch } from 'vue';
-import { throttle } from 'lodash-es';
+import {getAllMedicationInfo, getAllMedicationUsualInfo} from '../api';
+import {watch} from 'vue';
+import {throttle} from 'lodash-es';
 
 const props = defineProps({
   searchKey: {

openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue

@@ -965,40 +965,34 @@
 
 <script setup>
 import {
-  getDiagnosisDefinitionList,
-  savePrescription,
-  getEncounterDiagnosis,
-  getPrescriptionList,
-  getOrgTree,
-  savePrescriptionSign,
-  singOut,
-  saveEmr,
-  getEmrDetail,
-  updateGroupId,
-  getContract,
+  checkServicesHistory,
   getAdviceBaseInfo,
   getBindDevice,
-  checkServicesHistory,
+  getContract,
+  getDiagnosisDefinitionList,
+  getEmrDetail,
+  getEncounterDiagnosis,
+  getOrgTree,
+  getPrescriptionList,
+  saveEmr,
+  savePrescription,
+  savePrescriptionSign,
+  singOut,
+  updateGroupId,
 } from '../api';
-import { getAdjustPriceSwitchState } from '@/api/public';
-import adviceBaseList from '../advicebaselist';
-import { computed, getCurrentInstance, nextTick, ref, watch } from 'vue';
-import { calculateQuantityByDays, formatNumber } from '@/utils/his';
+import {advicePrint, getAdjustPriceSwitchState} from '@/api/public';
+import adviceBaseList from '../adviceBaseList.vue';
+import {computed, getCurrentInstance, nextTick, ref, watch} from 'vue';
+import {calculateQuantityByDays} from '@/utils/his';
 import OrderGroupDrawer from './orderGroupDrawer';
 import PrescriptionHistory from './prescriptionHistory';
 import OrderBindInfo from './orderBindInfo';
 import SkinTestInfo from './skinTestInfo';
 import Decimal from 'decimal.js';
 import useUserStore from '@/store/modules/user';
-import { ElMessageBox, ElMessage } from 'element-plus';
-import { ArrowDown } from '@element-plus/icons-vue';
-import { advicePrint } from '@/api/public';
-import printUtils, {
-  PRINT_TEMPLATE,
-  getPrinterList,
-  getCachedPrinter,
-  savePrinterToCache,
-} from '@/utils/printUtils';
+import {ElMessage, ElMessageBox} from 'element-plus';
+import {ArrowDown} from '@element-plus/icons-vue';
+import printUtils, {getPrinterList, PRINT_TEMPLATE, savePrinterToCache,} from '@/utils/printUtils';
 
 const emit = defineEmits(['selectDiagnosis']);
 const total = ref(0);
@@ -1112,7 +1106,7 @@ onMounted(() => {
   document.addEventListener('keydown', escKeyListener);
   // 初始化时自动创建第一个西药处方
   if (westernPrescriptions.value.length === 0) {
-    handleAddWesternPrescription();
+    handleAddPrescription();
   }
 });
 

openhis-ui-vue3/src/views/doctorstation/components/prescription/refundListDialog.vue

@@ -93,8 +93,8 @@
 </template>
   
 <script setup>
-import { getEncounterPatientPayment, refundPayment } from '../api';
-import { handleColor } from '@/utils/his';
+import {getEncounterPatientPayment, refundPayment} from '../api';
+import {handleColor} from '@/utils/his';
 
 const props = defineProps({
   open: {

openhis-ui-vue3/src/views/doctorstation/components/prescription/skinTestInfo.vue

@@ -64,8 +64,8 @@
 </template>
 
 <script setup>
-import { ElMessageBox, ElMessage } from 'element-plus';
-import { ref, nextTick, onBeforeUnmount } from 'vue';
+import {ElMessage, ElMessageBox} from 'element-plus';
+import {nextTick, onBeforeUnmount, ref} from 'vue';
 import useUserStore from '@/store/modules/user';
 
 const dialogVisible = ref(false);

openhis-ui-vue3/src/views/doctorstation/components/reportQuery.vue

@@ -84,9 +84,9 @@
 </template>
 
 <script setup>
-import { getCurrentInstance, ref, watch } from 'vue';
-import { Refresh } from '@element-plus/icons-vue';
-import { getProofResult, getTestResult } from './api';
+import {getCurrentInstance, ref, watch} from 'vue';
+import {Refresh} from '@element-plus/icons-vue';
+import {getProofResult, getTestResult} from './api';
 
 const { proxy } = getCurrentInstance();
 const props = defineProps({

openhis-ui-vue3/src/views/doctorstation/components/reservationRecord.vue

@@ -134,15 +134,15 @@
 </template>
 
 <script setup>
-import { ref, computed, reactive } from 'vue';
+import {computed, reactive, ref} from 'vue';
 import {
-  getReservationInfo,
   addReservationInfo,
-  editReservationInfo,
   delReservationInfo,
+  editReservationInfo,
+  getReservationInfo,
   queryParticipantList,
 } from './api';
-import { formatDateStr } from '@/utils/index';
+import {formatDateStr} from '@/utils/index';
 
 const showForm = ref(false);
 const selectedDate = ref(new Date());

openhis-ui-vue3/src/views/doctorstation/components/store/patient.js

@@ -4,7 +4,7 @@
  * @Description:
  */
 // import  { IInPatient } from '@/model/IInPatient'
-import { ref } from 'vue';
+import {ref} from 'vue';
 
 // 定义护士等级(没接口前mock)
 export const nursingLevel = ref('0');

openhis-ui-vue3/src/views/doctorstation/components/tcm/tcmAdvice.vue

@@ -411,28 +411,26 @@
 
 <script setup>
 import {
-  getDiagnosisDefinitionList,
-  getEncounterDiagnosis,
-  saveTcmAdvice,
-  getTcmAdviceList,
-  getOrgTree,
-  signTcmAdvice,
-  getTcmDiagnosis,
-  signOutTcmAdvice,
-  updateGroupId,
   getContract,
-  getAdviceBaseInfo,
+  getDiagnosisDefinitionList,
+  getOrgTree,
+  getTcmAdviceList,
+  getTcmDiagnosis,
   savePrescription,
+  saveTcmAdvice,
+  signOutTcmAdvice,
+  signTcmAdvice,
 } from '@/views/doctorstation/components/api';
 import tcmMedicineList from './tcmMedicineList';
-import { computed, getCurrentInstance, nextTick, watch } from 'vue';
-import { calculateQuantityByDays, formatNumber } from '@/utils/his';
+import {computed, getCurrentInstance, nextTick} from 'vue';
+import {formatNumber} from '@/utils/his';
 import Decimal from 'decimal.js';
 import tcmdiagnosisDialog from './tcmdiagnosisDialog';
-import { Delete, Minus } from '@element-plus/icons-vue';
-import { ElMessage } from 'element-plus';
-import printUtils, { PRINT_TEMPLATE } from '@/utils/printUtils';
-import { advicePrint } from '@/api/public';
+import {Delete} from '@element-plus/icons-vue';
+import {ElMessage} from 'element-plus';
+import printUtils, {PRINT_TEMPLATE} from '@/utils/printUtils';
+import {advicePrint} from '@/api/public';
+
 const emit = defineEmits(['selectDiagnosis']);
 const total = ref(0);
 const queryParams = ref({});

openhis-ui-vue3/src/views/doctorstation/components/tcm/tcmMedicineList.vue

@@ -28,9 +28,9 @@
 </template>
       
 <script setup>
-import { nextTick } from 'vue';
-import { getTcmMedicine } from '@/views/doctorstation/components/api';
-import { throttle } from 'lodash-es';
+import {nextTick} from 'vue';
+import {getTcmMedicine} from '@/views/doctorstation/components/api';
+import {throttle} from 'lodash-es';
 
 const props = defineProps({
   adviceQueryParams: {

openhis-ui-vue3/src/views/doctorstation/components/tcm/tcmdiagnosisDialog.vue

@@ -56,8 +56,8 @@
 </template>
 
 <script setup>
-import { ref } from 'vue';
-import { getTcmCondition, getTcmSyndrome, saveTcmDiagnosis } from '@/views/doctorstation/components/api';
+import {ref} from 'vue';
+import {getTcmCondition, getTcmSyndrome} from '@/views/doctorstation/components/api';
 
 const condition = ref('');
 const syndrome = ref('');