完成出院带药和添加新的查询语句

src/api/zhu-yuan-yi-sheng/yi-zhu-lu-ru.js

@@ -151,6 +151,14 @@ export function huoQuGeiYaoFangShi(code) {
     })
 }
 
+export function getCostFreeDosing(code) {
+    return request({
+        url: url + '/getCostFreeDosing',
+        method: 'get',
+        params: {code},
+    })
+}
+
 export function huoQuZhiXinKeShi(code) {
     return request({
         url: url + '/huoQuZhiXinKeShi',

src/components/zhu-yuan-yi-sheng/yi-zhu-lu-ru/yz-edit/YzEditor.vue

@@ -233,7 +233,7 @@
 <script setup name='YzEditor'>
 import {
   confirmOrders,
-  enterOrders,
+  enterOrders, getCostFreeDosing,
   getOrderNo,
   getParentOrders,
   huoQuFeiYongXinXi,
@@ -483,9 +483,16 @@ const xuanZheJiLiang = (val) => {
 /* 给药方式 */
 const geiYaoFangShiData = ref([])
 const geiYaoFangShiRemoteMethod = (val) => {
-  huoQuGeiYaoFangShi(val).then((res) => {
-    geiYaoFangShiData.value = res
-  })
+  if (isCydy()) {
+    getCostFreeDosing(val).then((res) => {
+      geiYaoFangShiData.value = res
+    });
+  } else {
+    huoQuGeiYaoFangShi(val).then((res) => {
+      geiYaoFangShiData.value = res
+    });
+  }
+
 }
 
 // 医嘱限制时间不能在之前

src/components/zhu-yuan-yi-sheng/yi-zhu-lu-ru/yz-header/YzQueryCondition.vue

@@ -7,6 +7,7 @@
         <option :value="0">全部</option>
         <option :value="1">停止</option>
         <option :value="2">当前</option>
+        <option :value="3">今天</option>
       </select>
     </label>
     <label>

src/views/hospitalization/zhu-yuan-yi-sheng/public-js/zhu-yuan-yi-sheng.js

@@ -5,6 +5,8 @@ import {getPatientInfo} from "@/api/inpatient/patient";
 import {BizException, ExceptionEnum} from "@/utils/BizException";
 import {ref} from "vue";
 import {getWardsApi} from "@/api/login";
+import {getServerDateApi} from "@/api/public-api";
+import {getFormatDatetime, subtractTime} from "@/utils/date";
 
 // 患者信息
 export const huanZheXinXi = ref({})
@@ -121,6 +123,10 @@ export const yiZhuData = ref({
 });
 // 保存医嘱数据
 export const yzData = ref([])
+let newDate = ''
+getServerDateApi().then(res => {
+    newDate = res
+})
 // 数据筛选
 export const tempYzData = computed(() => {
     selectedData.value = []
@@ -139,6 +145,8 @@ export const tempYzData = computed(() => {
             flag = item.statusFlag === '5'
         } else if (queryParam.value.displayRange === 2) {
             flag = item.statusFlag === '2' || item.statusFlag === '3' || item.statusFlag === '4'
+        } else if (queryParam.value.displayRange === 3) {
+            flag = getFormatDatetime(newDate, 'YYYY-MM-DD') === getFormatDatetime(item.startTime, 'YYYY-MM-DD')
         }
 
         if (queryParam.value.frequCode === 1) {