Merge remote-tracking branch 'origin/develop' into develop

- 在处方列表中新增总价、剂量和剂量数量字段
- 修复药品审批页面跳转时仓库信息丢失问题
- 扩展药品列表列宽度并启用溢出提示功能
- 为采购单界面添加多种视图状态下的字段禁用逻辑
- 优化采购单仓库位置字段的初始化流程，防止数据丢失

openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java

@@ -1106,6 +1106,28 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
         log.info("BugFix#219: ========== handDevice END ==========");
 
         for (AdviceSaveDto adviceSaveDto : insertOrUpdateList) {
+            // 🔧 Bug Fix: 确保accountId不为null
+            if (adviceSaveDto.getAccountId() == null) {
+                // 尝试从患者就诊中获取默认账户ID（自费账户）
+                Account selfAccount = iAccountService.getSelfAccount(adviceSaveDto.getEncounterId());
+                if (selfAccount != null) {
+                    adviceSaveDto.setAccountId(selfAccount.getId());
+                } else {
+                    // 自动创建自费账户
+                    Account newAccount = new Account();
+                    newAccount.setPatientId(adviceSaveDto.getPatientId());
+                    newAccount.setEncounterId(adviceSaveDto.getEncounterId());
+                    newAccount.setContractNo(CommonConstants.BusinessName.DEFAULT_CONTRACT_NO);
+                    newAccount.setTypeCode(AccountType.PERSONAL_CASH_ACCOUNT.getCode());
+                    newAccount.setBalanceAmount(BigDecimal.ZERO);
+                    newAccount.setStatusEnum(AccountStatus.ACTIVE.getValue());
+                    newAccount.setEncounterFlag(Whether.YES.getValue());
+                    newAccount.setName(AccountType.PERSONAL_CASH_ACCOUNT.getInfo());
+                    Long newAccountId = iAccountService.saveAccountByRegister(newAccount);
+                    adviceSaveDto.setAccountId(newAccountId);
+                }
+            }
+            
             deviceRequest = new DeviceRequest();
             deviceRequest.setId(adviceSaveDto.getRequestId()); // 主键id
             deviceRequest.setStatusEnum(is_save ? RequestStatus.DRAFT.getValue() : RequestStatus.ACTIVE.getValue()); // 请求状态

openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationChineseMedicalAppServiceImpl.java

@@ -10,8 +10,10 @@ import com.core.common.utils.AssignSeqUtil;
 import com.core.common.utils.MessageUtils;
 import com.core.common.utils.SecurityUtils;
 import com.core.common.utils.StringUtils;
+import com.openhis.administration.domain.Account;
 import com.openhis.administration.domain.ChargeItem;
 import com.openhis.administration.domain.EncounterDiagnosis;
+import com.openhis.administration.service.IAccountService;
 import com.openhis.administration.service.IChargeItemService;
 import com.openhis.administration.service.IEncounterDiagnosisService;
 import com.openhis.clinical.domain.Condition;
@@ -80,6 +82,9 @@ public class DoctorStationChineseMedicalAppServiceImpl implements IDoctorStation
     @Resource
     AdviceUtils adviceUtils;
 
+    @Resource
+    IAccountService iAccountService;
+
     /**
      * 查询中医诊断数据
      *
@@ -475,6 +480,28 @@ public class DoctorStationChineseMedicalAppServiceImpl implements IDoctorStation
         // 医嘱签发编码
         String signCode = assignSeqUtil.getSeq(AssignSeqEnum.ADVICE_SIGN.getPrefix(), 10);
         for (AdviceSaveDto adviceSaveDto : insertOrUpdateList) {
+            // 🔧 Bug Fix: 确保accountId不为null
+            if (adviceSaveDto.getAccountId() == null) {
+                // 尝试从患者就诊中获取默认账户ID（自费账户）
+                Account selfAccount = iAccountService.getSelfAccount(adviceSaveDto.getEncounterId());
+                if (selfAccount != null) {
+                    adviceSaveDto.setAccountId(selfAccount.getId());
+                } else {
+                    // 自动创建自费账户
+                    Account newAccount = new Account();
+                    newAccount.setPatientId(adviceSaveDto.getPatientId());
+                    newAccount.setEncounterId(adviceSaveDto.getEncounterId());
+                    newAccount.setContractNo(CommonConstants.BusinessName.DEFAULT_CONTRACT_NO);
+                    newAccount.setTypeCode(AccountType.PERSONAL_CASH_ACCOUNT.getCode());
+                    newAccount.setBalanceAmount(BigDecimal.ZERO);
+                    newAccount.setStatusEnum(AccountStatus.ACTIVE.getValue());
+                    newAccount.setEncounterFlag(Whether.YES.getValue());
+                    newAccount.setName(AccountType.PERSONAL_CASH_ACCOUNT.getInfo());
+                    Long newAccountId = iAccountService.saveAccountByRegister(newAccount);
+                    adviceSaveDto.setAccountId(newAccountId);
+                }
+            }
+            
             // 中药付数
             BigDecimal chineseHerbsDoseQuantity = adviceSaveDto.getChineseHerbsDoseQuantity();
             medicationRequest = new MedicationRequest();

openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/utils/AdviceUtils.java

@@ -11,6 +11,8 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import com.openhis.administration.domain.ChargeItem;
+import com.openhis.administration.domain.Account;
+import com.openhis.administration.service.IAccountService;
 import com.openhis.administration.service.IChargeItemService;
 import com.openhis.common.constant.CommonConstants;
 import com.openhis.common.enums.*;
@@ -71,6 +73,9 @@ public class AdviceUtils {
     @Resource
     IDoctorStationAdviceAppService iDoctorStationAdviceAppService;
 
+    @Resource
+    IAccountService iAccountService;
+
     /**
      * 校验库存
      *
@@ -305,6 +310,28 @@ public class AdviceUtils {
      */
     public void handleActivityChild(String childrenJson, Long organizationId,
             ActivityChildrenJsonParams activityChildrenJsonParams) {
+        // 🔧 Bug Fix: 确保accountId不为null
+        if (activityChildrenJsonParams.getAccountId() == null) {
+            // 尝试从患者就诊中获取默认账户ID（自费账户）
+            Account selfAccount = iAccountService.getSelfAccount(activityChildrenJsonParams.getEncounterId());
+            if (selfAccount != null) {
+                activityChildrenJsonParams.setAccountId(selfAccount.getId());
+            } else {
+                // 自动创建自费账户
+                Account newAccount = new Account();
+                newAccount.setPatientId(activityChildrenJsonParams.getPatientId());
+                newAccount.setEncounterId(activityChildrenJsonParams.getEncounterId());
+                newAccount.setContractNo(CommonConstants.BusinessName.DEFAULT_CONTRACT_NO);
+                newAccount.setTypeCode(AccountType.PERSONAL_CASH_ACCOUNT.getCode());
+                newAccount.setBalanceAmount(BigDecimal.ZERO);
+                newAccount.setStatusEnum(AccountStatus.ACTIVE.getValue());
+                newAccount.setEncounterFlag(Whether.YES.getValue());
+                newAccount.setName(AccountType.PERSONAL_CASH_ACCOUNT.getInfo());
+                Long newAccountId = iAccountService.saveAccountByRegister(newAccount);
+                activityChildrenJsonParams.setAccountId(newAccountId);
+            }
+        }
+        
         // 治疗类型 (长期/临时)
         Integer therapyEnum = activityChildrenJsonParams.getTherapyEnum();
         // 当前登录账号的科室id

openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductTransferDetailDto.java

@@ -4,6 +4,7 @@
 package com.openhis.web.inventorymanage.dto;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.core.common.annotation.Excel;
 import com.core.common.annotation.ExcelExtra;
@@ -248,7 +249,8 @@ public class ProductTransferDetailDto {
     private Date occurrenceTime;
 
     /**
-     * 单位列表
+     * 单位列表（非数据库字段，业务逻辑填充）
      */
+    @TableField(exist = false)
     private List<UnitDto> unitList;
 }

openhis-ui-vue3/src/utils/request.js

@@ -11,6 +11,38 @@ import JSONBig from 'json-bigint'
 // 初始化json-bigint，配置大数字转字符串（关键：storeAsString: true）
 const jsonBig = JSONBig({ storeAsString: true })
 
+// 🔧 Bug Fix #281: 转换所有ID字段为字符串，防止BigInt精度丢失
+const convertIdsToString = (obj) => {
+  if (obj === null || obj === undefined) return obj
+  
+  if (typeof obj === 'number' && obj > 9007199254740991) {
+    // 如果是超过安全范围的数字，转为字符串
+    return String(obj)
+  }
+  
+  if (typeof obj === 'object') {
+    if (Array.isArray(obj)) {
+      return obj.map(item => convertIdsToString(item))
+    } else {
+      const newObj = {}
+      for (const key in obj) {
+        if (obj.hasOwnProperty(key)) {
+          const value = obj[key]
+          // 如果key以Id结尾或者是id，且值是数字，转为字符串
+          if ((key === 'id' || key.endsWith('Id') || key.endsWith('ID')) && typeof value === 'number') {
+            newObj[key] = String(value)
+          } else {
+            newObj[key] = convertIdsToString(value)
+          }
+        }
+      }
+      return newObj
+    }
+  }
+  
+  return obj
+}
+
 let downloadLoadingInstance;
 // 是否显示重新登录
 export let isRelogin = { show: false };
@@ -35,16 +67,23 @@ const service = axios.create({
       }
     }
   ],
-  // 可选：请求体序列化，无需额外处理，默认即可（保留也不影响）
+  // 可选：请求体序列化，使用json-bigint处理大数字
   transformRequest: [
     function (data) {
-      return JSON.stringify(data)
+      if (!data) return data
+      // 🔧 Bug Fix #281: 使用json-bigint序列化，保留大数字精度
+      return jsonBig.stringify(data)
     }
   ]
 })
 
 // request拦截器
 service.interceptors.request.use(config => {
+  // 🔧 Bug Fix #281: 转换请求数据中的ID字段为字符串
+  if (config.data && typeof config.data === 'object') {
+    config.data = convertIdsToString(config.data)
+  }
+  
   // 是否需要设置 token
   const isToken = (config.headers || {}).isToken === false
   // 是否需要防止数据重复提交
@@ -62,10 +101,11 @@ service.interceptors.request.use(config => {
   if (!isRepeatSubmit && (config.method === 'post' || config.method === 'put')) {
     const requestObj = {
       url: config.url,
-      data: typeof config.data === 'object' ? JSON.stringify(config.data) : config.data,
+      data: typeof config.data === 'object' ? jsonBig.stringify(config.data) : config.data,
       time: new Date().getTime()
     }
-    const requestSize = Object.keys(JSON.stringify(requestObj)).length; // 请求数据大小
+    // 🔧 Bug Fix #281: 使用json-bigint计算大小
+    const requestSize = Object.keys(jsonBig.stringify(requestObj)).length; // 请求数据大小
     const limitSize = 5 * 1024 * 1024; // 限制存放数据5M
     if (requestSize >= limitSize) {
       console.warn(`[${config.url}]: ` + '请求数据大小超出允许的5M限制，无法进行防重复提交验证。')

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

@@ -2149,7 +2149,10 @@ function handleDelete() {
     adviceType: item.adviceType, 
     statusEnum: item.statusEnum, 
     adviceName: item.adviceName,
-    uniqueKey: item.uniqueKey
+    uniqueKey: item.uniqueKey,
+    totalPrice: item.totalPrice,
+    dose: item.dose,
+    doseQuantity: item.doseQuantity
   })));
   
   for (let i = prescriptionList.value.length - 1; i >= 0; i--) {

openhis-ui-vue3/src/views/medicationmanagement/billapproval/index.vue

@@ -310,6 +310,11 @@ function handelApplys(row, view) {
     // 采购入库 1
     getpurchaseInventoryDetail(row.supplyBusNo).then((response) => {
       let currentData = response.data;
+      // 从明细数据中获取仓库ID并设置到row，确保跳转后仓库字段能正确显示
+      if (currentData && currentData.length > 0 && !row.purposeLocationId) {
+        row.purposeLocationId = currentData[0].purposeLocationId;
+        row.purposeLocationId_dictText = currentData[0].purposeLocationName;
+      }
       store.setCurrentData({ editRow: row, item: currentData });
       router.replace({
         path: '/medicationmanagement/medicationmanagement/purchaseDocument',

openhis-ui-vue3/src/views/medicationmanagement/purchaseDocument/components/medicineList.vue

@@ -16,7 +16,8 @@
         label="项目名称"
         align="center"
         prop="name"
-        width="180"
+        width="250"
+        :show-overflow-tooltip="true"
       />
       <el-table-column
         label="项目类型"

openhis-ui-vue3/src/views/medicationmanagement/purchaseDocument/index.vue

@@ -118,6 +118,7 @@
           clearable
           filterable
           style="width: 150px"
+          :disabled="viewStatus == 'view' || viewStatus == 'apply'"
           @change="handleMedicationTypeChange"
         >
           <el-option
@@ -134,6 +135,7 @@
           placeholder=""
           clearable
           style="width: 150px"
+          :disabled="viewStatus == 'view' || viewStatus == 'apply'"
           @visible-change="handlePurposeTypeEnumVisibleChange"
           @change="handleChangeLocationType"
         >
@@ -152,6 +154,7 @@
           clearable
           filterable
           style="width: 200px"
+          :disabled="viewStatus == 'view' || viewStatus == 'apply'"
           @visible-change="handleHeaderLocationVisibleChange"
         >
           <el-option
@@ -200,7 +203,7 @@
           :model="form"
           :rules="tableRules"
           ref="formRef"
-          :disabled="viewStatus == 'apply'"
+          :disabled="viewStatus == 'view' || viewStatus == 'apply'"
         >
           <!-- @cell-mouse-enter="handleMouseEnter" -->
           <!-- v-click-outside-row="handleClickOutside" @row-click="handleRowClick" 点击行以外的部分自动保存 -->
@@ -219,8 +222,9 @@
                 align="center"
                 key="name"
                 prop="name"
-                width="200"
+                width="250"
                 fixed
+                :show-overflow-tooltip="true"
               >
                 <template #default="scope">
                   <el-form-item
@@ -228,7 +232,7 @@
                     :rules="tableRules.name"
                   >
                     <el-input
-                      v-if="viewStatus == 'view'"
+                      v-if="viewStatus == 'view' || viewStatus == 'apply'"
                       v-model="scope.row.name"
                       placeholder=""
                       disabled
@@ -298,7 +302,7 @@
                   >
                     <div class="select_wrapper_div">
                       <el-input
-                        :disabled="viewStatus == 'view'"
+                        :disabled="viewStatus == 'view' || viewStatus == 'apply'"
                         v-model="scope.row.itemQuantity"
                         placeholder=""
                         @blur="handleTotalPrice(scope.$index)"
@@ -328,7 +332,7 @@
                         placeholder=" "
                         :class="{ 'error-border': scope.row.error }"
                         :clearable="false"
-                        :disabled="viewStatus == 'view'"
+                        :disabled="viewStatus == 'view' || viewStatus == 'apply'"
                         @change="
                           (value) => handleUnitCodeChange(scope.row, scope.$index, value)
                         "
@@ -378,7 +382,7 @@
                       :rules="tableRules.traceNo"
                     >
                       <el-input
-                        :disabled="viewStatus == 'view'"
+                        :disabled="viewStatus == 'view' || viewStatus == 'apply'"
                         v-model="scope.row.traceNo"
                         @change="(value) => handleTraceNoInput(value, scope.row)"
                         placeholder=""
@@ -403,7 +407,7 @@
                     <el-input
                       v-model="scope.row.packagingLevels"
                       placeholder=""
-                      :disabled="viewStatus == 'view'"
+                      :disabled="viewStatus == 'view' || viewStatus == 'apply'"
                     />
                   </el-form-item>
                 </template>
@@ -426,7 +430,7 @@
                         placeholder=""
                         @blur="handleTotalPrice(scope.$index)"
                         :class="{ 'error-border': scope.row.error }"
-                        :disabled="viewStatus == 'view'"
+                        :disabled="viewStatus == 'view' || viewStatus == 'apply'"
                       >
                         <template #suffix>元</template>
                       </el-input>
@@ -467,7 +471,7 @@
                       v-model="scope.row.lotNumber"
                       placeholder=""
                       maxlength="100"
-                      :disabled="viewStatus == 'view'"
+                      :disabled="viewStatus == 'view' || viewStatus == 'apply'"
                     />
                   </el-form-item>
                 </template>
@@ -490,7 +494,7 @@
                       placeholder="选择日期"
                       format="YYYY-MM-DD"
                       value-format="YYYY-MM-DD"
-                      :disabled="viewStatus == 'view'"
+                      :disabled="viewStatus == 'view' || viewStatus == 'apply'"
                       @change="changeValStart($event, scope.$index)"
                     />
                   </el-form-item>
@@ -509,7 +513,7 @@
                     :rules="tableRules.endTime"
                   >
                     <el-date-picker
-                      :disabled="viewStatus == 'view'"
+                      :disabled="viewStatus == 'view' || viewStatus == 'apply'"
                       v-model="scope.row.endTime"
                       type="date"
                       placeholder="选择日期"
@@ -536,7 +540,7 @@
                       v-model="scope.row.invoiceNo"
                       placeholder=""
                       style="text-align: center !important"
-                      :disabled="viewStatus == 'view'"
+                      :disabled="viewStatus == 'view' || viewStatus == 'apply'"
                     />
                   </el-form-item>
                 </template>
@@ -557,7 +561,7 @@
                     <el-input
                       v-model="scope.row.remake"
                       placeholder=""
-                      :disabled="viewStatus == 'view'"
+                      :disabled="viewStatus == 'view' || viewStatus == 'apply'"
                     />
                   </el-form-item>
                 </template>
@@ -1855,13 +1859,19 @@ function edit() {
     : editData.value.item[0].purposeTypeEnum.toString();
   receiptHeaderForm.medicationType =
     editData.value.item[0].itemTable == "med_medication_definition" ? "1" : "2";
-  receiptHeaderForm.headerLocationId = editData.value.editRow?.purposeLocationId || null;
+  // 先保存仓库ID，因为handleChangeLocationType会清空headerLocationId
+  const savedLocationId =
+    editData.value.editRow?.purposeLocationId ||
+    (editData.value.item && editData.value.item.length > 0 ? editData.value.item[0].purposeLocationId : null) ||
+    null;
   total.value = form.purchaseinventoryList.length;
   handleChangeLocationType(
     editData.value.editRow.purposeTypeEnum
       ? editData.value.editRow.purposeTypeEnum.toString()
       : editData.value.item[0].purposeTypeEnum.toString()
   );
+  // 在handleChangeLocationType之后再设置仓库ID
+  receiptHeaderForm.headerLocationId = savedLocationId;
   setTimeout(() => {
     form.purchaseinventoryList = editData.value.item.map((item) => {
       return {