kljk
/
klhis
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/release/20241225_1153' into develop/lyx_20241230_crbdy

Browse Source
develop/lyx_20241230_zdqf
lxx 3 weeks ago
parent 7dfeb464e8 2088b57307
commit 8ed245b71f
16 changed files with 360 additions and 15 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 7
      WEB-INF/conf/sysds_his.xml
  2. 4
      WEB-INF/conf/sysds_his_gzz.xml
  3. 3
      WEB-INF/conf/sysds_his_mzsf.xml
  4. 225
      WEB-INF/conf/sysds_his_zyyz.xml
  5. 4
      WEB-INF/conf/sysds_mms.xml
  6. 4
      WEB-INF/src/com/his/mz/cfdp/manage/ZyCfdpWindow.xml
  7. 49
      WEB-INF/src/com/his/mz/gzzmanage/HisMzJbzdForm.java
  8. 33
      WEB-INF/src/com/his/mz/gzzmanage/HisMzJbzdForm.xml
  9. 6
      WEB-INF/src/com/his/zy/doctorworkstation/PatientOrderViewForm.java
  10. 2
      WEB-INF/src/com/his/zy/doctorworkstation/PatientOrderViewForm.xml
  11. 7
      WEB-INF/src/com/his/zy/gzyzmanage/FollowOrderViewForm.java
  12. 2
      WEB-INF/src/com/his/zy/gzyzmanage/FollowOrderViewForm.xml
  13. 2
      WEB-INF/src/com/his/zy/zyyfcxmanage/ZyTydFindForm.xml
  14. 2
      WEB-INF/src/com/openIntegratedQuery/normalQuery/mzsr/MzrzCountForm.java
  15. 2
      WEB-INF/src/com/openIntegratedQuery/normalQuery/mzsr/MzrzCountForm.xml
  16. 19
      release/20241225_1153.text

7
WEB-INF/conf/sysds_his.xml
Unescape View File

@ -4970,7 +4970,7 @@
bl.XBS , bl.XBS ,
bl.CLCS, bl.CLCS,
sum(decode(l.XH, null, 0, 1)) jcgs, sum(decode(l.XH, null, 0, 1)) jcgs,
nvl(SUBSTR(a.JZNL, 1, INSTR(a.JZNL, '岁') - 1),a.JZNL) nl nvl(SUBSTR(a.JZNL, 1, INSTR(a.JZNL, '岁') - 1),a.JZNL) nl,nvl(a.IFYG,0) IFYG,nvl(a.IFMD,0) IFMD ,nvl(a.IFAZ,0) IFAZ
FROM FROM
HIS_JZ_BASEINFO a HIS_JZ_BASEINFO a
LEFT JOIN HIS_HZINFO b ON LEFT JOIN HIS_HZINFO b ON
@ -5015,7 +5015,7 @@
bl.XT , bl.XT ,
bl.ZS , bl.ZS ,
bl.XBS , bl.XBS ,
bl.CLCS bl.CLCS,nvl(a.IFYG,0),nvl(a.IFMD,0) ,nvl(a.IFAZ,0)
]]></sql> ]]></sql>
//JJRQ,JJYS,XM,XB,JZNL,ZJHM,ZY,PHONE,XZDZ,MZNO,JYJG,JBBM,JBMC,JZZT,JZZB,FPRQ,SSY,SZY,XT,ZS,XBS,CLCS //JJRQ,JJYS,XM,XB,JZNL,ZJHM,ZY,PHONE,XZDZ,MZNO,JYJG,JBBM,JBMC,JZZT,JZZB,FPRQ,SSY,SZY,XT,ZS,XBS,CLCS
<fields> <fields>
@ -5044,6 +5044,9 @@
<f name="CLCS" type="12" /> <f name="CLCS" type="12" />
<f name="jcgs" type="12" /> <f name="jcgs" type="12" />
<f name="nl" type="12" /> <f name="nl" type="12" />
<f name="IFYG" type="12" table="HIS_JZ_BASEINFO" />
<f name="IFMD" type="12" table="HIS_JZ_BASEINFO" />
<f name="IFAZ" type="12" table="HIS_JZ_BASEINFO" />
</fields> </fields>
<parameter> <parameter>
<p>12</p> <p>12</p>

4
WEB-INF/conf/sysds_his_gzz.xml
Unescape View File

