372 【住院医生站】医嘱录入执行科室显示ID乱码，且缺乏动态匹配逻辑

373 【住院医生站】医嘱搜索缺失“II级护理”项目（与诊疗目录配置不符）

openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationAdviceController.java

@@ -53,7 +53,7 @@ public class DoctorStationAdviceController {
             @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
             @RequestParam(value = "categoryCode", required = false) String categoryCode) {
         return R.ok(iDoctorStationAdviceAppService.getAdviceBaseInfo(adviceBaseDto, searchKey, locationId,
-                adviceDefinitionIdParamList, organizationId, pageNo, pageSize, Whether.NO.getValue(), adviceTypes, null, categoryCode));
+                adviceDefinitionIdParamList, organizationId, pageNo, pageSize, null, adviceTypes, null, categoryCode));
     }
 
     /**

openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationChineseMedicalController.java

@@ -118,7 +118,7 @@ public class DoctorStationChineseMedicalController {
             organizationId = SecurityUtils.getLoginUser().getOrgId();
         }
         return R.ok(iDoctorStationChineseMedicalAppService.getTcmAdviceBaseInfo(adviceBaseDto, searchKey, locationId,
-            adviceDefinitionIdParamList, organizationId, pageNo, pageSize, Whether.NO.getValue()));
+            adviceDefinitionIdParamList, organizationId, pageNo, pageSize, null));
     }
 
     /**

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

@@ -198,6 +198,7 @@ public class AdviceBaseDto {
     /**
      * 所属科室
      */
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long orgId;
 
     /**