feat: Bug #597 - 新增医嘱弹窗添加备注字段 + 查询返回remark

openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceBaseDto.java

@@ -250,4 +250,9 @@ public class AdviceBaseDto {
      * 是否缺少取药科室配置（仅药品类型使用）
      */
     private Boolean pharmacyConfigMissing;
+
+    /**
+     * 备注（最长50字）
+     */
+    private String remark;
 }

openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RegRequestBaseDto.java

@@ -50,4 +50,9 @@ public class RegRequestBaseDto extends RequestBaseDto {
     private String doseUnitCode;
     private String doseUnitCode_dictText;
 
+
+    /**
+     * 备注（最长50字）
+     */
+    private String remark;
 }

openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/AdviceManageAppMapper.xml

@@ -217,7 +217,8 @@
         T1.therapy_enum AS therapyEnum,
         T1.sort_number AS sort_number,
         T1.based_on_id AS based_on_id,
-        T1.medication_id AS advice_definition_id
+        T1.medication_id AS advice_definition_id,
+        NULL AS remark
         FROM med_medication_request AS T1
         LEFT JOIN med_medication_definition AS T2 ON T2.ID = T1.medication_id
         AND T2.delete_flag = '0'
@@ -270,7 +271,8 @@
         2 AS therapyEnum,
         99 AS sort_number,
         T1.based_on_id AS based_on_id,
-        T1.device_def_id AS advice_definition_id
+        T1.device_def_id AS advice_definition_id,
+        NULL AS remark
         FROM wor_device_request AS T1
         LEFT JOIN adm_device_definition AS T2 ON T2.ID = T1.device_def_id
         AND T2.delete_flag = '0'
@@ -320,7 +322,8 @@
         COALESCE(T1.therapy_enum, 2) AS therapyEnum,
         99 AS sort_number,
         T1.based_on_id AS based_on_id,
-        T1.activity_id AS advice_definition_id
+        T1.activity_id AS advice_definition_id,
+        T1.remark AS remark
         FROM wor_service_request AS T1
         LEFT JOIN wor_activity_definition AS T2
         ON T2.ID = T1.activity_id

openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/OrderForm.vue

@@ -285,6 +285,9 @@
               </el-select>
             </template>
           </div>
+          <el-form-item label="备注：" prop="remark">
+            <el-input v-model="row.remark" maxlength="50" placeholder="最多50字" style="width: 200px" />
+          </el-form-item>
           <div class="form-actions">
             <el-button type="primary" @click="handleSave">确定</el-button>
             <el-button @click="handleCancel">取消</el-button>
@@ -365,6 +368,9 @@
               总金额：{{ row.totalPrice ? Number(row.totalPrice).toFixed(2) + ' 元' : '0.00 元' }}
             </span>
           </div>
+          <el-form-item label="备注：" prop="remark">
+            <el-input v-model="row.remark" maxlength="50" placeholder="最多50字" style="width: 200px" />
+          </el-form-item>
           <div class="form-actions">
             <el-button type="primary" @click="handleSave">确定</el-button>
             <el-button @click="handleCancel">取消</el-button>
@@ -418,6 +424,9 @@
               <!-- 金额: {{ row.priceList[0].price }} -->
             </span>
           </div>
+          <el-form-item label="备注：" prop="remark">
+            <el-input v-model="row.remark" maxlength="50" placeholder="最多50字" style="width: 200px" />
+          </el-form-item>
           <div class="form-actions">
             <el-button type="primary" @click="handleSave">确定</el-button>
             <el-button @click="handleCancel">取消</el-button>