提交merge1.3

2025-12-27 15:30:40 +08:00
parent 088861f66e
commit 3c497417dc
167 changed files with 0 additions and 17577 deletions
--- a/openhis-ui-vue3/src/views/drug/inHospitalDispensing/components/templateJson.json
+++ b/openhis-ui-vue3/src/views/drug/inHospitalDispensing/components/templateJson.json
@@ -15,11 +15,7 @@
            "top": 16.5,
            "height": 22.5,
            "width": 120,
-<<<<<<< HEAD
-            "title": "长春大学医院",
-=======
            "title": "长春市朝阳区中医院医院",
->>>>>>> v1.3
            "coordinateSync": false,
            "widthHeightSync": false,
            "fontFamily": "Microsoft YaHei",
--- a/openhis-ui-vue3/src/views/drug/inpatientMedicationDispensing/components/api.js
+++ b/openhis-ui-vue3/src/views/drug/inpatientMedicationDispensing/components/api.js
@@ -1,25 +1,14 @@
 import request from '@/utils/request';

 // 获取病区下拉选
-<<<<<<< HEAD
-export function getPractitionerWard (queryParams) {
-  return request ({
-=======
 export function getPractitionerWard(queryParams) {
  return request({
->>>>>>> v1.3
    url: '/app-common/practitioner-ward',
    method: 'get',
    params: queryParams,
  });
 }

-<<<<<<< HEAD
-// 住院汇总发药单左侧
-export function getFromSummaryList (queryParams) {
-  return request ({
-    url: 'pharmacy-manage/summary-dispense-medicine/from_summary-list',
-=======
 // 住院汇总发药单左侧,汇总单列表
 export function getFromSummaryList(queryParams) {
  return request({
@@ -42,20 +31,14 @@ export function getFromSummaryInit(queryParams) {
 export function getFromSummaryDetails(queryParams) {
  return request({
    url: 'nurse-station/medicine-summary/summary-form-detail',
->>>>>>> v1.3
    method: 'get',
    params: queryParams,
  });
 }

 // 住院汇总发药单右侧
-<<<<<<< HEAD
-export function getFromDetailList (queryParams) {
-  return request ({
-=======
 export function getFromDetailList(queryParams) {
  return request({
->>>>>>> v1.3
    url: 'pharmacy-manage/summary-dispense-medicine/from-list',
    method: 'get',
    params: queryParams,
@@ -63,26 +46,16 @@ export function getFromDetailList(queryParams) {
 }

 // 明细左侧
-<<<<<<< HEAD
-export function getEncounterList (queryParams) {
-  return request ({
-=======
 export function getEncounterList(queryParams) {
  return request({
->>>>>>> v1.3
    url: '/pharmacy-manage/summary-dispense-medicine/encounter-list',
    method: 'get',
    params: queryParams,
  });
 }
 //明细 右侧
-<<<<<<< HEAD
-export function getMedicationSummaryDetail (queryParams) {
-  return request ({
-=======
 export function getMedicationSummaryDetail(queryParams) {
  return request({
->>>>>>> v1.3
    url: '/pharmacy-manage/summary-dispense-medicine/medication_summary-list',
    method: 'get',
    params: queryParams,
@@ -93,13 +66,8 @@ export function getMedicationSummaryDetail(queryParams) {
 /**
 * 获取住院患者列表
 */
-<<<<<<< HEAD
-export function getPatientList (queryParams) {
-  return request ({
-=======
 export function getPatientList(queryParams) {
  return request({
->>>>>>> v1.3
    url: '/nurse-station/advice-process/inpatient',
    method: 'get',
    params: queryParams,
@@ -109,13 +77,8 @@ export function getPatientList(queryParams) {
 /**
 * 获取当前登录人管理病区
 */
-<<<<<<< HEAD
-export function getWardList (queryParams) {
-  return request ({
-=======
 export function getWardList(queryParams) {
  return request({
->>>>>>> v1.3
    url: '/app-common/practitioner-ward',
    method: 'get',
    params: queryParams,
@@ -125,13 +88,8 @@ export function getWardList(queryParams) {
 /**
 * 获取当前选中患者全部医嘱
 */
-<<<<<<< HEAD
-export function getPrescriptionList (queryParams) {
-  return request ({
-=======
 export function getPrescriptionList(queryParams) {
  return request({
->>>>>>> v1.3
    url: '/nurse-station/advice-process/inpatient-advice',
    method: 'get',
    params: queryParams,
@@ -141,13 +99,8 @@ export function getPrescriptionList(queryParams) {
 /**
 * 执行医嘱
 */
-<<<<<<< HEAD
-export function adviceExecute (data) {
-  return request ({
-=======
 export function adviceExecute(data) {
  return request({
->>>>>>> v1.3
    url: '/nurse-station/advice-process/advice-execute',
    method: 'post',
    data: data,
@@ -157,13 +110,8 @@ export function adviceExecute(data) {
 /**
 * 取消执行医嘱
 */
-<<<<<<< HEAD
-export function adviceCancel (data) {
-  return request ({
-=======
 export function adviceCancel(data) {
  return request({
->>>>>>> v1.3
    url: '/nurse-station/advice-process/advice-cancel',
    method: 'post',
    data: data,
@@ -172,17 +120,10 @@ export function adviceCancel(data) {

 /**
 * 明细发药
-<<<<<<< HEAD
- * 
- */
-export function totalSendDrug (data) {
-  return request ({
-=======
 *
 */
 export function totalSendDrug(data) {
  return request({
->>>>>>> v1.3
    url: '/pharmacy-manage/summary-dispense-medicine/summary-dispense-medicine',
    method: 'put',
    data: data,
@@ -191,20 +132,13 @@ export function totalSendDrug(data) {
 /**
 * 明细退药
 */
-<<<<<<< HEAD
-export function totalReturnDrug (data) {
-  return request ({
-=======
 export function totalReturnDrug(data) {
  return request({
->>>>>>> v1.3
    url: '/pharmacy-manage/summary-dispense-medicine/medicine-return',
    method: 'put',
    data: data,
  });
 }
-<<<<<<< HEAD
-=======

 // -----------------------------------门诊发药接口------------------------------------------------------------
 export function listPatient(query) {
@@ -363,4 +297,3 @@ export function init() {
 //     method: 'get',
 //   })
 // }
->>>>>>> v1.3
--- a/openhis-ui-vue3/src/views/drug/inpatientMedicationDispensing/index.vue
+++ b/openhis-ui-vue3/src/views/drug/inpatientMedicationDispensing/index.vue
@@ -1,186 +1,4 @@
 <template>
-<<<<<<< HEAD
-  <div class="app-container">
-    <el-row :gutter="20" style="margin-bottom: 20px">
-      <el-col :span="4" :xs="24">
-        <el-button
-          :type="selectType === 'total' ? 'primary' : 'default'"
-          @click="handleSelectType('total')"
-          >汇总</el-button
-        >
-        <el-button
-          :type="selectType === 'drug' ? 'primary' : 'default'"
-          @click="handleSelectType('drug')"
-          >发药</el-button
-        >
-      </el-col>
-      <!-- <el-col :span="18" :xs="24">
-        <el-form ref="queryParams" label-width="100px" :model="queryParams" :inline="true">
-          <el-form-item label="窗口" prop="windowDataText" label-width="120px">
-            <el-select
-              v-model="queryParams.windowDataText"
-              placeholder="请选择"
-              clearable
-              filterable
-            >
-              <el-option
-                v-for="item in windowData"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="摆药单" prop="medicationListText" label-width="120px">
-            <el-select
-              v-model="queryParams.medicationListText"
-              placeholder="请选择"
-              clearable
-              filterable
-            >
-              <el-option
-                v-for="item in medicationList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="范围" prop="time" label-width="100px">
-            <el-radio-group v-model="queryParams.timeRange">
-              <el-radio v-for="(item, index) in timeRangeList" :key="index" :value="item.value">
-                {{ item.label }}
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item label="时间" prop="time" label-width="100px">
-            <el-date-picker
-              v-model="dateRange"
-              type="datetimerange"
-              range-separator="-"
-              start-placeholder="开始时间"
-              end-placeholder="结束时间"
-              format="YYYY-MM-DD"
-              value-format="YYYY-MM-DD"
-            />
-          </el-form-item>
-        </el-form>
-      </el-col> -->
-    </el-row>
-    <el-row :gutter="20">
-      <el-col :span="6" class="left-container">
-        <el-row>
-          <el-col :span="24">
-            <el-form
-              :model="queryParamsPatient"
-              ref="queryRef"
-              v-show="showSearch"
-              label-width="120"
-              inline="true"
-            >
-              <el-form-item label="患者信息" prop="searchKey" label-width="120">
-                <el-input
-                  v-model="queryParamsPatient.searchKey"
-                  placeholder="请输入姓名/证件号"
-                  clearable
-                  style="width: 240px"
-                  @keyup.enter="handleQuery"
-                />
-              </el-form-item>
-              <el-form-item
-                label="发药状态"
-                prop="statusEnum"
-                v-if="selectType !== 'drug'"
-                label-width="120"
-              >
-                <el-select
-                  v-model="queryParamsPatient.statusEnum"
-                  placeholder="请选择"
-                  clearable
-                  filterable
-                  style="width: 240px"
-                  @change="handleQuery"
-                >
-                  <el-option
-                    v-for="item in dispenseStatusOptions"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  />
-                </el-select>
-              </el-form-item>
-
-              <el-form-item label="就诊日期" prop="startTime">
-                <el-date-picker
-                  v-model="dateRange"
-                  type="daterange"
-                  start-placeholder="开始日期"
-                  end-placeholder="结束日期"
-                  value-format="YYYY-MM-DD"
-                  style="width: 240px"
-                  @keyup.enter="handleQuery"
-                  @change="handleQuery"
-                />
-              </el-form-item>
-            </el-form>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20" style="border-radius: 4px">
-          <el-col :span="24">
-            <el-table
-              :data="patientList"
-              border
-              highlight-current-row
-              style="height: cal(100%-200px); width: 100%"
-              @row-click="handleCurrentChange"
-            >
-              <!-- 汇总状态下显示的字段 -->
-              <template v-if="selectType === 'total'">
-                <el-table-column prop="applicantName" label="申请人" align="center" />
-                <el-table-column prop="sourceLocationName" label="发药药房" align="center" />
-                <el-table-column prop="statusEnum_enumText" label="状态" align="center" />
-                <el-table-column prop="applyTime" label="申请日期" align="center">
-                  <template #default="scope">
-                    {{ scope.row.applyTime ? parseTime(scope.row.applyTime, '{y}-{m}-{d}') : '-' }}
-                  </template>
-                </el-table-column>
-              </template>
-              <!-- 明细状态下显示的字段 -->
-              <template v-else>
-                <el-table-column prop="patientName" label="姓名" align="center" />
-                <el-table-column prop="genderEnum_enumText" label="性别" align="center" />
-                <el-table-column prop="age" label="年龄" align="center" />
-                <el-table-column prop="startTime" label="就诊日期" align="center">
-                  <template #default="scope">
-                    {{ scope.row.startTime ? parseTime(scope.row.startTime, '{y}-{m}-{d}') : '-' }}
-                  </template>
-                </el-table-column>
-              </template>
-            </el-table>
-          </el-col>
-          <el-col :span="24" style="padding: 10px 12px 12px 12px">
-            <pagination
-              v-show="total > 0"
-              :total="total"
-              v-model:page="queryParams.pageNo"
-              v-model:limit="queryParams.pageSize"
-              @pagination="getList"
-            />
-          </el-col>
-        </el-row>
-      </el-col>
-      <el-col :span="18" :xs="24">
-        <!-- 根据当前选中的tab显示不同的表格组件 -->
-        <MedicationTable v-if="selectType === 'total'" :tableData="tableData" :busNo="busNo" />
-        <DetailMedicationTable
-          v-else-if="selectType === 'drug'"
-          :tableData="detailTableData"
-          :encounterId="encounterId"
-          @call-medication-summary-detail="callMedicationSummaryDetail"
-        />
-      </el-col>
-    </el-row>
-=======
  <div class="app-container" style="padding-top: 0px">
    <el-tabs v-model="activeName" @tab-click="handleClick" class="centered-tabs tabs-font">
      <el-tab-pane label="发药汇总单" name="summary">
@@ -193,7 +11,6 @@
        <ReturnDrug />
      </el-tab-pane>
    </el-tabs>
->>>>>>> v1.3
  </div>
 </template>

@@ -201,12 +18,9 @@
 import { ref, reactive, onMounted } from 'vue';
 import { ElMessage } from 'element-plus';
 import MedicationTable from './components/MedicationTable.vue';
-<<<<<<< HEAD
-=======
 import MedicationSummary from './components/MedicationSummary.vue';
 import MedicationDetails from './components/MedicationDetails.vue';
 import ReturnDrug from './components/ReturnDrug.vue';
->>>>>>> v1.3
 import DetailMedicationTable from './components/DetailMedicationTable.vue';
 import { getCurrentInstance } from 'vue';
 import {
@@ -216,11 +30,7 @@ import {
  getFromDetailList,
 } from './components/api';

-<<<<<<< HEAD
-// 响应式数据
-=======
 const activeName = ref('summary');
->>>>>>> v1.3
 const loading = ref(false);
 const patientList = ref([]);
 const total = ref(0);
@@ -478,8 +288,6 @@ onMounted(() => {
  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
  padding: 20px;
 }
-<<<<<<< HEAD
-=======

 .centered-tabs :deep(.el-tabs__nav-wrap) {
  display: flex;
@@ -495,5 +303,4 @@ onMounted(() => {
  font-size: 16px !important;
  padding: 0 60px !important;
 }
->>>>>>> v1.3
 </style>