From 66c70a2b4a0a681804d61a64cb39e4355f2cce27 Mon Sep 17 00:00:00 2001
From: HuangShun <148689675+huabuweixin@users.noreply.github.com>
Date: Fri, 23 Jan 2026 13:28:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D103=20=E9=97=A8=E8=AF=8A?=
 =?UTF-8?q?=E5=8C=BB=E7=94=9F=E7=AB=99-=E3=80=8B=E8=8D=AF=E5=93=81?=
 =?UTF-8?q?=E5=8C=BB=E5=98=B1=E5=BC=80=E7=AB=8B=E5=86=85=E5=AE=B9=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D/=E3=80=90=E7=A1=AE=E8=AE=A4=E3=80=91=E6=97=A0?=
 =?UTF-8?q?=E5=93=8D=E5=BA=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../prescription/prescriptionlist.vue         | 300 +++---------------
 1 file changed, 41 insertions(+), 259 deletions(-)

diff --git a/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue b/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue
index 129764da..58772e5a 100644
--- a/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue
@@ -356,265 +356,39 @@
                       </template>
                     </el-select>
                   </el-form-item>
-                        <!-- 剂量单位 -->
-                        <el-select
-                          v-model="scope.row.unitCode"
-                          style="width: 70px; margin-right: 20px"
-                          placeholder=" "
-                        >
-                          <template
-                            v-for="item in scope.row.unitCodeList"
-                            :key="item.value"
-                          >
-                            <el-option
-                              v-if="item.type == unitMap['minUnit']"
-                              :value="item.value"
-                              :label="item.label"
-                            />
-                          </template>
-                        </el-select>
-                        <span>=</span>
-                        <!-- 单次剂量 -->
-                        <el-form-item prop="dose" class="required-field" data-prop="dose">
-                          <el-input-number
-                            v-model="scope.row.dose"
-                            controls-position="right"
-                            :controls="false"
-                            style="width: 70px; margin: 0 20px"
-                            :ref="
-                              (el) => {
-                                if (!inputRefs[scope.$index])
-                                  inputRefs[scope.$index] = {};
-                                inputRefs[scope.$index].dose = el;
-                              }
-                            "
-                            @input="convertDoseValues(scope.row, scope.$index)"
-                            @keyup.enter.prevent="
-                              handleEnter(
-                                'dose',
-                                scope.row,
-                                scope.$index,
-                                prescription.id
-                              )
-                            "
-                          />
-                        </el-form-item>
-                        <!-- 全部单位 -->
-                        <el-select
-                          v-model="scope.row.doseUnitCode"
-                          style="width: 70px"
-                          placeholder=" "
-                          @change="convertValues(scope.row, scope.$index)"
-                        >
-                          <el-option
-                            v-for="item in scope.row.unitCodeList"
-                            :value="item.value"
-                            :label="item.label"
-                            :key="item.value"
-                          />
-                        </el-select>
-                      </div>
-                      <div class="form-group">
-                        <el-form-item
-                          label="给药途径："
-                          prop="methodCode"
-                          class="required-field"
-                          data-prop="methodCode"
-                        >
-                          <el-select
-                            v-model="scope.row.methodCode"
-                            placeholder="给药途径"
-                            clearable
-                            filterable
-                            :ref="
-                              (el) => {
-                                if (!inputRefs[scope.$index])
-                                  inputRefs[scope.$index] = {};
-                                inputRefs[scope.$index].methodCode = el;
-                              }
-                            "
-                            @keyup.enter.prevent="
-                              () => {
-                                inputRefs[scope.$index]?.methodCode?.blur();
-                              }
-                            "
-                            @visible-change="
-                              (value) => {
-                                if (!value) {
-                                  handleEnter('methodCode', scope.row, scope.$index);
-                                }
-                              }
-                            "
-                          >
-                            <el-option
-                              v-for="dict in method_code"
-                              @click="() => (scope.row.methodCode_dictText = dict.label)"
-                              @keyup="handleEnter('methodCode', scope.row, scope.$index)"
-                              :key="dict.value"
-                              :label="dict.label"
-                              :value="dict.value"
-                            />
-                          </el-select>
-                        </el-form-item>
-                        <el-form-item
-                          label="用药频次："
-                          prop="rateCode"
-                          class="required-field"
-                          data-prop="rateCode"
-                        >
-                          <el-select
-                            v-model="scope.row.rateCode"
-                            placeholder="频次"
-                            style="width: 120px"
-                            filterable
-                            @keyup.enter.prevent="
-                              () => {
-                                inputRefs[scope.$index]?.rateCode?.blur();
-                              }
-                            "
-                            @change="calculateTotalAmount(scope.row, scope.$index)"
-                            @visible-change="
-                              (value) => {
-                                if (!value) {
-                                  handleEnter('rateCode', scope.row, scope.$index);
-                                }
-                                // inputRefs.rateCode.blur();
-                              }
-                            "
-                            :ref="
-                              (el) => {
-                                if (!inputRefs[scope.$index])
-                                  inputRefs[scope.$index] = {};
-                                inputRefs[scope.$index].rateCode = el;
-                              }
-                            "
-                          >
-                            <el-option
-                              v-for="dict in rate_code"
-                              @click="() => (scope.row.rateCode_dictText = dict.label)"
-                              :key="dict.value"
-                              :label="dict.label"
-                              :value="dict.value"
-                            />
-                          </el-select>
-                        </el-form-item>
-                        <el-form-item
-                          label="备注："
-                          prop="remarks"
-                          style="margin: 0; margin-right: 20px"
-                        >
-                          <el-input
-                            v-model="scope.row.remarks"
-                            placeholder="请输入备注"
-                            maxlength="100"
-                            show-word-limit
-                            style="width: 200px"
-                          />
-                        </el-form-item>
-                      </div>
-                    </div>
-                    <div
-                      style="
-                        display: flex;
-                        align-items: center;
-                        gap: 12px;
-                        flex-wrap: wrap;
-                        margin-top: 10px;
-                      "
+                  </div>
+                </div>
+                <div
+                  style="
+                    display: flex;
+                    align-items: center;
+                    gap: 12px;
+                    flex-wrap: wrap;
+                    margin-top: 10px;
+                  "
+                >
+                  <div class="form-group">
+                    <el-form-item
+                      label="备注："
+                      prop="remarks"
+                      style="margin: 0; margin-right: 20px"
                     >