@ -2711,6 +2711,7 @@ SELECT JGID,BM,MC,YZDL,YZZL,ISDDYZ,ISXSYZ,ISMZSY,ISJZSY,ISZYSY,DCZDJL,MTZDJL,ZDL
<sql> <sql>
select select
a.PKEY,a.HZPKEY,a.GHPKEY,a.JZLX,a.JZZT,a.JZZB,a.HZFB,a.JZJS,a.ISYB,a.ISZZ,a.YYLX,a.ISLG,a.ISGSSJJ,a.HZYBLX,a.JJKS,a.JJRQ,a.JJYS,a.FBRQ,a.ZYNUM,a.WARD,a.ROOM,a.BED,a.KZRQ,a.JSRQ,a.THRY,a.HDYY,a.HDRQ,a.MZNUM,a.CJR,a.CJRQ,a.JGID,a.JZNO,a.MZNO,a.ZYNO,a.JZKH,a.CARDPKEY,a.JZNL,a.ISJZ,a.ZYLX,a.ZYHZLY,a.ZYYYRQ,a.CYRQ,a.CYYS,a.ZYNOOLD,a.SCZYRQ,a.ISGL,a.ISSJ,b.HZLX,a.GRLX,a.QTGRLX,a.CWFJLX,a.YSLX,a.MQJZINFO,a.ZKRQ,a.RYTJ,a.RYBQ,a.RYJZINFO,a.RYYS,a.RYQK,a.JZZL,a.JYYJ,a.ZYBZ,a.RYZD,a.RYZDMS,a.ZYBAH,a.RYNL,a.RYXSENLD,a.RYXSENLH,a.RYXSENLS,a.ZYZH,a.JZKLX,a.CRFS,a.OTHERCRFS,a.MAINBLYS,a.MAINBLXS,a.MOTHERJZPKEY,a.ZKDATE,a.RQDATE,b.XM,b.XB,b.CSRQ,b.SFZH,b.ZJLX,b.ZJHM,b.TEL,b.EMAIL,b.PIC,b.SIGNPIC,b.ZT,b.MZ,b.NL,b.HYZK,b.YBKH,b.ZY,b.GZDW,b.PHONE,b.BGDH,b.ZGGH,b.HZMJ,b.HZJB,b.LXRGX,b.LXR,b.LXRDH,b.LXRZJLX,b.LXRZJHM,b.GJ,b.XZDZ,b.XZDZJGH,b.JGDZ,b.JGDZJGH,b.CSDZ,b.CSDZJGH,b.YBLX,a.CYBED,a.JZZDNAMELIST,a.JZZDBMLIST a.PKEY,a.HZPKEY,a.GHPKEY,a.JZLX,a.JZZT,a.JZZB,a.HZFB,a.JZJS,a.ISYB,a.ISZZ,a.YYLX,a.ISLG,a.ISGSSJJ,a.HZYBLX,a.JJKS,a.JJRQ,a.JJYS,a.FBRQ,a.ZYNUM,a.WARD,a.ROOM,a.BED,a.KZRQ,a.JSRQ,a.THRY,a.HDYY,a.HDRQ,a.MZNUM,a.CJR,a.CJRQ,a.JGID,a.JZNO,a.MZNO,a.ZYNO,a.JZKH,a.CARDPKEY,a.JZNL,a.ISJZ,a.ZYLX,a.ZYHZLY,a.ZYYYRQ,a.CYRQ,a.CYYS,a.ZYNOOLD,a.SCZYRQ,a.ISGL,a.ISSJ,b.HZLX,a.GRLX,a.QTGRLX,a.CWFJLX,a.YSLX,a.MQJZINFO,a.ZKRQ,a.RYTJ,a.RYBQ,a.RYJZINFO,a.RYYS,a.RYQK,a.JZZL,a.JYYJ,a.ZYBZ,a.RYZD,a.RYZDMS,a.ZYBAH,a.RYNL,a.RYXSENLD,a.RYXSENLH,a.RYXSENLS,a.ZYZH,a.JZKLX,a.CRFS,a.OTHERCRFS,a.MAINBLYS,a.MAINBLXS,a.MOTHERJZPKEY,a.ZKDATE,a.RQDATE,b.XM,b.XB,b.CSRQ,b.SFZH,b.ZJLX,b.ZJHM,b.TEL,b.EMAIL,b.PIC,b.SIGNPIC,b.ZT,b.MZ,b.NL,b.HYZK,b.YBKH,b.ZY,b.GZDW,b.PHONE,b.BGDH,b.ZGGH,b.HZMJ,b.HZJB,b.LXRGX,b.LXR,b.LXRDH,b.LXRZJLX,b.LXRZJHM,b.GJ,b.XZDZ,b.XZDZJGH,b.JGDZ,b.JGDZJGH,b.CSDZ,b.CSDZJGH,b.YBLX,a.CYBED,a.JZZDNAMELIST,a.JZZDBMLIST
,IFYG,IFMD,IFAZ
from HIS_JZ_BASEINFO a left join HIS_HZINFO b on a.hzpkey=b.pkey and from HIS_JZ_BASEINFO a left join HIS_HZINFO b on a.hzpkey=b.pkey and
a.JGID=b.JGID where a.JGID=? and a.pkey=? and a.hzpkey=? a.JGID=b.JGID where a.JGID=? and a.pkey=? and a.hzpkey=?
@ -2841,6 +2842,9 @@ SELECT JGID,BM,MC,YZDL,YZZL,ISDDYZ,ISXSYZ,ISMZSY,ISJZSY,ISZYSY,DCZDJL,MTZDJL,ZDL
<f name="CYBED" type="12" table="HIS_JZ_BASEINFO" /> <f name="CYBED" type="12" table="HIS_JZ_BASEINFO" />
<f name="JZZDNAMELIST" type="12" table="HIS_JZ_BASEINFO" /> <f name="JZZDNAMELIST" type="12" table="HIS_JZ_BASEINFO" />
<f name="JZZDBMLIST" type="12" table="HIS_JZ_BASEINFO" /> <f name="JZZDBMLIST" type="12" table="HIS_JZ_BASEINFO" />
<f name="IFYG" type="12" table="HIS_JZ_BASEINFO" />
<f name="IFMD" type="12" table="HIS_JZ_BASEINFO" />
<f name="IFAZ" type="12" table="HIS_JZ_BASEINFO" />
</fields> </fields>
<parameter> <parameter>
<p>12</p> <p>12</p>

3
WEB-INF/conf/sysds_his_mzsf.xml
Unescape View File

@ -2726,7 +2726,8 @@ where JGID=? and jzlx=? and (cxzt='1' and OLD_SETL_ID is not null) order by zd
WHERE a.jzlx='Z' and b.YZSHZT=1 and a.JGID=? WHERE a.jzlx='Z' and b.YZSHZT=1 and a.JGID=?
and (YZLX='0' or YZLX='1') and (YZLX='0' or YZLX='1')
and (b.yzlb='01' or b.yzlb='02' or b.yzlb='03') and (b.yzlb='01' or b.yzlb='02' or b.yzlb='03')
and a.JJRQ between ? and ? and a.CYRQ between ? and ?
and a.JZZT='C'
#select# #select#
order by a.isjz desc,a.ZYNO,a.JJRQ desc) where nvl(yzjzpkey,0) != 0 order by a.isjz desc,a.ZYNO,a.JJRQ desc) where nvl(yzjzpkey,0) != 0
]]></sql> ]]></sql>

225
WEB-INF/conf/sysds_his_zyyz.xml
Unescape View File

