develop/hrl20241214_tysj

退药无显示什么时间产生的退药单（即护士进行退药操作的时间非药房人员进行退药操作时间），保留药房人员退药操作时间。

.gitignore

@@ -1 +0,0 @@
-/.project

.project

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>klhis_git</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

WEB-INF/conf/sysds_his_yffy.xml

@@ -3305,7 +3305,7 @@ select yzxpkey,ward,YZMC,sum(jzyzsl) sl,YPYZJBDW,sum(fyje) zje,YZJX,gg,YPFL,YZLX
  		<sql><![CDATA[  	
  		
 	 	select a.PKEY,a.FYBPKEY,a.JZPKEY,a.HZPKEY,a.ZYNO,a.CFH,a.PYBPKEY,a.YZXPKEY,a.YZMX,a.YZDJ,a.YZSL,a.YPFL,a.YZDL,a.TYSL,a.KSKCPKEY,a.KSKCPCPKEY,a.CJR,a.CJRQ,a.XGR,a.XGRQ,a.JGID,a.EXEPKEY,e.zxtime,a.yzsl jzyzsl,b.YPYZJBDW,b.YZJZZHXS,b.YZMC,c.GG,b.YZJL,b.YZJLDW,b.YZPC,b.yzcl,e.pkey execpkey,e.SFFLAG,b.YPYZJBJG,a.yzsl*b.YPYZJBJG je,b.YZJX,a.YZSL jzsfsl,e.zxsl,e.zxje,b.YZXZSJ,e.ISACTION,b.YZLX,b.YZZCYFS,b.YZYF,c.CSXX,g.FYR,g.FYKS,g.FYTIME,g.HZBQ,g.HZKS,f.xm,g.FYLB,c.JX
-		,tyd.TYDH,tyd.WARD,tyd.BED,tyd.SQKS,tyd.JSKS,tyd.JJKS,b.YZXZYS,tyd.SQR,tyd.TYR,tyd.TYRQ,tyd.SQSL SQSL,e.zxrward,a.SFSL,a.FYDW,a.SFBZDWFY,a.YPYZZHXS,a.FYJE,a.YPFYSJMS,a.TYJE,a.STSL,a.PCSJ,a.PCJBSJ,b.YPYZBZJG 
+		,tyd.TYDH,tyd.WARD,tyd.BED,tyd.SQKS,tyd.JSKS,tyd.JJKS,b.YZXZYS,tyd.SQR,tyd.TYR,tyd.TYRQ,tyd.SQSL SQSL,e.zxrward,a.SFSL,a.FYDW,a.SFBZDWFY,a.YPYZZHXS,a.FYJE,a.YPFYSJMS,a.TYJE,a.STSL,a.PCSJ,a.PCJBSJ,b.YPYZBZJG,e.CXSJ
 		from HIS_YFFY_ZYFYMXB a  left join HIS_YZ_MXB b on a.YZMX=b.PKEY  and a.JGID=b.JGID left join HIS_YPXX c on a.YZXPKEY=c.BM  left join HIS_YZ_EXEC e on a.EXEPKEY=e.pkey and a.JGID=e.JGID  left join HIS_YFFY_ZYFYZB g on a.FYBPKEY=g.pkey and a.JGID=g.JGID left join HIS_HZINFO f on a.hzpkey=f.pkey and a.JGID=f.JGID  left join HIS_YFFY_ZYTYSQB tyd on tyd.exepkey=e.pkey and tyd.JGID=e.JGID where a.JGID=? and nvl(a.YZSL,0)>0 and nvl(a.TYSL,0) > 0 and tyd.STATE=1 order by a.bed,a.YZMX,e.zxtime
 
 
@@ -3390,6 +3390,7 @@ select yzxpkey,ward,YZMC,sum(jzyzsl) sl,YPYZJBDW,sum(fyje) zje,YZJX,gg,YPFL,YZLX
             <f name="PCSJ"  type="8"  />
             <f name="PCJBSJ"  type="8"  />
             <f name="YPYZBZJG"  type="12"  />
+            <f name="CXSJ"  type="12"  />
 	        </fields>
 	        <parameter>
 	            <p>12</p>

WEB-INF/src/com/his/zy/zyyfcxmanage/ZyTydFindForm.xml

@@ -72,6 +72,7 @@
 					                <column   fieldname="FYJE"    footexp="$sum(FYJE)"   width="90">发药金额</column>
 <!--					                <column   fieldname="SQSL" type="LABEL_CELL"  footexp="$sum(SQSL)"    width="60">申请数量</column>-->
 									<column   fieldname="JSKS" type="DICTIONARYLABEL_CELL"     dic="DPTNAME:DPTID@dpdicdao" width="120">退药科室</column>
+					                <column   fieldname="CXSJ" type="DATETIMESHOW_CELL" datetimetype="datetime"      width="120">申请退药日期</column>
 					                <column   fieldname="TYRQ" type="DATETIMESHOW_CELL" datetimetype="datetime"      width="120">退药日期</column>
 					                <column   fieldname="SQR" type="DICTIONARYLABEL_CELL"     dic="NAME:USERACCOUNT@jgrydicdao" width="63">申请人</column>
 					                <column   fieldname="TYR" type="DICTIONARYLABEL_CELL"     dic="NAME:USERACCOUNT@jgrydicdao" width="63">退药人</column>

release/20241216_1413.text

@@ -28,6 +28,9 @@ develop/hrl_20241217_fyhzjsjbyz
 ...........................................................................................................................................
 
 <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+develop/hrl20241214_tysj
+
+退药无显示什么时间产生的退药单（即护士进行退药操作的时间非药房人员进行退药操作时间），保留药房人员退药操作时间。
 ...........................................................................................................................................
 
 <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<