diff --git a/WEB-INF/conf/sysds_his_zyyz.xml b/WEB-INF/conf/sysds_his_zyyz.xml
index 350c459..de57fda 100644
--- a/WEB-INF/conf/sysds_his_zyyz.xml
+++ b/WEB-INF/conf/sysds_his_zyyz.xml
@@ -2975,7 +2975,7 @@ select a.PKEY,a.HZPKEY,a.JZPKEY,a.JZH,a.CFH,a.YZCL,a.YZLB,a.YZLX,a.YZXPKEY,a.YZS
(select sum(ZXJE) yffjzje from HIS_YZ_EXEC where YFBDZYZPKEY=a.pkey and jzpkey=a.jzpkey and hzpkey=a.hzpkey and JGID=a.JGID and ZXFLAG='1' and SFFLAG='1') yffjzje,
a.HZSZKS,a.LOCKFLAG,a.SFXSYZ,a.GLLX,a.OPAPKEY,a.ANESPKEY,a.ISOPAORDER,a.ISANESORDER, (select sum(yzsl) from HIS_YFFY_PYB pyb left join HIS_YZ_EXEC exec on pyb.DFYPKEY=exec.pkey and pyb.JGID=exec.JGID where pyb.yzmx=a.pkey and pyb.JGID=a.JGID and exec.ZXFLAG=1 and pyb.FYCX=0 and exec.SFFLAG=1 and pyb.FYZT=0) sfdfysl,a.SMORDERPKEY,a.LMT_USED_FLAG,a.XZSYFW,a.CHRGITM_LV,a.YBBM,a.YBMC,a.YZGG,a.YZDXRL,a.YPFYSJMS,a.YPPCSJ,a.YPPCJBSJ,a.YPMRPC,a.DMJYZ,a.DMJSFZ,a.DMJDBRSFZ,a.DMJDBRXM,a.DMJDBRDH,a.YZCFLX,a.YZSFKS,a.YZSFYS,a.YZSFTIME,a.YZSFBZ,a.YZYWBZ,a.YZPSYPPC,a.YZPSDS,a.YZPSDSBEGIN,a.YZPSDSMINUTE,a.PSDSMAN,a.PSDSTIME,a.PSZXKS,a.DDD,a.YZTPKEY,a.SFQYSHCF,a.SHCFZT,a.DCZDJL,a.MTZDJL,a.ZDL,a.SZSYTS,a.YZHOURBEGIN,a.YZHOUREND
- from HIS_YZ_MXB a where a.JGID=? and a.HZPKEY=? and a.JZPKEY=? and (a.YZLX='0' or a.YZLX='4' or a.YZLX='5' or a.YZLX='3' or a.YZLX='8' or a.YZLX='9') and (1=? or a.ZYYZFL=?) and a.YZSHZT=1 #select# order by a.yzxh
+ from HIS_YZ_MXB a where a.JGID=? and a.HZPKEY=? and a.JZPKEY=? and (a.YZLX='0' or a.YZLX='4' or a.YZLX='5' or a.YZLX='3' or a.YZLX='8' or a.YZLX='9') and (1=? or a.ZYYZFL=?) and a.YZSHZT=1 #select# order by a.yzxh
@@ -3181,6 +3181,231 @@ select a.PKEY,a.HZPKEY,a.JZPKEY,a.JZH,a.CFH,a.YZCL,a.YZLB,a.YZLX,a.YZXPKEY,a.YZS
12
+
+
+
+
+ #must_remove#
+ with T_HIS_YFFY_ZYFYMXB as (
+ select t1.* from HIS_YFFY_ZYFYMXB t1 where t1.jzpkey='#jzpkey#' and t1.hzpkey='#hzpkey#' and t1.JGID='#jgid#'
+ ), T_HIS_YFFY_PYB as (
+ select t2.* from HIS_YFFY_PYB t2 where t2.jzpkey='#jzpkey#' and t2.hzpkey='#hzpkey#' and t2.JGID='#jgid#'
+ ), T_HIS_YZ_EXEC as (
+ select t3.* from HIS_YZ_EXEC t3 where t3.jzpkey='#jzpkey#' and t3.hzpkey='#hzpkey#' and t3.JGID='#jgid#'
+ )
+ select
+ a.PKEY,a.HZPKEY,a.JZPKEY,a.JZH,a.CFH,a.YZCL,a.YZLB,a.YZLX,a.YZXPKEY,a.YZSHZT,a.YZXH,a.YZJL,a.YZJLDW,a.YZPC,a.YZTS,a.YZYF,a.YZZCYYF,a.YZZCYYFMS,a.YZTZH,a.YZXZSJ,a.YZXZYS,a.YZLRYS,a.YZJE,a.YZSL,a.YZJX,a.YZBEGINJDSJ,a.YZENDJDSJ,a.YZBEGINZXSJ,a.YZZXSJ,a.YZYTZSJ,a.YZTZSJ,a.YZDJ,a.YZBEGINJDHS,a.YZENDJDHS,a.YZTZYS,a.YZZT,a.YZFYLB,a.YZDAYCS,a.YZJDBZ,a.YZYX,a.YZZDY,a.YZXZSXYS,a.YZTZSXYS,a.ZYCS,a.YZXZRLX,a.YZCXR,a.YZCXBZ,a.YZCXSJ,a.YZCXYY,a.YZFYZH,a.YZSFZYZ,a.YZSCZXCS,a.YZZTPKEY,a.YZDS,a.YZJJBZ,a.CJR,a.CJRQ,a.JGID,a.YZLC,a.YZGLYZ,a.YZSYCS,a.YZZXKS,a.YZKZXTS,a.PS,a.PSBZ,a.YZFJSM,a.YZFB,a.YZSYLS,a.YZLSDW,a.YZSFPY,a.YZCLTM,a.YZCLYY,a.YZBZ,a.YZBBLX,a.YZDW,a.YZXZKS,a.YZZL,a.YZJZJLXS,a.YZJZZHXS,a.YPYZJBJG,a.YPYZJBDW,a.YPYZBZJG,a.YPYZBZDW,a.YPYZDXDW,a.YPYZDXSL,a.YPYZZHXS,a.YZMC,a.YZSFZT,a.YZTFSL,a.YZDJSL,a.YZYL,a.YZZCYFSKEY,a.YZZCYFS,a.YZZCYJX,a.YZZCYDJF,a.ISDJJS,a.DJJSSL,a.ISZCYDJCL,a.IZZCYDJFJF,a.ISGFFJ,a.YZZCYBZ,a.SQDTYPE,a.SQDPKEY,a.SQDJSPKEY,a.SQDTFJE,a.ZYYZFL,a.YZSHYS,a.YZSHRQ,a.ISZPC,a.YZZPC,a.YZPCFFSJ,a.PSJG,a.ZCYGLCZLX,a.YZZFR,a.YZZFSJ,a.YZZFYY,a.PSJGSJ,a.PSJGR,a.ISDPBCL,
+ (select sum(yzsl) from T_HIS_YFFY_PYB pyb left join T_HIS_YZ_EXEC exec on pyb.DFYPKEY=exec.pkey and pyb.JGID=exec.JGID where pyb.yzmx=a.pkey and pyb.JGID='#jgid#' and exec.ZXFLAG=1 and pyb.FYCX=0) dfysl,
+ (select sum(aa.yzsl) from T_HIS_YFFY_ZYFYMXB aa left join T_HIS_YFFY_PYB bb on aa.PYBPKEY=bb.pkey and aa.yzmx=bb.yzmx and bb.FYZT='1' where aa.yzmx=a.pkey and aa.jzpkey='#jzpkey#' and aa.hzpkey='#hzpkey#' and aa.JGID=a.JGID ) yffysl,
+ (select sum(TYSL) from T_HIS_YFFY_ZYFYMXB where yzmx=a.pkey and jzpkey='#jzpkey#' and hzpkey='#hzpkey#' and JGID='#jgid#') yftysl,
+ (select sum(ZXSL) zxsl from T_HIS_YZ_EXEC where yzmx=a.pkey and jzpkey='#jzpkey#' and hzpkey='#hzpkey#' and JGID='#jgid#' and ZXFLAG='1' and SFFLAG='1') zxsl,
+ (select sum(ZXJE) zxje from T_HIS_YZ_EXEC where yzmx=a.pkey and jzpkey='#jzpkey#' and hzpkey='#hzpkey#' and JGID='#jgid#' and ZXFLAG='1' and SFFLAG='1') zxje,
+ (select sum(sfx.SFXZFY) yffyzje from T_HIS_YFFY_ZYFYMXB aa left join T_HIS_YFFY_PYB bb on aa.PYBPKEY=bb.pkey and aa.yzmx=bb.yzmx and bb.FYZT='1' right join HIS_SFZD_SFXMXB sfx on aa.SFXPKEY=sfx.pkey and aa.JGID=sfx.JGID where aa.yzmx=a.pkey and aa.JGID='#jgid#' and aa.hzpkey='#hzpkey#' and aa.jzpkey='#jzpkey#') yffyzje,
+ (select sum(sfx.SFXZFY) from T_HIS_YFFY_ZYFYMXB aa left join HIS_SFZD_SFXMXB sfx on aa.sfxpkey=sfx.pkey and aa.JGID=sfx.JGID and aa.tysl>0 where aa.yzmx=a.pkey and aa.jzpkey='#jzpkey#' and aa.hzpkey='#hzpkey#' and aa.JGID='#jgid#') yztyzje,
+ (select sum(yzsl*exec.zxje) from T_HIS_YFFY_PYB pyb left join T_HIS_YZ_EXEC exec on pyb.DFYPKEY=exec.pkey and pyb.JGID=exec.JGID where pyb.yzmx=a.pkey and pyb.JGID='#jgid#' and exec.ZXFLAG=1 and pyb.FYCX=0 and exec.SFFLAG=1 and pyb.FYZT=0) sfdfyzje,
+ (select sum(ZXJE) yffjzje from T_HIS_YZ_EXEC where YFBDZYZPKEY=a.pkey and jzpkey='#jzpkey#' and hzpkey='#hzpkey#' and JGID='#jgid#' and ZXFLAG='1' and SFFLAG='1') yffjzje,a.HZSZKS,a.LOCKFLAG,a.SFXSYZ,a.GLLX,a.OPAPKEY,a.ANESPKEY,a.ISOPAORDER,a.ISANESORDER,
+ (select sum(yzsl) from T_HIS_YFFY_PYB pyb left join T_HIS_YZ_EXEC exec on pyb.DFYPKEY=exec.pkey and pyb.JGID=exec.JGID where pyb.yzmx=a.pkey and pyb.JGID='#jgid#' and exec.ZXFLAG=1 and pyb.FYCX=0 and exec.SFFLAG=1 and pyb.FYZT=0) sfdfysl,a.SMORDERPKEY,a.LMT_USED_FLAG,a.XZSYFW,a.CHRGITM_LV,a.YBBM,a.YBMC,a.YZGG,a.YZDXRL,a.YPFYSJMS,a.YPPCSJ,a.YPPCJBSJ,a.YPMRPC,a.DMJYZ,a.DMJSFZ,a.DMJDBRSFZ,a.DMJDBRXM,a.DMJDBRDH,a.YZCFLX,a.YZSFKS,a.YZSFYS,a.YZSFTIME,a.YZSFBZ,a.YZYWBZ,a.YZPSYPPC,a.YZPSDS,a.YZPSDSBEGIN,a.YZPSDSMINUTE,a.PSDSMAN,a.PSDSTIME,a.PSZXKS,a.DDD,a.YZTPKEY,a.SFQYSHCF,a.SHCFZT,a.DCZDJL,a.MTZDJL,a.ZDL,a.SZSYTS,a.YZHOURBEGIN,a.YZHOUREND
+ from HIS_YZ_MXB a where a.JGID=? and a.HZPKEY=? and a.JZPKEY=? and (a.YZLX='0' or a.YZLX='4' or a.YZLX='5' or a.YZLX='3' or a.YZLX='8' or a.YZLX='9') and (1=? or a.ZYYZFL=?) and a.YZSHZT=1 #select# order by a.yzxh
+
+
+
+
+
+
+
+ PKEY
+ HZPKEY
+ JZPKEY
+ YZZT
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 12
+ 12
+ 12
+ 12
+ 12
+
+
diff --git a/WEB-INF/src/com/his/zy/doctorworkstation/PatientOrderViewForm.java b/WEB-INF/src/com/his/zy/doctorworkstation/PatientOrderViewForm.java
index ad87798..ada1e8c 100644
--- a/WEB-INF/src/com/his/zy/doctorworkstation/PatientOrderViewForm.java
+++ b/WEB-INF/src/com/his/zy/doctorworkstation/PatientOrderViewForm.java
@@ -3,7 +3,6 @@ package com.his.zy.doctorworkstation;
import java.text.ParseException;
import java.util.HashSet;
import java.util.Set;
-
import com.his.base.yzt.YztManageContainerWindow;
import com.his.mz.gzzmanage.GzzYzMbManageWindow;
import com.his.mz.gzzmanage.mapper.GzzMzYsNormalYzDaoMapper;
@@ -489,6 +488,11 @@ public class PatientOrderViewForm extends WatWebForm {
orderSql = orderSql.replaceAll("#select#", select);
zcyOrderSql = zcyOrderSql.replaceAll("#select#", select);
+
+ orderSql = orderSql.replaceAll("#must_remove#", "");
+ orderSql = orderSql.replaceAll("#jzpkey#", model.getJzpkey());
+ orderSql = orderSql.replaceAll("#hzpkey#", model.getHzpkey());
+ orderSql = orderSql.replaceAll("#jgid#", model.getCompanyId());
dbgrid1.getDataObjectManager().setSelect(orderSql);
zyyzViewZcyOrderDao.setSelect(zcyOrderSql);
diff --git a/WEB-INF/src/com/his/zy/doctorworkstation/PatientOrderViewForm.xml b/WEB-INF/src/com/his/zy/doctorworkstation/PatientOrderViewForm.xml
index 78490bb..032e6d0 100644
--- a/WEB-INF/src/com/his/zy/doctorworkstation/PatientOrderViewForm.xml
+++ b/WEB-INF/src/com/his/zy/doctorworkstation/PatientOrderViewForm.xml
@@ -43,7 +43,7 @@
-
+
序号
长临
diff --git a/WEB-INF/src/com/his/zy/gzyzmanage/FollowOrderViewForm.java b/WEB-INF/src/com/his/zy/gzyzmanage/FollowOrderViewForm.java
index f9a6657..3652f95 100644
--- a/WEB-INF/src/com/his/zy/gzyzmanage/FollowOrderViewForm.java
+++ b/WEB-INF/src/com/his/zy/gzyzmanage/FollowOrderViewForm.java
@@ -2,7 +2,6 @@ package com.his.zy.gzyzmanage;
import java.util.HashSet;
import java.util.Set;
-
import com.his.zy.doctorworkstation.ChanageTzOrderTimeWindow;
import com.his.zy.doctorworkstation.PatientStopOrderWindow;
import com.his.zy.doctorworkstation.PatientZfORCxOrderWindow;
@@ -24,7 +23,6 @@ import com.wat.component.DxRadioGroup;
import com.wat.component.coolcomponent.DxCoolTextField;
import com.wat.component.datagrid.DxDataGrid;
import com.wat.component.datagrid.DxDataGridCheckBoxCell;
-import com.wat.component.datagrid.event.DxDblCellFocusListener;
import com.wat.component.datagrid.event.DxHeadPageButtonActionListener;
import com.wat.component.datagrid.event.DxReloadActionListener;
import com.wat.component.datagrid.event.DxSelectRowListener;
@@ -245,6 +243,11 @@ public class FollowOrderViewForm extends WatWebForm {
}
orderSql = orderSql.replaceAll("#select#", select);
zcyOrderSql = zcyOrderSql.replaceAll("#select#", select);
+
+ orderSql = orderSql.replaceAll("#must_remove#", "");
+ orderSql = orderSql.replaceAll("#jzpkey#", model.getJzpkey());
+ orderSql = orderSql.replaceAll("#hzpkey#", model.getHzpkey());
+ orderSql = orderSql.replaceAll("#jgid#", model.getCompanyId());
dbgrid1.getDataObjectManager().setSelect(orderSql);
zyyzViewZcyOrderDao.setSelect(zcyOrderSql);
diff --git a/WEB-INF/src/com/his/zy/gzyzmanage/FollowOrderViewForm.xml b/WEB-INF/src/com/his/zy/gzyzmanage/FollowOrderViewForm.xml
index 4ab4dfe..0d9243e 100644
--- a/WEB-INF/src/com/his/zy/gzyzmanage/FollowOrderViewForm.xml
+++ b/WEB-INF/src/com/his/zy/gzyzmanage/FollowOrderViewForm.xml
@@ -28,7 +28,7 @@
-
+
序号
长临