@ -3183,6 +3183,231 @@ select a.PKEY,a.HZPKEY,a.JZPKEY,a.JZH,a.CFH,a.YZCL,a.YZLB,a.YZLX,a.YZXPKEY,a.YZS
</dao> </dao>
<dao id="zyyzViewOrderDao_new" log="true" type="1" memo="住院已审核所有医嘱dao,这里只允许修改状态，不允许删除和新增">
<sql>
#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
</sql>
<tables>
<table name="HIS_YZ_MXB" insert="false" update="true" delete="false">
<primary>PKEY</primary>
<primary>HZPKEY</primary>
<primary>JZPKEY</primary>
<primary>YZZT</primary>
</table>
</tables>
<fields>
<f name="PKEY" type="12" table="HIS_YZ_MXB" />
<f name="HZPKEY" type="12" table="HIS_YZ_MXB" />
<f name="JZPKEY" type="12" table="HIS_YZ_MXB" />
<f name="JZH" type="12" table="HIS_YZ_MXB" />
<f name="CFH" type="12" table="HIS_YZ_MXB" />
<f name="YZCL" type="12" table="HIS_YZ_MXB" />
<f name="YZLB" type="12" table="HIS_YZ_MXB" />
<f name="YZLX" type="12" table="HIS_YZ_MXB" />
<f name="YZXPKEY" type="12" table="HIS_YZ_MXB" />
<f name="YZSHZT" type="12" table="HIS_YZ_MXB" />
<f name="YZXH" type="8" table="HIS_YZ_MXB" />
<f name="YZJL" type="12" table="HIS_YZ_MXB" />
<f name="YZJLDW" type="12" table="HIS_YZ_MXB" />
<f name="YZPC" type="12" table="HIS_YZ_MXB" />
<f name="YZTS" type="12" table="HIS_YZ_MXB" />
<f name="YZYF" type="12" table="HIS_YZ_MXB" />
<f name="YZZCYYF" type="12" table="HIS_YZ_MXB" />
<f name="YZZCYYFMS" type="12" table="HIS_YZ_MXB" />
<f name="YZTZH" type="12" table="HIS_YZ_MXB" />
<f name="YZXZSJ" type="93" table="HIS_YZ_MXB" />
<f name="YZXZYS" type="12" table="HIS_YZ_MXB" />
<f name="YZLRYS" type="12" table="HIS_YZ_MXB" />
<f name="YZJE" type="12" table="HIS_YZ_MXB" />
<f name="YZSL" type="12" table="HIS_YZ_MXB" />
<f name="YZJX" type="12" table="HIS_YZ_MXB" />
<f name="YZBEGINJDSJ" type="93" table="HIS_YZ_MXB" />
<f name="YZENDJDSJ" type="93" table="HIS_YZ_MXB" />
<f name="YZBEGINZXSJ" type="93" table="HIS_YZ_MXB" />
<f name="YZZXSJ" type="93" table="HIS_YZ_MXB" />
<f name="YZYTZSJ" type="93" table="HIS_YZ_MXB" />
<f name="YZTZSJ" type="93" table="HIS_YZ_MXB" />
<f name="YZDJ" type="12" table="HIS_YZ_MXB" />
<f name="YZBEGINJDHS" type="12" table="HIS_YZ_MXB" />
<f name="YZENDJDHS" type="12" table="HIS_YZ_MXB" />
<f name="YZTZYS" type="12" table="HIS_YZ_MXB" />
<f name="YZZT" type="12" table="HIS_YZ_MXB" />
<f name="YZFYLB" type="12" table="HIS_YZ_MXB" />
<f name="YZDAYCS" type="12" table="HIS_YZ_MXB" />
<f name="YZJDBZ" type="12" table="HIS_YZ_MXB" />
<f name="YZYX" type="12" table="HIS_YZ_MXB" />
<f name="YZZDY" type="12" table="HIS_YZ_MXB" />
<f name="YZXZSXYS" type="12" table="HIS_YZ_MXB" />
<f name="YZTZSXYS" type="12" table="HIS_YZ_MXB" />
<f name="ZYCS" type="12" table="HIS_YZ_MXB" />
<f name="YZXZRLX" type="12" table="HIS_YZ_MXB" />
<f name="YZCXR" type="12" table="HIS_YZ_MXB" />
<f name="YZCXBZ" type="12" table="HIS_YZ_MXB" />
<f name="YZCXSJ" type="93" table="HIS_YZ_MXB" />
<f name="YZCXYY" type="12" table="HIS_YZ_MXB" />
<f name="YZFYZH" type="12" table="HIS_YZ_MXB" />
<f name="YZSFZYZ" type="12" table="HIS_YZ_MXB" />
<f name="YZSCZXCS" type="12" table="HIS_YZ_MXB" />
<f name="YZZTPKEY" type="12" table="HIS_YZ_MXB" />
<f name="YZDS" type="12" table="HIS_YZ_MXB" />
<f name="YZJJBZ" type="12" table="HIS_YZ_MXB" />
<f name="CJR" type="12" table="HIS_YZ_MXB" />
<f name="CJRQ" type="93" table="HIS_YZ_MXB" />
<f name="JGID" type="12" table="HIS_YZ_MXB" />
<f name="YZLC" type="12" table="HIS_YZ_MXB" />
<f name="YZGLYZ" type="12" table="HIS_YZ_MXB" />
<f name="YZSYCS" type="12" table="HIS_YZ_MXB" />
<f name="YZZXKS" type="12" table="HIS_YZ_MXB" />
<f name="YZKZXTS" type="12" table="HIS_YZ_MXB" />
<f name="PS" type="12" table="HIS_YZ_MXB" />
<f name="PSBZ" type="12" table="HIS_YZ_MXB" />
<f name="YZFJSM" type="12" table="HIS_YZ_MXB" />
<f name="YZFB" type="12" table="HIS_YZ_MXB" />
<f name="YZSYLS" type="12" table="HIS_YZ_MXB" />
<f name="YZLSDW" type="12" table="HIS_YZ_MXB" />
<f name="YZSFPY" type="12" table="HIS_YZ_MXB" />
<f name="YZCLTM" type="12" table="HIS_YZ_MXB" />
<f name="YZCLYY" type="12" table="HIS_YZ_MXB" />
<f name="YZBZ" type="12" table="HIS_YZ_MXB" />
<f name="YZBBLX" type="12" table="HIS_YZ_MXB" />
<f name="YZDW" type="12" table="HIS_YZ_MXB" />
<f name="YZXZKS" type="12" table="HIS_YZ_MXB" />
<f name="YZZL" type="12" table="HIS_YZ_MXB" />
<f name="YZJZJLXS" type="12" table="HIS_YZ_MXB" />
<f name="YZJZZHXS" type="12" table="HIS_YZ_MXB" />
<f name="YPYZJBJG" type="12" table="HIS_YZ_MXB" />
<f name="YPYZJBDW" type="12" table="HIS_YZ_MXB" />
<f name="YPYZBZJG" type="12" table="HIS_YZ_MXB" />
<f name="YPYZBZDW" type="12" table="HIS_YZ_MXB" />
<f name="YPYZDXDW" type="12" table="HIS_YZ_MXB" />
<f name="YPYZDXSL" type="12" table="HIS_YZ_MXB" />
<f name="YPYZZHXS" type="12" table="HIS_YZ_MXB" />
<f name="YZMC" type="12" table="HIS_YZ_MXB" />
<f name="YZSFZT" type="12" table="HIS_YZ_MXB" />
<f name="YZTFSL" type="12" table="HIS_YZ_MXB" />
<f name="YZDJSL" type="12" table="HIS_YZ_MXB" />
<f name="YZYL" type="12" table="HIS_YZ_MXB" />
<f name="YZZCYFSKEY" type="12" table="HIS_YZ_MXB" />
<f name="YZZCYFS" type="12" table="HIS_YZ_MXB" />
<f name="YZZCYJX" type="12" table="HIS_YZ_MXB" />
<f name="YZZCYDJF" type="12" table="HIS_YZ_MXB" />
<f name="ISDJJS" type="12" table="HIS_YZ_MXB" />
<f name="DJJSSL" type="12" table="HIS_YZ_MXB" />
<f name="ISZCYDJCL" type="12" table="HIS_YZ_MXB" />
<f name="IZZCYDJFJF" type="12" table="HIS_YZ_MXB" />
<f name="ISGFFJ" type="12" table="HIS_YZ_MXB" />
<f name="YZZCYBZ" type="12" table="HIS_YZ_MXB" />
<f name="SQDTYPE" type="12" table="HIS_YZ_MXB" />
<f name="SQDPKEY" type="12" table="HIS_YZ_MXB" />
<f name="SQDJSPKEY" type="12" table="HIS_YZ_MXB" />
<f name="SQDTFJE" type="12" table="HIS_YZ_MXB" />
<f name="ZYYZFL" type="12" table="HIS_YZ_MXB" />
<f name="YZSHYS" type="12" table="HIS_YZ_MXB" />
<f name="YZSHRQ" type="93" table="HIS_YZ_MXB" />
<f name="ISZPC" type="12" table="HIS_YZ_MXB" />
<f name="YZZPC" type="12" table="HIS_YZ_MXB" />
<f name="YZPCFFSJ" type="12" table="HIS_YZ_MXB" />
<f name="PSJG" type="12" table="HIS_YZ_MXB" />
<f name="ZCYGLCZLX" type="12" table="HIS_YZ_MXB" />
<f name="YZZFR" type="12" table="HIS_YZ_MXB" />
<f name="YZZFSJ" type="93" table="HIS_YZ_MXB" />
<f name="YZZFYY" type="12" table="HIS_YZ_MXB" />
<f name="PSJGSJ" type="93" table="HIS_YZ_MXB" />
<f name="PSJGR" type="12" table="HIS_YZ_MXB" />
<f name="ISDPBCL" type="12" table="HIS_YZ_MXB" />
<f name="dfysl" type="8"/>
<f name="yffysl" type="8"/>
<f name="yftysl" type="8"/>
<f name="zxsl" type="8"/>
<f name="zxje" type="8"/>
<f name="yffyzje" type="8"/>
<f name="yztyzje" type="8"/>
<f name="sfdfyzje" type="8"/>
<f name="yffjzje" type="8"/>
<f name="HZSZKS" type="12" table="HIS_YZ_MXB" />
<f name="LOCKFLAG" type="12" table="HIS_YZ_MXB" />
<f name="SFXSYZ" type="12" table="HIS_YZ_MXB" />
<f name="GLLX" type="12" table="HIS_YZ_MXB" />
<f name="OPAPKEY" type="12" table="HIS_YZ_MXB" />
<f name="ANESPKEY" type="12" table="HIS_YZ_MXB" />
<f name="ISOPAORDER" type="12" table="HIS_YZ_MXB" />
<f name="ISANESORDER" type="12" table="HIS_YZ_MXB" />
<f name="sfdfysl" type="8"/>
<f name="SMORDERPKEY" type="12" table="HIS_YZ_MXB" />
<f name="LMT_USED_FLAG" type="12" table="HIS_YZ_MXB" />
<f name="XZSYFW" type="12" table="HIS_YZ_MXB" />
<f name="CHRGITM_LV" type="12" table="HIS_YZ_MXB" />
<f name="YBBM" type="12" table="HIS_YZ_MXB" />
<f name="YBMC" type="12" table="HIS_YZ_MXB" />
<f name="YZGG" type="12" table="HIS_YZ_MXB" />
<f name="YZDXRL" type="8" table="HIS_YZ_MXB" />
<f name="YPFYSJMS" type="12" table="HIS_YZ_MXB" />
<f name="YPPCSJ" type="8" table="HIS_YZ_MXB" />
<f name="YPPCJBSJ" type="8" table="HIS_YZ_MXB" />
<f name="YPMRPC" type="12" table="HIS_YZ_MXB" />
<f name="DMJYZ" type="12" table="HIS_YZ_MXB" />
<f name="DMJSFZ" type="12" table="HIS_YZ_MXB" />
<f name="DMJDBRSFZ" type="12" table="HIS_YZ_MXB" />
<f name="DMJDBRXM" type="12" table="HIS_YZ_MXB" />
<f name="DMJDBRDH" type="12" table="HIS_YZ_MXB" />
<f name="YZCFLX" type="12" table="HIS_YZ_MXB" />
<f name="YZSFKS" type="12" table="HIS_YZ_MXB" />
<f name="YZSFYS" type="12" table="HIS_YZ_MXB" />
<f name="YZSFTIME" type="93" table="HIS_YZ_MXB" />
<f name="YZSFBZ" type="12" table="HIS_YZ_MXB" />
<f name="YZYWBZ" type="12" table="HIS_YZ_MXB" />
<f name="YZPSYPPC" type="12" table="HIS_YZ_MXB" />
<f name="YZPSDS" type="12" table="HIS_YZ_MXB" />
<f name="YZPSDSBEGIN" type="93" table="HIS_YZ_MXB" />
<f name="YZPSDSMINUTE" type="-5" table="HIS_YZ_MXB" />
<f name="PSDSMAN" type="12" table="HIS_YZ_MXB" />
<f name="PSDSTIME" type="93" table="HIS_YZ_MXB" />
<f name="PSZXKS" type="12" table="HIS_YZ_MXB" />
<f name="DDD" type="12" table="HIS_YZ_MXB" />
<f name="YZTPKEY" type="12" table="HIS_YZ_MXB" />
<f name="SFQYSHCF" type="12" table="HIS_YZ_MXB" />
<f name="SHCFZT" type="12" table="HIS_YZ_MXB" />
<f name="DCZDJL" type="12" table="HIS_YZ_MXB" />
<f name="MTZDJL" type="12" table="HIS_YZ_MXB" />
<f name="ZDL" type="12" table="HIS_YZ_MXB" />
<f name="SZSYTS" type="12" table="HIS_YZ_MXB" />
<f name="YZHOURBEGIN" type="93" table="HIS_YZ_MXB " />
<f name="YZHOUREND" type="93" table="HIS_YZ_MXB " />
</fields>
<parameter>
<p>12</p>
<p>12</p>
<p>12</p>
<p>12</p>
<p>12</p>
</parameter>
</dao>
<dao id="getMaxYzxhForOrdDao" log="true" type="1"> <dao id="getMaxYzxhForOrdDao" log="true" type="1">
<sql>select max(YZXH) maxyzxh from HIS_YZ_MXB where JGID=? and HZPKEY=? and JZPKEY=?</sql> <sql>select max(YZXH) maxyzxh from HIS_YZ_MXB where JGID=? and HZPKEY=? and JZPKEY=?</sql>
<fields> <fields>

