diff --git a/openhis-ui-vue3/src/views/basicmanage/supplier/index.vue b/openhis-ui-vue3/src/views/basicmanage/supplier/index.vue index 152219d0..962098fc 100644 --- a/openhis-ui-vue3/src/views/basicmanage/supplier/index.vue +++ b/openhis-ui-vue3/src/views/basicmanage/supplier/index.vue @@ -207,7 +207,6 @@ @@ -217,7 +216,6 @@ diff --git a/openhis-ui-vue3/src/views/basicservices/registrationfee/index.vue b/openhis-ui-vue3/src/views/basicservices/registrationfee/index.vue index 358ad06c..f715fcd6 100644 --- a/openhis-ui-vue3/src/views/basicservices/registrationfee/index.vue +++ b/openhis-ui-vue3/src/views/basicservices/registrationfee/index.vue @@ -228,7 +228,6 @@ diff --git a/openhis-ui-vue3/src/views/catalog/device/components/deviceDialog.vue b/openhis-ui-vue3/src/views/catalog/device/components/deviceDialog.vue index f4d909e1..65f964fc 100644 --- a/openhis-ui-vue3/src/views/catalog/device/components/deviceDialog.vue +++ b/openhis-ui-vue3/src/views/catalog/device/components/deviceDialog.vue @@ -15,18 +15,13 @@ - + @@ -35,69 +30,53 @@ prop="pyStr" class="custom-label-spacing" > - + - + - + - + - + - + - + - + - + @@ -105,7 +84,6 @@ @@ -115,25 +93,17 @@ - + - + - + @@ -141,7 +111,7 @@ - + @@ -151,57 +121,41 @@ - + - + - + - + - + - + - + @@ -384,8 +338,12 @@ function reset() { function submitForm() { form.value.hvcmFlag ? (form.value.hvcmFlag = 1) : (form.value.hvcmFlag = 0); form.value.ybFlag ? (form.value.ybFlag = 1) : (form.value.ybFlag = 0); - form.value.ybMatchFlag ? (form.value.ybMatchFlag = 1) : (form.value.ybMatchFlag = 0); - form.value.allergenFlag ? (form.value.allergenFlag = 1) : (form.value.allergenFlag = 0); + form.value.ybMatchFlag + ? (form.value.ybMatchFlag = 1) + : (form.value.ybMatchFlag = 0); + form.value.allergenFlag + ? (form.value.allergenFlag = 1) + : (form.value.allergenFlag = 0); console.log(form.value, "form.value"); if (form.value.id != undefined) { editDevice(form.value).then((response) => { diff --git a/openhis-ui-vue3/src/views/catalog/device/components/deviceViewDialog.vue b/openhis-ui-vue3/src/views/catalog/device/components/deviceViewDialog.vue index a0087d0e..2c94a71f 100644 --- a/openhis-ui-vue3/src/views/catalog/device/components/deviceViewDialog.vue +++ b/openhis-ui-vue3/src/views/catalog/device/components/deviceViewDialog.vue @@ -15,7 +15,6 @@ @@ -25,19 +24,13 @@ - + @@ -56,17 +49,12 @@ - + - + @@ -92,7 +80,6 @@ @@ -102,7 +89,6 @@ @@ -110,11 +96,12 @@ - - + + @@ -139,7 +125,6 @@ @@ -147,11 +132,14 @@ - + @@ -186,7 +174,11 @@ - + @@ -224,7 +215,11 @@ - + @@ -25,7 +24,6 @@ @@ -35,14 +33,14 @@ prop="pyStr" class="custom-label-spacing" > - + - + @@ -50,13 +48,12 @@ - + @@ -66,20 +63,19 @@ - + - + - + @@ -95,17 +91,15 @@ - + @@ -116,7 +110,6 @@ diff --git a/openhis-ui-vue3/src/views/catalog/diagnosisTreatment/components/diagnosisTreatmentViewDialog.vue b/openhis-ui-vue3/src/views/catalog/diagnosisTreatment/components/diagnosisTreatmentViewDialog.vue index a0087d0e..fb896b04 100644 --- a/openhis-ui-vue3/src/views/catalog/diagnosisTreatment/components/diagnosisTreatmentViewDialog.vue +++ b/openhis-ui-vue3/src/views/catalog/diagnosisTreatment/components/diagnosisTreatmentViewDialog.vue @@ -15,7 +15,6 @@ @@ -25,7 +24,6 @@ @@ -35,7 +33,6 @@ @@ -59,14 +56,13 @@ - + @@ -92,7 +88,6 @@ @@ -102,7 +97,6 @@ @@ -129,7 +123,6 @@ @@ -139,7 +132,6 @@ @@ -151,7 +143,6 @@ @@ -201,7 +192,6 @@ diff --git a/openhis-ui-vue3/src/views/catalog/disease/index.vue b/openhis-ui-vue3/src/views/catalog/disease/index.vue index 529d4552..620044af 100644 --- a/openhis-ui-vue3/src/views/catalog/disease/index.vue +++ b/openhis-ui-vue3/src/views/catalog/disease/index.vue @@ -254,7 +254,6 @@ @@ -264,7 +263,6 @@ diff --git a/openhis-ui-vue3/src/views/catalog/medicine/components/medicineDialog.vue b/openhis-ui-vue3/src/views/catalog/medicine/components/medicineDialog.vue index 4fab61bb..c57eaf5a 100644 --- a/openhis-ui-vue3/src/views/catalog/medicine/components/medicineDialog.vue +++ b/openhis-ui-vue3/src/views/catalog/medicine/components/medicineDialog.vue @@ -17,7 +17,6 @@ @@ -27,7 +26,6 @@ @@ -36,7 +34,6 @@ @@ -47,13 +44,12 @@ - + @@ -61,7 +57,6 @@ @@ -72,7 +67,6 @@ @@ -81,7 +75,6 @@ @@ -91,7 +84,6 @@ @@ -103,7 +95,6 @@ @@ -113,7 +104,6 @@ @@ -123,7 +113,6 @@ @@ -135,18 +124,17 @@ - + - + @@ -222,7 +210,6 @@ - + @@ -345,7 +332,6 @@ @@ -388,7 +374,6 @@ @@ -400,7 +385,6 @@ @@ -410,7 +394,6 @@ @@ -420,7 +403,6 @@ @@ -464,7 +446,6 @@ @@ -476,7 +457,6 @@ diff --git a/openhis-ui-vue3/src/views/catalog/medicine/components/medicineViewDialog.vue b/openhis-ui-vue3/src/views/catalog/medicine/components/medicineViewDialog.vue index a0087d0e..fb896b04 100644 --- a/openhis-ui-vue3/src/views/catalog/medicine/components/medicineViewDialog.vue +++ b/openhis-ui-vue3/src/views/catalog/medicine/components/medicineViewDialog.vue @@ -15,7 +15,6 @@ @@ -25,7 +24,6 @@ @@ -35,7 +33,6 @@ @@ -59,14 +56,13 @@ - + @@ -92,7 +88,6 @@ @@ -102,7 +97,6 @@ @@ -129,7 +123,6 @@ @@ -139,7 +132,6 @@ @@ -151,7 +143,6 @@ @@ -201,7 +192,6 @@ diff --git a/openhis-ui-vue3/src/views/catalog/medicine/index.vue b/openhis-ui-vue3/src/views/catalog/medicine/index.vue index d5539ce5..4152c0b7 100644 --- a/openhis-ui-vue3/src/views/catalog/medicine/index.vue +++ b/openhis-ui-vue3/src/views/catalog/medicine/index.vue @@ -442,7 +442,6 @@ @@ -452,7 +451,6 @@ diff --git a/openhis-ui-vue3/src/views/charge/outpatientregistration/components/outpatientregistration.js b/openhis-ui-vue3/src/views/charge/outpatientregistration/components/outpatientregistration.js new file mode 100644 index 00000000..33e0cadc --- /dev/null +++ b/openhis-ui-vue3/src/views/charge/outpatientregistration/components/outpatientregistration.js @@ -0,0 +1,125 @@ +import request from '@/utils/request' +import { parseStrEmpty } from "@/utils/openhis"; + +// 查询初期所需数据 +export function getInit() { + return request({ + url: '/outpatient-service/register/init', + method: 'get' + }) +} + +// 查询患者信息 +export function getOutpatientRegistrationList(query) { + return request({ + url: '/outpatient-service/register/patient-metadata', + method: 'get', + params: query + }) +} + +// 查询费用性质 +export function getContractList() { + return request({ + url: '/outpatient-service/register/contract-list', + method: 'get' + }) +} + +// 查询诊断信息 +export function getConditionDefinitionMetadata(query) { + return request({ + url: '/outpatient-service/register/condition-definition-metadata', + method: 'get', + params: query + }) +} + +// 查询就诊位置 +export function getLocationTree(query) { + return request({ + url: '/outpatient-service/register/location-tree', + method: 'get', + params: query + }) +} + + +// 根据位置id筛选医生 +export function getPractitionerMetadata(query) { + return request({ + url: '/outpatient-service/register/practitioner-metadata', + method: 'get', + params: query + }) +} + +// 根据机构id筛选服务项目 +export function getHealthcareMetadata(query) { + return request({ + url: '/outpatient-service/register/healthcare-metadata', + method: 'get', + params: query + }) +} + +// // 门诊挂号目录分类查询 +// export function getOutpatientRegistrationCategory() { +// return request({ +// url: '/outpatient-service/registerinformation-init', +// method: 'get' +// }) +// } + +// 新增病人信息 +export function addPatient(data) { + return request({ + url: '/patientmanage/information/patient-information', + method: 'post', + data: data + }) +} + + +export function listmaritalstatus() { + return request({ + url: '/patientmanage/information/list-maritalstatus', + method: 'get', + }) +} + +export function listoccupationtype() { + return request({ + url: '/patientmanage/information/list-occupationtype', + method: 'get', + }) +} + +export function lisadministrativegender() { + return request({ + url: '/patientmanage/information/list-administrativegender', + method: 'get', + }) +} + +export function listbloodtypeabo() { + return request({ + url: '/patientmanage/information/list-bloodtypeabo', + method: 'get', + }) +} + + +export function listbloodtypearh() { + return request({ + url: '/patientmanage/information/list-bloodtypearh', + method: 'get', + }) +} + +export function listfamilyrelationshiptype() { + return request({ + url: '/patientmanage/information/list-familyrelationshiptype', + method: 'get', + }) + } \ No newline at end of file diff --git a/openhis-ui-vue3/src/views/charge/outpatientregistration/components/patientAddDialog.vue b/openhis-ui-vue3/src/views/charge/outpatientregistration/components/patientAddDialog.vue new file mode 100644 index 00000000..7ab6173f --- /dev/null +++ b/openhis-ui-vue3/src/views/charge/outpatientregistration/components/patientAddDialog.vue @@ -0,0 +1,507 @@ + + + + diff --git a/openhis-ui-vue3/src/views/charge/outpatientregistration/components/patientInfoDialog.vue b/openhis-ui-vue3/src/views/charge/outpatientregistration/components/patientInfoDialog.vue new file mode 100644 index 00000000..9781ee6e --- /dev/null +++ b/openhis-ui-vue3/src/views/charge/outpatientregistration/components/patientInfoDialog.vue @@ -0,0 +1,174 @@ + + + + diff --git a/openhis-ui-vue3/src/views/charge/outpatientregistration/index.vue b/openhis-ui-vue3/src/views/charge/outpatientregistration/index.vue new file mode 100644 index 00000000..4d426a72 --- /dev/null +++ b/openhis-ui-vue3/src/views/charge/outpatientregistration/index.vue @@ -0,0 +1,712 @@ + + + +