develop/lyx_20241206_djfx

1.冻结分析药品调拨情况显示调整

WEB-INF/conf/sysds_his_yfyk.xml

@@ -2329,12 +2329,13 @@
 
 	<dao id="djypByYpDbdDao" log="true" type="1" memo="冻结药品在药品调拨单">
 		<sql>
-			select a.DJH,a.SL,a.DW from HIS_YFYK_DBD_MX a left join HIS_YFYK_DBD b on a.DJH=b.DJH and a.JGID=b.JGID where b.JGID=? and b.SHZT=1 and b.RKZT=0 and a.sfx_bm=?
+			select a.DJH,a.SL,a.DW,b.SHZT from HIS_YFYK_DBD_MX a left join HIS_YFYK_DBD b on a.DJH=b.DJH and a.JGID=b.JGID where b.JGID=? and b.RKZT=0 and a.sfx_bm=?
 		</sql>
 		<fields>
 			<f name="DJH" type="12" />
 			<f name="SL" type="8" />
 			<f name="DW" type="12" />
+			<f name="SHZT" type="12" />
 		</fields>
 		<parameter>
 			<p>12</p>

WEB-INF/src/com/his/yfyk/DjypFxWindow.xml

@@ -36,6 +36,7 @@
 			                <column   fieldname="DJH"       width="120">单据号</column>
 			                <column   fieldname="SL"   footexp="$sum(SL)"     width="120">冻结数量</column>
 			                <column   fieldname="DW" type="DICTIONARYLABEL_CELL"     dic="MC:BH@dwdicdao" width="120">单位</column>
+			                <column   fieldname="SHZT"     cellcolor="true"  type="DICTIONARYLABEL_CELL"  mapjson="{0:未审核,1:已审核}"    width="120">状态</column>
 			            </DxDataGrid>
 			        </DxTitlePanel>                 
               </col>              

release/20241120_1738.text

@@ -41,6 +41,9 @@ develop/lyx_20241205_basy
 ...........................................................................................................................................
 
 <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+develop/lyx_20241206_djfx
+
+1.冻结分析药品调拨情况显示调整
 ...........................................................................................................................................
 
 <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<