4
WEB-INF/conf/sysds_mms.xml
Unescape View File

@ -1490,7 +1490,7 @@ select a.PKEY,a.PDPKEY,a.XH,a.SFX_BM,a.DJH,a.KSKC_PC_PKEY,a.DW,a.ZPS,a.RKDWZPS,a
<f name="KSKC_PC_PKEY" type="12" table="HIS_MMS_KC_PD_MX" /> <f name="KSKC_PC_PKEY" type="12" table="HIS_MMS_KC_PD_MX" />
<f name="DW" type="12" table="HIS_MMS_KC_PD_MX" /> <f name="DW" type="12" table="HIS_MMS_KC_PD_MX" />
<f name="ZPS" type="-5" table="HIS_MMS_KC_PD_MX" /> <f name="ZPS" type="-5" table="HIS_MMS_KC_PD_MX" />
<f name="RKDWZPS" type="-5" table="HIS_MMS_KC_PD_MX" /> <f name="RKDWZPS" type="8" table="HIS_MMS_KC_PD_MX" />
<f name="ZPSJ" type="93" table="HIS_MMS_KC_PD_MX" /> <f name="ZPSJ" type="93" table="HIS_MMS_KC_PD_MX" />
<f name="SPS" type="-5" table="HIS_MMS_KC_PD_MX" /> <f name="SPS" type="-5" table="HIS_MMS_KC_PD_MX" />
<f name="SPSJ" type="93" table="HIS_MMS_KC_PD_MX" /> <f name="SPSJ" type="93" table="HIS_MMS_KC_PD_MX" />
@ -1660,7 +1660,7 @@ select b.PKEY,b.PH,b.YXQ,b.SL,b.KYSL,b.DJSL,c.BM,c.MC,c.JBDW,c.ZHXS,c.RKDW,c.JG,
<f name="KSKC_PC_PKEY" type="12" table="HIS_MMS_KC_PD_MX" /> <f name="KSKC_PC_PKEY" type="12" table="HIS_MMS_KC_PD_MX" />
<f name="DW" type="12" table="HIS_MMS_KC_PD_MX" /> <f name="DW" type="12" table="HIS_MMS_KC_PD_MX" />
<f name="ZPS" type="-5" table="HIS_MMS_KC_PD_MX" /> <f name="ZPS" type="-5" table="HIS_MMS_KC_PD_MX" />
<f name="RKDWZPS" type="-5" table="HIS_MMS_KC_PD_MX" /> <f name="RKDWZPS" type="8" table="HIS_MMS_KC_PD_MX" />
<f name="ZPSJ" type="93" table="HIS_MMS_KC_PD_MX" /> <f name="ZPSJ" type="93" table="HIS_MMS_KC_PD_MX" />
<f name="SPS" type="-5" table="HIS_MMS_KC_PD_MX" /> <f name="SPS" type="-5" table="HIS_MMS_KC_PD_MX" />
<f name="SPSJ" type="93" table="HIS_MMS_KC_PD_MX" /> <f name="SPSJ" type="93" table="HIS_MMS_KC_PD_MX" />

