确认医嘱收费现在可以根据住院号和病区来搜索了。

pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <groupId>thyyxxk</groupId>
     <artifactId>web-server</artifactId>
-    <version>10.1.6</version>
+    <version>10.1.7</version>
     <name>web-server</name>
     <description>server for yibao-web</description>
     <properties>

src/main/java/thyyxxk/webserver/dao/his/zhuyuanyiji/QueRenYiZhuShouFeiDao.java

@@ -37,12 +37,20 @@ public interface QueRenYiZhuShouFeiDao {
             "    #{item}  " +
             "</foreach>" +
             "      and   a.inpatient_no=b.inpatient_no and " +
+            "<if test=\"inpatientNo !=null and inpatientNo != '' \">" +
+            " a.inpatient_no = #{inpatientNo} and " +
+            "</if>" +
+            "<if test=\"wardCode !=null and wardCode != '' \">" +
+            " a.ward_code = #{wardCode} and " +
+            "</if>" +
             "         a.admiss_times=b.admiss_times " +
             "         and convert(varchar(20),a.occ_time,23)&lt;=convert(varchar(20),getdate(),23) " +
             "group by a.inpatient_no, a.admiss_times, b.bed_no, b.name, a.ward_code " +
             "order by ward_code" +
             "</script>")
     IPage<YzActOrder> getXuQueFeiYiZhu(IPage<YzActOrder> page,
+                                       @Param("inpatientNo") String inpatientNo,
+                                       @Param("wardCode") String wardCode,
                                        @Param("list") List<String> list);
 
 
@@ -66,13 +74,22 @@ public interface QueRenYiZhuShouFeiDao {
             "<foreach collection='list' item='item' index='index' open='(' close=')' separator=','>" +
             "    #{item}  " +
             "</foreach>" +
+
             "      and   a.inpatient_no=b.inpatient_no and " +
+            "<if test=\"inpatientNo !=null and inpatientNo != '' \">" +
+            " a.inpatient_no = #{inpatientNo} and " +
+            "</if>" +
+            "<if test=\"wardCode !=null and wardCode != '' \">" +
+            " a.ward_code = #{wardCode} and " +
+            "</if>" +
             "         a.admiss_times=b.admiss_times " +
             "         and convert(varchar(20),a.occ_time,23)&lt;=convert(varchar(20),getdate(),23) " +
             "group by a.inpatient_no, a.admiss_times, b.bed_no, b.name, a.ward_code" +
             ") temp" +
             "</script>")
-    long getXuQueFeiYiZhuTotal(@Param("list") List<String> list);
+    long getXuQueFeiYiZhuTotal(@Param("inpatientNo") String inpatientNo,
+                               @Param("wardCode") String wardCode,
+                               @Param("list") List<String> list);
 
 
     @Select("select inpatient_no,admiss_times,bed_no,sex,admiss_date,responce_type, " +

src/main/java/thyyxxk/webserver/service/zhuyuanyiji/QueRenYiZhuShouFeiServer.java

@@ -54,8 +54,8 @@ public class QueRenYiZhuShouFeiServer {
             return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "科室信息为空 [・_・?]");
         }
         log.info("查询需确费医嘱：数据：{}", JSON.toJSONString(yzActOrder));
-        page.setTotal(dao.getXuQueFeiYiZhuTotal(publicServer.getKeShiLieBiaoList(yzActOrder.getExecUnit())));
-        dao.getXuQueFeiYiZhu(page, publicServer.getKeShiLieBiaoList(yzActOrder.getExecUnit()));
+        page.setTotal(dao.getXuQueFeiYiZhuTotal(yzActOrder.getInpatientNo(), yzActOrder.getWardCode(), publicServer.getKeShiLieBiaoList(yzActOrder.getExecUnit())));
+        dao.getXuQueFeiYiZhu(page, yzActOrder.getInpatientNo(), yzActOrder.getWardCode(), publicServer.getKeShiLieBiaoList(yzActOrder.getExecUnit()));
         if (page.getRecords().isEmpty()) {
             return ResultVoUtil.fail(ExceptionEnum.NO_DATA_EXIST);
         }

src/main/resources/application.yml

@@ -78,4 +78,6 @@ si-tj-url: http://jkglcsx.server.zhongmeihealth.com/openInter
 si-api-url: http://10.136.68.158:21005/isp-api/powercsb/1101
 si-access-key: 9snmKvEVZJBrAkcpgZ9075QCshQ49GH1EnB3wc
 si-secret-key: SKNEbk3E0efsrmJ3PGbClqABprNHcQZFKldR2QNP
-
+#logging:
+#  level:
+#    thyyxxk.webserver.dao: debug