597 【住院医生工作站-临床医嘱】临床医嘱需增加“备注”字段支持

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

@@ -219,6 +219,7 @@
         T1.effective_dose_start AS start_time,
         T1.based_on_id AS based_on_id,
         T1.medication_id AS advice_definition_id,
+        T1.content_json::jsonb ->> 'remark' AS remark,
         T1.effective_dose_end AS stop_time,
         T1.update_by AS stop_user_name
         FROM med_medication_request AS T1
@@ -275,6 +276,7 @@
         T1.req_authored_time AS start_time,
         T1.based_on_id AS based_on_id,
         T1.device_def_id AS advice_definition_id,
+        T1.content_json::jsonb ->> 'remark' AS remark,
         NULL::timestamp AS stop_time,
         '' AS stop_user_name
         FROM wor_device_request AS T1
@@ -328,6 +330,7 @@
         T1.occurrence_start_time AS start_time,
         T1.based_on_id AS based_on_id,
         T1.activity_id AS advice_definition_id,
+        T1.remark AS remark,
         T1.occurrence_end_time AS stop_time,
         T1.update_by AS stop_user_name
         FROM wor_service_request AS T1

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

@@ -200,6 +200,9 @@
                 />
               </el-select>
             </el-form-item>
+            <el-form-item label="备注：" prop="remark">
+              <el-input v-model="row.remark" maxlength="50" placeholder="最多50字" style="width: 200px" />
+            </el-form-item>
           </div>
         </div>
         <div
@@ -294,9 +297,6 @@
               </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>

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

@@ -342,6 +342,13 @@
             </span>
           </template>
         </el-table-column>
+        <el-table-column label="备注" align="center" prop="remark" width="150" show-overflow-tooltip>
+          <template #default="scope">
+            <span v-if="!scope.row.isEdit">
+              {{ scope.row.remark || '-' }}
+            </span>
+          </template>
+        </el-table-column>
         <el-table-column label="诊断" align="center" prop="diagnosisName" width="150">
           <template #default="scope">
             <span v-if="!scope.row.isEdit">