bug338:门诊划价新增时未校验当前就诊记录及诊断记录，未接诊患者也可新增划价项目。

bug339:【库存商品明细查询报表】“药房”筛选条件失效，查询结果中包含非选中药房的数据

openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/InventoryProductReportMapper.xml

@@ -66,7 +66,11 @@
                            LEFT JOIN adm_location T7
                                      ON T1.location_store_id = T7.id
                                          AND T7.delete_flag = '0'
-                  WHERE T1.delete_flag = '0') AS T8
+                  WHERE T1.delete_flag = '0'
+                  <if test="purposeLocationId != null">
+                      AND T1.location_id = #{purposeLocationId}
+                  </if>
+                  ) AS T8
             UNION
             SELECT T10.id,                                                 --ID
                    T10.bus_no,                                             --器材编码
@@ -129,7 +133,11 @@
                            LEFT JOIN adm_location T7
                                      ON T1.location_store_id = T7.id
                                          AND T7.delete_flag = '0'
-                  WHERE T1.delete_flag = '0') AS T10
+                  WHERE T1.delete_flag = '0'
+                  <if test="purposeLocationId != null">
+                      AND T1.location_id = #{purposeLocationId}
+                  </if>
+                  ) AS T10
         ) AS combined_result
         <where>
             <if test="inventoryScope != null">