4
WEB-INF/src/com/his/mz/cfdp/manage/ZyCfdpWindow.xml
Unescape View File

@ -192,6 +192,8 @@
<DxDataGrid ds="zysfHzYzInfoCFDPDao" id="dbgrid2" showfoot="true" size="100,100" unit="%,%"> <DxDataGrid ds="zysfHzYzInfoCFDPDao" id="dbgrid2" showfoot="true" size="100,100" unit="%,%">
<column calc="true" fieldname="no" cellcolor="true" type="SERIALNUMBER_CELL" align="center" width="30">序号</column> <column calc="true" fieldname="no" cellcolor="true" type="SERIALNUMBER_CELL" align="center" width="30">序号</column>
<column sort="false" fieldname="CFH" cellcolor="true" type="LABEL_CELL" align="center" width="125">处方</column> <column sort="false" fieldname="CFH" cellcolor="true" type="LABEL_CELL" align="center" width="125">处方</column>
<column fieldname="YZCL" cellcolor="true" align="center" width="40" type="DICTIONARYLABEL_CELL" mapjson="{1:长,2:临,3:出院带药}" >长临</column>
<column fieldname="YZTZH" cellcolor="true" align="center" width="100">医嘱同组号</column>
<column fieldname="yzxpkey" cellcolor="true" align="center" width="100">医嘱编码</column> <column fieldname="yzxpkey" cellcolor="true" align="center" width="100">医嘱编码</column>
<column calc="true" fieldname="yzxshow" cellcolor="true" type="HTMLDISPLAY_CELL" width="550">医嘱</column> <column calc="true" fieldname="yzxshow" cellcolor="true" type="HTMLDISPLAY_CELL" width="550">医嘱</column>
<column sort="false" fieldname="YZDJ" cellcolor="true" type="LABEL_CELL" align="right" width="60">单价</column> <column sort="false" fieldname="YZDJ" cellcolor="true" type="LABEL_CELL" align="right" width="60">单价</column>
@ -199,9 +201,11 @@
<column sort="false" fieldname="YZDW" cellcolor="true" type="DICTIONARYLABEL_CELL" cellenabled="true" beginpop="false" popbutton="true" onlyoneautoset="false" inputautoinvalue="false" chinese="true" typewriting="true" showdetail="false" instantsearch="true" names="编码,名称" values="BH,MC" lds="MC:BH@dwyppopdao" dic="MC:BH@dwdicdao" align="center" width="65">数量单位</column> <column sort="false" fieldname="YZDW" cellcolor="true" type="DICTIONARYLABEL_CELL" cellenabled="true" beginpop="false" popbutton="true" onlyoneautoset="false" inputautoinvalue="false" chinese="true" typewriting="true" showdetail="false" instantsearch="true" names="编码,名称" values="BH,MC" lds="MC:BH@dwyppopdao" dic="MC:BH@dwdicdao" align="center" width="65">数量单位</column>
<column sort="false" fieldname="YZJE" cellcolor="true" align="right" footexp1="$sum(YZJE)" width="80">金额</column> <column sort="false" fieldname="YZJE" cellcolor="true" align="right" footexp1="$sum(YZJE)" width="80">金额</column>
<column fieldname="YZBZ" cellcolor="true" width="100">医嘱备注</column> <column fieldname="YZBZ" cellcolor="true" width="100">医嘱备注</column>
<column fieldname="PSJG" cellcolor="true" align="center" width="100" type="DICTIONARYLABEL_CELL" dic="MC:BH@psjgdic">皮试结果</column>
<column fieldname="ISGJJBYW" cellcolor="true" align="center" width="40" type="DICTIONARYLABEL_CELL" mapjson="{1:是,0:否}" >基药</column> <column fieldname="ISGJJBYW" cellcolor="true" align="center" width="40" type="DICTIONARYLABEL_CELL" mapjson="{1:是,0:否}" >基药</column>
<column fieldname="ISKJY" cellcolor="true" align="center" width="40" type="DICTIONARYLABEL_CELL" mapjson="{1:是,0:否}" >抗生素</column> <column fieldname="ISKJY" cellcolor="true" align="center" width="40" type="DICTIONARYLABEL_CELL" mapjson="{1:是,0:否}" >抗生素</column>
<column fieldname="YZXZSJ" cellcolor="true" align="center" width="100" type="DATETIMESHOW_CELL" datetimetype="datetime" >开嘱时间</column> <column fieldname="YZXZSJ" cellcolor="true" align="center" width="100" type="DATETIMESHOW_CELL" datetimetype="datetime" >开嘱时间</column>
<column fieldname="YZTZSJ" cellcolor="true" align="center" width="100" type="DATETIMESHOW_CELL" datetimetype="datetime" >停嘱时间</column>
<column fieldname="YZXZKS" cellcolor="true" align="center" width="100" type="DICTIONARYLABEL_CELL" dic="DPTNAME:DPTID@ksdic">开单科室</column> <column fieldname="YZXZKS" cellcolor="true" align="center" width="100" type="DICTIONARYLABEL_CELL" dic="DPTNAME:DPTID@ksdic">开单科室</column>
<column fieldname="YZXZYS" cellcolor="true" align="center" width="100" type="DICTIONARYLABEL_CELL" dic="NAME:USERACCOUNT@jgrydicdao">开单医生</column> <column fieldname="YZXZYS" cellcolor="true" align="center" width="100" type="DICTIONARYLABEL_CELL" dic="NAME:USERACCOUNT@jgrydicdao">开单医生</column>
</DxDataGrid> </DxDataGrid>