-                      <div class="form-group">
-                        <el-form-item
-                          label="用药天数："
-                          prop="dispensePerDuration"
-                          class="required-field"
-                          data-prop="dispensePerDuration"
-                        >
-                          <el-input-number
-                            v-model="scope.row.dispensePerDuration"
-                            style="width: 80px"
-                            :min="1"
-                            controls-position="right"
-                            :controls="false"
-                            :ref="
-                              (el) => {
-                                if (!inputRefs[scope.$index])
-                                  inputRefs[scope.$index] = {};
-                                inputRefs[scope.$index].dispensePerDuration = el;
-                              }
-                            "
-                            @keyup.enter.prevent="
-                              handleEnter('dispensePerDuration', scope.row, scope.$index)
-                            "
-                            @input="calculateTotalAmount(scope.row, scope.$index)"
-                          >
-                            <template #suffix>天</template>
-                          </el-input-number>
-                        </el-form-item>
-
-                        <el-form-item
-                          label="总量："
-                          prop="quantity"
-                          class="required-field"
-                          data-prop="quantity"
-                        >
-                          <el-input-number
-                            v-model="scope.row.quantity"
-                            style="width: 70px"
-                            controls-position="right"
-                            :controls="false"
-                            :ref="
-                              (el) => {
-                                if (!inputRefs[scope.$index])
-                                  inputRefs[scope.$index] = {};
-                                inputRefs[scope.$index].quantity = el;
-                              }
-                            "
-                            @keyup.enter.prevent="
-                              handleEnter(
-                                'quantity',
-                                scope.row,
-                                scope.$index,
-                                prescription.id
-                              )
-                            "
-                            @input="calculateTotalPrice(scope.row, scope.$index)"
-                          />
-                        </el-form-item>
-                        <el-select
-                          v-model="scope.row.unitCode"
-                          style="width: 70px; margin-right: 20px"
-                          placeholder=" "
-                          @change="calculateTotalAmount(scope.row, scope.$index)"
-                        >
-                          <template
-                            v-for="item in scope.row.unitCodeList"
-                            :key="item.value"
-                          >
-                            <el-option
-                              v-if="checkUnit(item, scope.row)"
-                              :value="item.value"
-                              :label="item.label"
-                              @click="
-                                () => {
-                                  if (item.type == unitMap['minUnit']) {
-                                    scope.row.unitPrice = scope.row.minUnitPrice;
-                                  } else {
-                                    scope.row.unitPrice = scope.row.unitTempPrice;
-                                  }
-                                  scope.row.unitCode_dictText = item.label;
-                                }
-                              "
-                            />
-                          </template>
-                        </el-select>
-                      </div>
-                      <el-button
-                        type="primary"
-                        @click="handleSaveSign(scope.row, scope.$index, prescription.id)"
-                      >
-                        确定
-                      </el-button>
-                    </div>
+                      <el-input
+                        v-model="scope.row.remarks"
+                        placeholder="请输入备注"
+                        maxlength="100"
+                        show-word-limit
+                        style="width: 500px"
+                      />
+                    </el-form-item>
+                  </div>
+                  <el-button
+                    type="primary"
+                    @click="handleSaveSign(scope.row, scope.$index)"
+                  >
+                    确定
+                  </el-button>
+                </div>
                   </template>
                   <template v-else-if="scope.row.adviceType == 2">
                     <div
@@ -693,7 +467,7 @@
                         }}
                       </span>
                     </div>
-                    <el-button type="primary" @click="handleSaveSign(scope.row, scope.$index, prescription.id)">
+                    <el-button type="primary" @click="handleSaveSign(scope.row, scope.$index)">
                       确定
                     </el-button>
                   </template>
@@ -1152,6 +926,12 @@ const adviceTypeList = ref([
   },
 ]);
 
+// 根据类型值获取显示标签，避免非编辑态出现空标签
+const mapAdviceTypeLabel = (type) => {
+  const found = adviceTypeList.value.find((item) => item.value === type);
+  return found ? found.label : '';
+};
+
 // 西药处方管理相关变量
 const westernPrescriptions = ref([]); // 西药处方列表
 const currentPrescriptionId = ref(null); // 当前活跃的处方ID
@@ -2321,6 +2101,8 @@ function handleSaveSign(row, index, prescriptionId) {
       row.patientId = props.patientInfo.patientId;
       row.encounterId = props.patientInfo.encounterId;
       row.accountId = accountId.value;
+      // 确保非编辑态显示正确的医嘱类型标签
+      row.adviceType_dictText = mapAdviceTypeLabel(row.adviceType);
       if (row.adviceType == 1 || row.adviceType == 2) {
         row.minUnitQuantity =
           row.minUnitCode == row.unitCode ? row.quantity : row.quantity * row.partPercent;