49
WEB-INF/src/com/his/mz/gzzmanage/HisMzJbzdForm.java
Unescape View File

@ -53,6 +53,9 @@ public class HisMzJbzdForm extends WatWebForm implements IJbMbContainer{
private DxTitlePanel titlePanel4; private DxTitlePanel titlePanel4;
private DxTitlePanel titlePanel5; private DxTitlePanel titlePanel5;
private DxDataRadioGroup dbradio1; private DxDataRadioGroup dbradio1;
private DxDataRadioGroup dbradio2;
private DxDataRadioGroup dbradio3;
private DxDataRadioGroup dbradio4;
private DxDataGrid dbgrid2; private DxDataGrid dbgrid2;
private DxPopGridText dbedit1; private DxPopGridText dbedit1;
private DxCoolDataTextField dbedit2; private DxCoolDataTextField dbedit2;
@ -742,6 +745,33 @@ public class HisMzJbzdForm extends WatWebForm implements IJbMbContainer{
} }
} }
private void dbradio2Action() {
DxNormalDataManager mzjzBaseInfoDao = DaoCreator.getNormalDao(getWindow(),"mzjzBaseInfoDao");
if(!mzjzBaseInfoDao.commit()) {
setLabelShow("提示:记录保存失败");
}else {
setLabelShow("提示:记录保存成功");
}
}
private void dbradio3Action() {
DxNormalDataManager mzjzBaseInfoDao = DaoCreator.getNormalDao(getWindow(),"mzjzBaseInfoDao");
if(!mzjzBaseInfoDao.commit()) {
setLabelShow("提示:记录保存失败");
}else {
setLabelShow("提示:记录保存成功");
}
}
private void dbradio4Action() {
DxNormalDataManager mzjzBaseInfoDao = DaoCreator.getNormalDao(getWindow(),"mzjzBaseInfoDao");
if(!mzjzBaseInfoDao.commit()) {
setLabelShow("提示:记录保存失败");
}else {
setLabelShow("提示:记录保存成功");
}
}
private void dbcheckbox1Action() { private void dbcheckbox1Action() {
if(dbcheckbox1.isSelected()) { if(dbcheckbox1.isSelected()) {
@ -874,6 +904,25 @@ public class HisMzJbzdForm extends WatWebForm implements IJbMbContainer{
} }
}); });
dbradio2.addActionListener(new ActionListener(){
public void actionPerformed(ActionEvent actionevent) {
dbradio2Action();
}
});
dbradio3.addActionListener(new ActionListener(){
public void actionPerformed(ActionEvent actionevent) {
dbradio3Action();
}
});
dbradio4.addActionListener(new ActionListener(){
public void actionPerformed(ActionEvent actionevent) {
dbradio4Action();
}
});
dbcheckbox1.addActionListener(new ActionListener(){ dbcheckbox1.addActionListener(new ActionListener(){
public void actionPerformed(ActionEvent actionevent) { public void actionPerformed(ActionEvent actionevent) {
dbcheckbox1Action(); dbcheckbox1Action();

33
WEB-INF/src/com/his/mz/gzzmanage/HisMzJbzdForm.xml
Unescape View File

@ -44,6 +44,39 @@
</DxPanelBar> </DxPanelBar>
</col> </col>
</row> </row>
<row height="38" location="0,0" size="0,0" unit="px">
<col>
<DxPanelBar id="panelBaryg" split="false" size="100,38" tabindex="0" unit="%">
<item align="left" autoExtend="false">
<DxLabel id="label3" size="48,13" title="乙肝" />
<DxDataRadioGroup id="dbradio2" tag="10" ds="IFYG@" columns="2" items="阴性,阳性" values="0,1" showtitle="false" size="140,28" />
<DxLabel id="label4" size="15,13" title="" color="255,0,0" />
</item>
</DxPanelBar>
</col>
</row>
<row height="38" location="0,0" size="0,0" unit="px">
<col>
<DxPanelBar id="panelBarmd" split="false" size="100,38" tabindex="0" unit="%">
<item align="left" autoExtend="false">
<DxLabel id="label3" size="48,13" title="梅毒" />
<DxDataRadioGroup id="dbradio3" tag="10" ds="IFMD@" columns="2" items="阴性,阳性" values="0,1" showtitle="false" size="140,28" />
<DxLabel id="label4" size="15,13" title="" color="255,0,0" />
</item>
</DxPanelBar>
</col>
</row>
<row height="38" location="0,0" size="0,0" unit="px">
<col>
<DxPanelBar id="panelBaraz" split="false" size="100,38" tabindex="0" unit="%">
<item align="left" autoExtend="false">
<DxLabel id="label3" size="48,13" title="艾滋" />
<DxDataRadioGroup id="dbradio4" tag="10" ds="IFAZ@" columns="2" items="阴性,阳性" values="0,1" showtitle="false" size="140,28" />
<DxLabel id="label4" size="15,13" title="" color="255,0,0" />
</item>
</DxPanelBar>
</col>
</row>
</Grid> </Grid>
</DxTitlePanel> </DxTitlePanel>
</col> </col>

6
WEB-INF/src/com/his/zy/doctorworkstation/PatientOrderViewForm.java
Unescape View File

@ -3,7 +3,6 @@ package com.his.zy.doctorworkstation;
import java.text.ParseException; import java.text.ParseException;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;
import com.his.base.yzt.YztManageContainerWindow; import com.his.base.yzt.YztManageContainerWindow;
import com.his.mz.gzzmanage.GzzYzMbManageWindow; import com.his.mz.gzzmanage.GzzYzMbManageWindow;
import com.his.mz.gzzmanage.mapper.GzzMzYsNormalYzDaoMapper; import com.his.mz.gzzmanage.mapper.GzzMzYsNormalYzDaoMapper;
@ -490,6 +489,11 @@ public class PatientOrderViewForm extends WatWebForm {
orderSql = orderSql.replaceAll("#select#", select); orderSql = orderSql.replaceAll("#select#", select);
zcyOrderSql = zcyOrderSql.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); dbgrid1.getDataObjectManager().setSelect(orderSql);
zyyzViewZcyOrderDao.setSelect(zcyOrderSql); zyyzViewZcyOrderDao.setSelect(zcyOrderSql);

2
WEB-INF/src/com/his/zy/doctorworkstation/PatientOrderViewForm.xml
Unescape View File

@ -43,7 +43,7 @@
</row> </row>
<row height="99"> <row height="99">
<col> <col>
<DxDataGrid ds="zyyzViewOrderDao" id="dbgrid1" showfoot="false" singleselect="true" size="100,100" unit="%,%"> <DxDataGrid ds="zyyzViewOrderDao_new" id="dbgrid1" showfoot="false" singleselect="true" size="100,100" unit="%,%">
<column calc="true" fieldname="no" type="SERIALNUMBER_CELL" align="center" width="40">序号</column> <column calc="true" fieldname="no" type="SERIALNUMBER_CELL" align="center" width="40">序号</column>
<column calc="true" fieldname="select" type="CHECKBOX_CELL" on="1" off="2" hidden="3" headcheck="true" width="25"></column> <column calc="true" fieldname="select" type="CHECKBOX_CELL" on="1" off="2" hidden="3" headcheck="true" width="25"></column>
<column fieldname="YZCL" type="DICTIONARYLABEL_CELL" dic="MC:BH@zyyzcllxdic" cellcolor="true" align="center" width="30">长临</column> <column fieldname="YZCL" type="DICTIONARYLABEL_CELL" dic="MC:BH@zyyzcllxdic" cellcolor="true" align="center" width="30">长临</column>

7
WEB-INF/src/com/his/zy/gzyzmanage/FollowOrderViewForm.java
Unescape View File

@ -2,7 +2,6 @@ package com.his.zy.gzyzmanage;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;
import com.his.zy.doctorworkstation.ChanageTzOrderTimeWindow; import com.his.zy.doctorworkstation.ChanageTzOrderTimeWindow;
import com.his.zy.doctorworkstation.PatientStopOrderWindow; import com.his.zy.doctorworkstation.PatientStopOrderWindow;
import com.his.zy.doctorworkstation.PatientZfORCxOrderWindow; 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.coolcomponent.DxCoolTextField;
import com.wat.component.datagrid.DxDataGrid; import com.wat.component.datagrid.DxDataGrid;
import com.wat.component.datagrid.DxDataGridCheckBoxCell; 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.DxHeadPageButtonActionListener;
import com.wat.component.datagrid.event.DxReloadActionListener; import com.wat.component.datagrid.event.DxReloadActionListener;
import com.wat.component.datagrid.event.DxSelectRowListener; import com.wat.component.datagrid.event.DxSelectRowListener;
@ -246,6 +244,11 @@ public class FollowOrderViewForm extends WatWebForm {
orderSql = orderSql.replaceAll("#select#", select); orderSql = orderSql.replaceAll("#select#", select);
zcyOrderSql = zcyOrderSql.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); dbgrid1.getDataObjectManager().setSelect(orderSql);
zyyzViewZcyOrderDao.setSelect(zcyOrderSql); zyyzViewZcyOrderDao.setSelect(zcyOrderSql);

2
WEB-INF/src/com/his/zy/gzyzmanage/FollowOrderViewForm.xml
Unescape View File

@ -28,7 +28,7 @@
</row> </row>
<row height="100" location="0,0" split="false" size="0,0" unit="%"> <row height="100" location="0,0" split="false" size="0,0" unit="%">
<col split="true"> <col split="true">
<DxDataGrid ds="zyyzViewOrderDao" id="dbgrid1" showfoot="false" size="100,100" unit="%,%"> <DxDataGrid ds="zyyzViewOrderDao_new" id="dbgrid1" showfoot="false" size="100,100" unit="%,%">
<column calc="true" fieldname="no" type="SERIALNUMBER_CELL" align="center" width="40">序号</column> <column calc="true" fieldname="no" type="SERIALNUMBER_CELL" align="center" width="40">序号</column>
<column calc="true" fieldname="select" type="CHECKBOX_CELL" on="1" off="2" hidden="3" headcheck="true" width="25"></column> <column calc="true" fieldname="select" type="CHECKBOX_CELL" on="1" off="2" hidden="3" headcheck="true" width="25"></column>
<column fieldname="YZCL" type="DICTIONARYLABEL_CELL" dic="MC:BH@zyyzcllxdic" cellcolor="true" align="center" width="30">长临</column> <column fieldname="YZCL" type="DICTIONARYLABEL_CELL" dic="MC:BH@zyyzcllxdic" cellcolor="true" align="center" width="30">长临</column>

2
WEB-INF/src/com/his/zy/zyyfcxmanage/ZyTydFindForm.xml
Unescape View File

@ -91,7 +91,7 @@
<s ctrid="datetimepicker1" col="TYRQ" ctrtype="DxDateTimePick" coltype="93" bjgx=">="/> <s ctrid="datetimepicker1" col="TYRQ" ctrtype="DxDateTimePick" coltype="93" bjgx=">="/>
<s ctrid="datetimepicker2" col="TYRQ" ctrtype="DxDateTimePick" coltype="93" bjgx="&lt;="/> <s ctrid="datetimepicker2" col="TYRQ" ctrtype="DxDateTimePick" coltype="93" bjgx="&lt;="/>
<s ctrid="popgrid1" col="JSKS" ctrtype="DxPopGridText" coltype="12" isvalue="true" bjgx="="/> <s ctrid="popgrid1" col="JSKS" ctrtype="DxPopGridText" coltype="12" isvalue="true" bjgx="="/>
<s ctrid="popgrid2" col="ZXRWARD" ctrtype="DxPopGridText" coltype="12" isvalue="true" bjgx="="/> <s ctrid="popgrid2" col="WARD" ctrtype="DxPopGridText" coltype="12" isvalue="true" bjgx="="/>
<s ctrid="edit1" col="YZMC" ctrtype="DxCoolTextField" coltype="12" isperc="true" bjgx="alllike"/> <s ctrid="edit1" col="YZMC" ctrtype="DxCoolTextField" coltype="12" isperc="true" bjgx="alllike"/>
<s ctrid="edit2" col="XM" ctrtype="DxCoolTextField" coltype="12" isperc="true" bjgx="alllike"/> <s ctrid="edit2" col="XM" ctrtype="DxCoolTextField" coltype="12" isperc="true" bjgx="alllike"/>
<s ctrid="edit3" col="ZYNO" ctrtype="DxCoolTextField" coltype="12" isperc="true" bjgx="alllike"/> <s ctrid="edit3" col="ZYNO" ctrtype="DxCoolTextField" coltype="12" isperc="true" bjgx="alllike"/>

2
WEB-INF/src/com/openIntegratedQuery/normalQuery/mzsr/MzrzCountForm.java
View File

File diff suppressed because one or more lines are too long

2
WEB-INF/src/com/openIntegratedQuery/normalQuery/mzsr/MzrzCountForm.xml
View File

File diff suppressed because one or more lines are too long

19
release/20241225_1153.text
Unescape View File

@ -45,18 +45,37 @@ develop/xl_20241225_bbxg1
........................................................................................................................................... ...........................................................................................................................................
<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
develop/xl_20241225_hcpcxz
耗材盘存入库单位帐盘数以允许小数
........................................................................................................................................... ...........................................................................................................................................
<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
develop/lyx_20241225_zfjsd
1.增加自费结算单模板
........................................................................................................................................... ...........................................................................................................................................
<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
develop/lyx_20241225_zycfdp
1.住院医嘱点评调整：只查询出院患者、增加医嘱类型、同组号、停止医嘱时间、皮试结果
........................................................................................................................................... ...........................................................................................................................................
<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
develop/hrl_20241226_bjhzcrb
就诊患者艾滋/梅毒/乙肝记录
门诊日志统计,艾滋/梅毒/乙肝 阳性变红
住院退药单查询页面 病区过滤不生效
........................................................................................................................................... ...........................................................................................................................................
<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
develop/lyx_20241227_zyyz
住院医嘱SQL优化
1.住院医生工作站-进入患者诊疗与病历
2.住院护士工作站-患者护理文书与诊疗
........................................................................................................................................... ...........................................................................................................................................
<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<

Write Preview
Loading…
Cancel
Save