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

develop/lyx_20241210_kcdj

Browse Source 
1.药事系统-调拨-调拨入库接收：修正接收后冻结数量为负数问题
2.门诊、住院医生工作站：增加未设置医保医师编码提示
3.门诊、住院医生工作站：修正开医嘱选择耗材药房未显示问题
4.传染病直报：增加时间过滤条件、排序优化
5.传染病填报：界面优化
release/20241120_1738
Xiao Ye 1 month ago
parent e3372f0ac3
commit 8e797d38db
10 changed files with 160 additions and 24 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. 9
      WEB-INF/conf/sysds_his.xml
  2. 8
      WEB-INF/conf/sysds_his_gzz.xml
  3. 96
      WEB-INF/conf/sysds_main_dic.xml
  4. 22
      WEB-INF/src/com/his/crb/CrbManager.java
  5. 4
      WEB-INF/src/com/his/crb/CrbManager.xml
  6. 2
      WEB-INF/src/com/his/crb/CrbManagerEdit.xml
  7. 8
      WEB-INF/src/com/his/mz/gzzmanage/HisMzYsGztMainWindow.java
  8. 17
      WEB-INF/src/com/his/yfyk/service/YpdbService.java
  9. 11
      WEB-INF/src/com/his/zy/doctorworkstation/ZyDoctorGztWindow.java
  10. 7
      release/20241120_1738.text

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

@ -4638,7 +4638,12 @@
HZDZ_XX,ZDLX,BLFL,FBRQ,MJZYWXTZZ,XG_LCYZCD,XG_SRBL,XG_SWYY,XG_ZJSWZD,JHB_SZZT,HIV_ybly,HIV_yblyqt,ZYKNGRTJ,GRTJQT,JCS_DP,JCS_DPZSRS,JSC_SX,JSC_QT,
JSC_XJCS,JSC_XJCSRS,JSC_MQYX,JSC_FSY,JSC_PO,JSC_ZYBLS,JSC_SY,JSC_NN,JSC_NNRS,JSC_SSS,JSC_XXS,JSC_BX,JSC_QTNR,HIVZDRQ,SYSJCJL,HIV_JCYXRQ,HIV_JCDW,XBS,SZDSYYYTGR,
SZK_ZZHZ,SZK_SYSJG,HB_YXSJ,HB_SCSJ,HB_SCSJCHECK,HB_ALT,HB_1000,HB_GCJCJG,HB_SAG,MD_JCJG,MD_ZLS,MD_LCBX,MDBGKS,BGDWBM,TKYS,BGDWMC,BGRQ,BGDWLXDH,CJRQ,CJR,XGR,XGRQ,JGID,
SCBZ,CARDID,EVENTID from crb_info where JGID=? AND ( YNZT='0' OR YNZT='1')
SCBZ,CARDID,EVENTID
from crb_info
where JGID=?
AND ( YNZT='0' OR YNZT='1')
AND CJRQ BETWEEN ? AND ?
ORDER BY CJRQ DESC
</sql>
<tables>
<table name="crb_info" insert="true" update="true" delete="false">
@ -4743,6 +4748,8 @@
</fields>
<parameter>
<p>12</p>
<p>93</p>
<p>93</p>
</parameter>
</dao>
<dao id="crb_infodao_bypkey" log="true" type="1">

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

@ -8924,7 +8924,7 @@ select JGID,BM,MC,YZDL,YZZL,ISDDYZ,ISXSYZ,ISMZSY,ISJZSY,ISZYSY,DCZDJL,MTZDJL,ZDL
( select distinct '0' isyzt,A.JGID,A.BM,#yzmc#,A.YZDL,A.YZZL,A.ISDDYZ,A.ISXSYZ,A.ISMZSY,A.ISJZSY,A.ISZYSY,A.DCZDJL,A.MTZDJL,A.ZDL,A.SZSYTS,A.YF,A.LC,A.PC,A.ISMZPSYY,A.ISZYPSYY,A.ISMZSJL,A.ISZYSJL,A.JE,A.BZ,A.ZT,A.YZDW JBDW,A.YZDW RKDW,1 ZHXS,A.YZDW MZFYDW,A.YZDW ZYFYDW,A.JE JBJG,'' GG,A.YZDW,1 DXSL,A.YZDW DXDW,A.MC TYM,'0' ISKJY,'0' ISJK,'0' ISGJJBYW,'0' ISPS,0 SL,0 DJSL,0 KYSL,'' GZFL,'' DDD,'' WHONET,'' JX,'' TYMPKEY,A.GLLX,A.LMT_USED_FLAG,A.XZSYFW,A.CHRGITM_LV,A.YBBM,A.YBMC,0 DXRL,sysdate CGSHRQ,'' ph,'' YPMRPC,'' dptid,A.ZJM from HIS_YZX A left join HIS_YZX_ZJM B on A.BM=B.YZX_BM and A.JGID=B.JGID WHERE A.JGID=? AND A.ISDDYZ = '1' AND A.ISJZSY != '1' AND A.ISMZSY !='1' AND A.ZT='1' AND (A.GLLX != 'W' or A.GLLX is null) AND (A.YZDL !='01' and A.YZDL !='02' and A.YZDL !='03') AND (B.PYM LIKE ? OR A.BM LIKE ? OR A.BM LIKE ? OR A.MC LIKE ?) )
union all
( select distinct '0' isyzt,A.JGID,A.BM,#yzmc#||'['||F.WZGG||']' MC,A.YZDL,A.YZZL,A.ISDDYZ,A.ISXSYZ,A.ISMZSY,A.ISJZSY,A.ISZYSY,A.DCZDJL,A.MTZDJL,A.ZDL,A.SZSYTS,A.YF,A.LC,A.PC,A.ISMZPSYY,A.ISZYPSYY,A.ISMZSJL,A.ISZYSJL,C.JG JE,A.BZ,A.ZT,A.YZDW JBDW,A.YZDW RKDW,1 ZHXS,A.YZDW MZFYDW,A.YZDW ZYFYDW,A.JE JBJG,F.WZGG GG,A.YZDW,1 DXSL,A.YZDW DXDW,A.MC TYM,'0' ISKJY,'0' ISJK,'0' ISGJJBYW,'0' ISPS,nvl(E.SL,0) SL,nvl(E.DJSL,0) DJSL,nvl(E.KYSL,0) KYSL,'' GZFL,'' DDD,'' WHONET,'' JX,'' TYMPKEY,A.GLLX,A.LMT_USED_FLAG,A.XZSYFW,A.CHRGITM_LV,A.YBBM,A.YBMC,0 DXRL,sysdate CGSHRQ,'' ph,'' YPMRPC,'' dptid,A.ZJM from HIS_YZX A left join HIS_YZX_ZJM B on A.BM=B.YZX_BM and A.JGID=B.JGID LEFT JOIN HIS_SFX C ON A.JGID=C.JGID AND A.BM=C.BM LEFT JOIN HIS_KSKC E ON A.JGID=E.JGID AND A.BM=E.SFX_BM left join HIS_MMS_WZZD F on C.GLBM=F.WZBM AND C.JGID=F.JGID WHERE A.JGID=? AND A.ISDDYZ = '1' AND A.ISJZSY != '1' AND ISZYSY !='1' AND A.ZT='1' AND A.GLLX = 'W' and (A.YZDL !='01' and A.YZDL !='02' and A.YZDL !='03') AND (B.PYM LIKE ? OR A.BM LIKE ? OR A.BM LIKE ? OR A.MC LIKE ?) )
( select distinct '0' isyzt,A.JGID,A.BM,#yzmc#||'['||F.WZGG||']' MC,A.YZDL,A.YZZL,A.ISDDYZ,A.ISXSYZ,A.ISMZSY,A.ISJZSY,A.ISZYSY,A.DCZDJL,A.MTZDJL,A.ZDL,A.SZSYTS,A.YF,A.LC,A.PC,A.ISMZPSYY,A.ISZYPSYY,A.ISMZSJL,A.ISZYSJL,C.JG JE,A.BZ,A.ZT,A.YZDW JBDW,A.YZDW RKDW,1 ZHXS,A.YZDW MZFYDW,A.YZDW ZYFYDW,A.JE JBJG,F.WZGG GG,A.YZDW,1 DXSL,A.YZDW DXDW,A.MC TYM,'0' ISKJY,'0' ISJK,'0' ISGJJBYW,'0' ISPS,nvl(E.SL,0) SL,nvl(E.DJSL,0) DJSL,nvl(E.KYSL,0) KYSL,'' GZFL,'' DDD,'' WHONET,'' JX,'' TYMPKEY,A.GLLX,A.LMT_USED_FLAG,A.XZSYFW,A.CHRGITM_LV,A.YBBM,A.YBMC,0 DXRL,sysdate CGSHRQ,'' ph,'' YPMRPC,E.dptid,A.ZJM from HIS_YZX A left join HIS_YZX_ZJM B on A.BM=B.YZX_BM and A.JGID=B.JGID LEFT JOIN HIS_SFX C ON A.JGID=C.JGID AND A.BM=C.BM LEFT JOIN HIS_KSKC E ON A.JGID=E.JGID AND A.BM=E.SFX_BM left join HIS_MMS_WZZD F on C.GLBM=F.WZBM AND C.JGID=F.JGID WHERE A.JGID=? AND A.ISDDYZ = '1' AND A.ISJZSY != '1' AND ISZYSY !='1' AND A.ZT='1' AND A.GLLX = 'W' and (A.YZDL !='01' and A.YZDL !='02' and A.YZDL !='03') AND (B.PYM LIKE ? OR A.BM LIKE ? OR A.BM LIKE ? OR A.MC LIKE ?) )
union all
( select distinct '1' isyzt,A.JGID,A.PKEY BM,A.YZTNAME MC,'' YZDL,'' YZZL,'' ISDDYZ,'' ISXSYZ,'' ISMZSY,'' ISJZSY,'' ISZYSY,0 DCZDJL,0 MTZDJL,0 ZDL,0 SZSYTS,'' YF,'' LC,'' PC,'' ISMZPSYY,'' ISZYPSYY,'' ISMZSJL,'' ISZYSJL,0 JE,'' BZ,'' ZT,'' JBDW,'' RKDW,1 ZHXS,'' MZFYDW,'' ZYFYDW,0 JBJG,'' GG,'' YZDW,1 DXSL,'' DXDW,A.YZTNAME TYM,'0' ISKJY,'0' ISJK,'0' ISGJJBYW,'0' ISPS,0 SL,0 DJSL,0 KYSL,'' GZFL,'' DDD,'' WHONET,'' JX,'' TYMPKEY,'' GLLX,'' LMT_USED_FLAG,'' XZSYFW,'' CHRGITM_LV,'' YBBM,'' YBMC,0 DXRL,sysdate CGSHRQ,'' ph,'' YPMRPC,'' dptid,A.YZTPYM ZJM from HIS_YZT_MAIN A WHERE A.JGID=? AND A.SFZCY = '0' AND A.SFQY = '1' AND (A.YZTWBM LIKE ? OR A.YZTPYM LIKE ? OR A.YZTBM LIKE ? OR A.YZTNAME LIKE ?) )
@ -9035,7 +9035,7 @@ select JGID,BM,MC,YZDL,YZZL,ISDDYZ,ISXSYZ,ISMZSY,ISJZSY,ISZYSY,DCZDJL,MTZDJL,ZDL
( select distinct '0' isyzt,A.JGID,A.BM,#yzmc#,A.YZDL,A.YZZL,A.ISDDYZ,A.ISXSYZ,A.ISMZSY,A.ISJZSY,A.ISZYSY,A.DCZDJL,A.MTZDJL,A.ZDL,A.SZSYTS,A.YF,A.LC,A.PC,A.ISMZPSYY,A.ISZYPSYY,A.ISMZSJL,A.ISZYSJL,A.JE,A.BZ,A.ZT,A.YZDW JBDW,A.YZDW RKDW,1 ZHXS,A.YZDW MZFYDW,A.YZDW ZYFYDW,A.JE JBJG,'' GG,A.YZDW,1 DXSL,A.YZDW DXDW,A.MC TYM,'0' ISKJY,'0' ISJK,'0' ISGJJBYW,'0' ISPS,0 SL,0 DJSL,0 KYSL,'' GZFL,'' DDD,'' WHONET,'' JX,'' TYMPKEY,A.GLLX,A.LMT_USED_FLAG,A.XZSYFW,A.CHRGITM_LV,A.YBBM,A.YBMC,0 DXRL,sysdate YXQ,'' ph,'' YPMRPC,'' dptid,A.ZJM from HIS_YZX A left join HIS_YZX_ZJM B on A.BM=B.YZX_BM and A.JGID=B.JGID WHERE A.JGID=? AND A.ISDDYZ = '1' AND A.ISJZSY != '1' AND A.ISMZSY !='1' AND A.ZT='1' AND (A.GLLX != 'W' or A.GLLX is null) AND (A.YZDL !='01' and A.YZDL !='02' and A.YZDL !='03') AND (B.PYM LIKE ? OR A.BM LIKE ? OR A.BM LIKE ? OR A.MC LIKE ?) )
union all
( select distinct '0' isyzt,A.JGID,A.BM,#yzmc#||'['||F.WZGG||']' MC,A.YZDL,A.YZZL,A.ISDDYZ,A.ISXSYZ,A.ISMZSY,A.ISJZSY,A.ISZYSY,A.DCZDJL,A.MTZDJL,A.ZDL,A.SZSYTS,A.YF,A.LC,A.PC,A.ISMZPSYY,A.ISZYPSYY,A.ISMZSJL,A.ISZYSJL,C.JG JE,A.BZ,A.ZT,A.YZDW JBDW,A.YZDW RKDW,1 ZHXS,A.YZDW MZFYDW,A.YZDW ZYFYDW,A.JE JBJG,F.WZGG GG,A.YZDW,1 DXSL,A.YZDW DXDW,A.MC TYM,'0' ISKJY,'0' ISJK,'0' ISGJJBYW,'0' ISPS,nvl(E.SL,0) SL,nvl(E.DJSL,0) DJSL,nvl(E.KYSL,0) KYSL,'' GZFL,'' DDD,'' WHONET,'' JX,'' TYMPKEY,A.GLLX,A.LMT_USED_FLAG,A.XZSYFW,A.CHRGITM_LV,A.YBBM,A.YBMC,0 DXRL,sysdate YXQ,'' ph,'' YPMRPC,'' dptid,A.ZJM from HIS_YZX A left join HIS_YZX_ZJM B on A.BM=B.YZX_BM and A.JGID=B.JGID LEFT JOIN HIS_SFX C ON A.JGID=C.JGID AND A.BM=C.BM LEFT JOIN HIS_KSKC E ON A.JGID=E.JGID AND A.BM=E.SFX_BM left join HIS_MMS_WZZD F on C.GLBM=F.WZBM AND C.JGID=F.JGID WHERE A.JGID=? AND A.ISDDYZ = '1' AND A.ISJZSY != '1' AND ISZYSY !='1' AND A.ZT='1' AND A.GLLX = 'W' and (A.YZDL !='01' and A.YZDL !='02' and A.YZDL !='03') AND (B.PYM LIKE ? OR A.BM LIKE ? OR A.BM LIKE ? OR A.MC LIKE ?) )
( select distinct '0' isyzt,A.JGID,A.BM,#yzmc#||'['||F.WZGG||']' MC,A.YZDL,A.YZZL,A.ISDDYZ,A.ISXSYZ,A.ISMZSY,A.ISJZSY,A.ISZYSY,A.DCZDJL,A.MTZDJL,A.ZDL,A.SZSYTS,A.YF,A.LC,A.PC,A.ISMZPSYY,A.ISZYPSYY,A.ISMZSJL,A.ISZYSJL,C.JG JE,A.BZ,A.ZT,A.YZDW JBDW,A.YZDW RKDW,1 ZHXS,A.YZDW MZFYDW,A.YZDW ZYFYDW,A.JE JBJG,F.WZGG GG,A.YZDW,1 DXSL,A.YZDW DXDW,A.MC TYM,'0' ISKJY,'0' ISJK,'0' ISGJJBYW,'0' ISPS,nvl(E.SL,0) SL,nvl(E.DJSL,0) DJSL,nvl(E.KYSL,0) KYSL,'' GZFL,'' DDD,'' WHONET,'' JX,'' TYMPKEY,A.GLLX,A.LMT_USED_FLAG,A.XZSYFW,A.CHRGITM_LV,A.YBBM,A.YBMC,0 DXRL,sysdate YXQ,'' ph,'' YPMRPC,E.dptid,A.ZJM from HIS_YZX A left join HIS_YZX_ZJM B on A.BM=B.YZX_BM and A.JGID=B.JGID LEFT JOIN HIS_SFX C ON A.JGID=C.JGID AND A.BM=C.BM LEFT JOIN HIS_KSKC E ON A.JGID=E.JGID AND A.BM=E.SFX_BM left join HIS_MMS_WZZD F on C.GLBM=F.WZBM AND C.JGID=F.JGID WHERE A.JGID=? AND A.ISDDYZ = '1' AND A.ISJZSY != '1' AND ISZYSY !='1' AND A.ZT='1' AND A.GLLX = 'W' and (A.YZDL !='01' and A.YZDL !='02' and A.YZDL !='03') AND (B.PYM LIKE ? OR A.BM LIKE ? OR A.BM LIKE ? OR A.MC LIKE ?) )
union all
( select distinct '1' isyzt,A.JGID,A.PKEY BM,A.YZTNAME MC,'' YZDL,'' YZZL,'' ISDDYZ,'' ISXSYZ,'' ISMZSY,'' ISJZSY,'' ISZYSY,0 DCZDJL,0 MTZDJL,0 ZDL,0 SZSYTS,'' YF,'' LC,'' PC,'' ISMZPSYY,'' ISZYPSYY,'' ISMZSJL,'' ISZYSJL,0 JE,'' BZ,'' ZT,'' JBDW,'' RKDW,1 ZHXS,'' MZFYDW,'' ZYFYDW,0 JBJG,'' GG,'' YZDW,1 DXSL,'' DXDW,A.YZTNAME TYM,'0' ISKJY,'0' ISJK,'0' ISGJJBYW,'0' ISPS,0 SL,0 DJSL,0 KYSL,'' GZFL,'' DDD,'' WHONET,'' JX,'' TYMPKEY,'' GLLX,'' LMT_USED_FLAG,'' XZSYFW,'' CHRGITM_LV,'' YBBM,'' YBMC,0 DXRL,sysdate CGSHRQ,'' ph,'' YPMRPC,'' dptid,A.YZTPYM ZJM from HIS_YZT_MAIN A WHERE A.JGID=? AND A.SFZCY = '0' AND A.SFQY = '1' AND (A.YZTWBM LIKE ? OR A.YZTPYM LIKE ? OR A.YZTBM LIKE ? OR A.YZTNAME LIKE ?) )
@ -9152,7 +9152,7 @@ SELECT JGID,BM,MC,YZDL,YZZL,ISDDYZ,ISXSYZ,ISMZSY,ISJZSY,ISZYSY,DCZDJL,MTZDJL,ZDL
union all
( select distinct A.JGID,A.BM,A.MC||'['||F.WZGG||']' MC,A.YZDL,A.YZZL,A.ISDDYZ,A.ISXSYZ,A.ISMZSY,A.ISJZSY,A.ISZYSY,A.DCZDJL,A.MTZDJL,A.ZDL,A.SZSYTS,A.YF,A.LC,A.PC,A.ISMZPSYY,A.ISZYPSYY,A.ISMZSJL,A.ISZYSJL,C.JG JE,A.BZ,A.ZT,A.YZDW JBDW,A.YZDW RKDW,1 ZHXS,A.YZDW MZFYDW,A.YZDW ZYFYDW,A.JE JBJG,F.WZGG GG,A.YZDW,1 DXSL,A.YZDW DXDW,A.MC TYM,'0' ISKJY,'0' ISJK,'0' ISGJJBYW,'0' ISPS,nvl(E.SL,0) SL,nvl(E.DJSL,0) DJSL,nvl(E.KYSL,0) KYSL,'' GZFL,'' DDD,'' WHONET,'' JX,'' TYMPKEY,A.GLLX,A.LMT_USED_FLAG,A.XZSYFW,A.CHRGITM_LV,A.YBBM,A.YBMC,0 DXRL,sysdate CGSHRQ,'' ph,'' YPMRPC,'' dptid from HIS_YZX A left join HIS_YZX_ZJM B on A.BM=B.YZX_BM and A.JGID=B.JGID LEFT JOIN HIS_SFX C ON A.JGID=C.JGID AND A.BM=C.BM LEFT JOIN HIS_KSKC E ON A.JGID=E.JGID AND A.BM=E.SFX_BM left join HIS_MMS_WZZD F on C.GLBM=F.WZBM AND C.JGID=F.JGID WHERE A.JGID=? AND A.ISDDYZ = '1' AND A.ISJZSY != '1' AND ISZYSY !='1' AND A.ZT='1' AND A.GLLX = 'W' and (A.YZDL !='01' and A.YZDL !='02' and A.YZDL !='03') AND (B.PYM LIKE ? OR A.BM LIKE ? OR A.MC LIKE ?) )
( select distinct A.JGID,A.BM,A.MC||'['||F.WZGG||']' MC,A.YZDL,A.YZZL,A.ISDDYZ,A.ISXSYZ,A.ISMZSY,A.ISJZSY,A.ISZYSY,A.DCZDJL,A.MTZDJL,A.ZDL,A.SZSYTS,A.YF,A.LC,A.PC,A.ISMZPSYY,A.ISZYPSYY,A.ISMZSJL,A.ISZYSJL,C.JG JE,A.BZ,A.ZT,A.YZDW JBDW,A.YZDW RKDW,1 ZHXS,A.YZDW MZFYDW,A.YZDW ZYFYDW,A.JE JBJG,F.WZGG GG,A.YZDW,1 DXSL,A.YZDW DXDW,A.MC TYM,'0' ISKJY,'0' ISJK,'0' ISGJJBYW,'0' ISPS,nvl(E.SL,0) SL,nvl(E.DJSL,0) DJSL,nvl(E.KYSL,0) KYSL,'' GZFL,'' DDD,'' WHONET,'' JX,'' TYMPKEY,A.GLLX,A.LMT_USED_FLAG,A.XZSYFW,A.CHRGITM_LV,A.YBBM,A.YBMC,0 DXRL,sysdate CGSHRQ,'' ph,'' YPMRPC,E.dptid from HIS_YZX A left join HIS_YZX_ZJM B on A.BM=B.YZX_BM and A.JGID=B.JGID LEFT JOIN HIS_SFX C ON A.JGID=C.JGID AND A.BM=C.BM LEFT JOIN HIS_KSKC E ON A.JGID=E.JGID AND A.BM=E.SFX_BM left join HIS_MMS_WZZD F on C.GLBM=F.WZBM AND C.JGID=F.JGID WHERE A.JGID=? AND A.ISDDYZ = '1' AND A.ISJZSY != '1' AND ISZYSY !='1' AND A.ZT='1' AND A.GLLX = 'W' and (A.YZDL !='01' and A.YZDL !='02' and A.YZDL !='03') AND (B.PYM LIKE ? OR A.BM LIKE ? OR A.MC LIKE ?) )
)
@ -9261,7 +9261,7 @@ SELECT JGID,BM,MC,YZDL,YZZL,ISDDYZ,ISXSYZ,ISMZSY,ISJZSY,ISZYSY,DCZDJL,MTZDJL,ZDL
union all
( select distinct A.JGID,A.BM,A.MC||'['||F.WZGG||']' MC,A.YZDL,A.YZZL,A.ISDDYZ,A.ISXSYZ,A.ISMZSY,A.ISJZSY,A.ISZYSY,A.DCZDJL,A.MTZDJL,A.ZDL,A.SZSYTS,A.YF,A.LC,A.PC,A.ISMZPSYY,A.ISZYPSYY,A.ISMZSJL,A.ISZYSJL,C.JG JE,A.BZ,A.ZT,A.YZDW JBDW,A.YZDW RKDW,1 ZHXS,A.YZDW MZFYDW,A.YZDW ZYFYDW,A.JE JBJG,F.WZGG GG,A.YZDW,1 DXSL,A.YZDW DXDW,A.MC TYM,'0' ISKJY,'0' ISJK,'0' ISGJJBYW,'0' ISPS,nvl(E.SL,0) SL,nvl(E.DJSL,0) DJSL,nvl(E.KYSL,0) KYSL,'' GZFL,'' DDD,'' WHONET,'' JX,'' TYMPKEY,A.GLLX,A.LMT_USED_FLAG,A.XZSYFW,A.CHRGITM_LV,A.YBBM,A.YBMC,0 DXRL,sysdate YXQ,'' ph,'' YPMRPC,'' dptid from HIS_YZX A left join HIS_YZX_ZJM B on A.BM=B.YZX_BM and A.JGID=B.JGID LEFT JOIN HIS_SFX C ON A.JGID=C.JGID AND A.BM=C.BM LEFT JOIN HIS_KSKC E ON A.JGID=E.JGID AND A.BM=E.SFX_BM left join HIS_MMS_WZZD F on C.GLBM=F.WZBM AND C.JGID=F.JGID WHERE A.JGID=? AND A.ISDDYZ = '1' AND A.ISJZSY != '1' AND ISZYSY !='1' AND A.ZT='1' AND A.GLLX = 'W' and (A.YZDL !='01' and A.YZDL !='02' and A.YZDL !='03') AND (B.PYM LIKE ? OR A.BM LIKE ? OR A.MC LIKE ?) )
( select distinct A.JGID,A.BM,A.MC||'['||F.WZGG||']' MC,A.YZDL,A.YZZL,A.ISDDYZ,A.ISXSYZ,A.ISMZSY,A.ISJZSY,A.ISZYSY,A.DCZDJL,A.MTZDJL,A.ZDL,A.SZSYTS,A.YF,A.LC,A.PC,A.ISMZPSYY,A.ISZYPSYY,A.ISMZSJL,A.ISZYSJL,C.JG JE,A.BZ,A.ZT,A.YZDW JBDW,A.YZDW RKDW,1 ZHXS,A.YZDW MZFYDW,A.YZDW ZYFYDW,A.JE JBJG,F.WZGG GG,A.YZDW,1 DXSL,A.YZDW DXDW,A.MC TYM,'0' ISKJY,'0' ISJK,'0' ISGJJBYW,'0' ISPS,nvl(E.SL,0) SL,nvl(E.DJSL,0) DJSL,nvl(E.KYSL,0) KYSL,'' GZFL,'' DDD,'' WHONET,'' JX,'' TYMPKEY,A.GLLX,A.LMT_USED_FLAG,A.XZSYFW,A.CHRGITM_LV,A.YBBM,A.YBMC,0 DXRL,sysdate YXQ,'' ph,'' YPMRPC,E.dptid from HIS_YZX A left join HIS_YZX_ZJM B on A.BM=B.YZX_BM and A.JGID=B.JGID LEFT JOIN HIS_SFX C ON A.JGID=C.JGID AND A.BM=C.BM LEFT JOIN HIS_KSKC E ON A.JGID=E.JGID AND A.BM=E.SFX_BM left join HIS_MMS_WZZD F on C.GLBM=F.WZBM AND C.JGID=F.JGID WHERE A.JGID=? AND A.ISDDYZ = '1' AND A.ISJZSY != '1' AND ISZYSY !='1' AND A.ZT='1' AND A.GLLX = 'W' and (A.YZDL !='01' and A.YZDL !='02' and A.YZDL !='03') AND (B.PYM LIKE ? OR A.BM LIKE ? OR A.MC LIKE ?) )
)

96
WEB-INF/conf/sysds_main_dic.xml
Unescape View File

@ -1437,4 +1437,100 @@
<f name="ZT" type="12" table="MAIN_ZDB" />
</fields>
</dao>
<dao id="jgryxxdicdao" log="true" type="1">
<sql>
SELECT
a.USERID,
a.MRKS,
a.JGID,
a.EFFICET,
a.SFZYYS,
a.DUTY,
a.SFZYHS,
a.SFMZYS,
a.EMPID,
a.SFCFQ,
a.BDZH,
a.SFMZSFY,
a.SFZYSFY,
a.YBUSERNAME,
a.YBPASSWORD,
a.SFKXQYBL,
a.SFZYZHQ,
a.KSSYSJB,
a.FZLYYSJB,
a.SFJB,
a.CJR,
a.CJRQ,
a.XGR,
a.XGRQ,
a.YHQXBS,
a.YSJB,
a.YBID,
a.YBNAME,
a.PKEY,
a.HIE_USERNAME,
a.HIE_PASSWORD,
a.PAY_ZDBB_PKEY,
a.YSZGZH,
a.YSZGXM,
a.SFDMCFQ,
a.SFJSLCFQ
FROM
MAIN_JGYH a
LEFT JOIN MAIN_YHXX b ON
a.JGID = b.GLJG
AND a.EMPID = b.EMPID
WHERE
b.GLJG =?
AND b.USERACCOUNT =?
</sql>
//USERID,MRKS,JGID,EFFICET,SFZYYS,DUTY,SFZYHS,SFMZYS,EMPID,SFCFQ,BDZH,SFMZSFY,SFZYSFY,YBUSERNAME,YBPASSWORD,SFKXQYBL,SFZYZHQ,KSSYSJB,FZLYYSJB,SFJB,CJR,CJRQ,XGR,XGRQ,YHQXBS,YSJB,YBID,YBNAME,PKEY,HIE_USERNAME,HIE_PASSWORD,PAY_ZDBB_PKEY,YSZGZH,YSZGXM,SFDMCFQ,SFJSLCFQ
<fields>
<f name="USERID" type="12" />
<f name="MRKS" type="12" />
<f name="JGID" type="12" />
<f name="EFFICET" type="12" />
<f name="SFZYYS" type="12" />
<f name="DUTY" type="12" />
<f name="SFZYHS" type="12" />
<f name="SFMZYS" type="12" />
<f name="EMPID" type="12" />
<f name="SFCFQ" type="12" />
<f name="BDZH" type="12" />
<f name="SFMZSFY" type="12" />
<f name="SFZYSFY" type="12" />
<f name="YBUSERNAME" type="12" />
<f name="YBPASSWORD" type="12" />
<f name="SFKXQYBL" type="12" />
<f name="SFZYZHQ" type="12" />
<f name="KSSYSJB" type="12" />
<f name="FZLYYSJB" type="12" />
<f name="SFJB" type="12" />
<f name="CJR" type="12" />
<f name="CJRQ" type="93" />
<f name="XGR" type="12" />
<f name="XGRQ" type="93" />
<f name="YHQXBS" type="-5" />
<f name="YSJB" type="12" />
<f name="YBID" type="12" />
<f name="YBNAME" type="12" />
<f name="PKEY" type="12" />
<f name="HIE_USERNAME" type="12" />
<f name="HIE_PASSWORD" type="12" />
<f name="PAY_ZDBB_PKEY" type="12" />
<f name="YSZGZH" type="12" />
<f name="YSZGXM" type="12" />
<f name="SFDMCFQ" type="12" />
<f name="SFJSLCFQ" type="12" />
</fields>
<parameter>
<p>12</p>
<p>12</p>
</parameter>
</dao>
</datasource>

22
WEB-INF/src/com/his/crb/CrbManager.java
View File

File diff suppressed because one or more lines are too long

4
WEB-INF/src/com/his/crb/CrbManager.xml
View File

File diff suppressed because one or more lines are too long

2
WEB-INF/src/com/his/crb/CrbManagerEdit.xml
View File

File diff suppressed because one or more lines are too long

8
WEB-INF/src/com/his/mz/gzzmanage/HisMzYsGztMainWindow.java
Unescape View File

@ -101,6 +101,14 @@ public class HisMzYsGztMainWindow extends WatSDIWindow implements OpenMainGzzInt
dlg.messageDlg("提示:当前登录科室不是门诊科室，不允许进行操作",DxMessageDlg.ALERT,200);
return;
}
DxNormalDataManager jgryxxdicdao =DaoCreator.getNormalDao(this,"jgryxxdicdao");
jgryxxdicdao.reload(new Object[]{MainUtil.getCurCompanyID(),MainUtil.getCurUserAccount()});
String atddr_no= jgryxxdicdao.getColumnValueAsString("YBID");
if(Delphi.isNullString(atddr_no)) {
dlg.messageDlg("提示:当前登录账号未设置医保医师编码，请联系管理员进行维护",DxMessageDlg.ALERT,200);
return;
}
/* 系统自动生成，用于lds和dic中的需要参数的dao的初始化装载数据，默认参数填入机构参数，请根据实际情况修改参数*/
DxNormalDataManager xbdao = DaoCreator.getNormalDao(this,"xbdao");

17
WEB-INF/src/com/his/yfyk/service/YpdbService.java
Unescape View File

@ -702,8 +702,12 @@ public class YpdbService {
}
String ckkssl = hiskskcdao.getColumnValueAsString("SL");
hiskskcdao.setColumnValue("SL", MathUtil.subtract(hiskskcdao.getColumnValueAsString("SL"), bdsl));
hiskskcdao.setColumnValue("DJSL", MathUtil.subtract(hiskskcdao.getColumnValueAsString("DJSL"), bdsl));
String djsl = MathUtil.subtract(hiskskcdao.getColumnValueAsString("DJSL"), bdsl);
if(Double.parseDouble(djsl) < 0) {
djsl = "0";
}
hiskskcdao.setColumnValue("SL", MathUtil.subtract(ckkssl, bdsl));
hiskskcdao.setColumnValue("DJSL", djsl);
DxNormalDataManager dbck_hiskskcpcdao = null;
@ -717,9 +721,12 @@ public class YpdbService {
}
String ckkspcsl = dbck_hiskskcpcdao.getColumnValueAsString("SL");
dbck_hiskskcpcdao.setColumnValue("SL", MathUtil.subtract(dbck_hiskskcpcdao.getColumnValueAsString("SL"),bdsl));
dbck_hiskskcpcdao.setColumnValue("DJSL", MathUtil.subtract(dbck_hiskskcpcdao.getColumnValueAsString("DJSL"),bdsl));
String ckkspcdjsl = MathUtil.subtract(dbck_hiskskcpcdao.getColumnValueAsString("DJSL"),bdsl);
if(Double.parseDouble(ckkspcdjsl) < 0) {
ckkspcdjsl = "0";
}
dbck_hiskskcpcdao.setColumnValue("SL", MathUtil.subtract(ckkspcsl,bdsl));
dbck_hiskskcpcdao.setColumnValue("DJSL", ckkspcdjsl);
hiskskcpcdao.setColumnValue("CGSHRQ",new Timestamp(dbck_hiskskcpcdao.getColumnValueAsLong("CGSHRQ")));//入库批次设置出库批次的采购日期

11
WEB-INF/src/com/his/zy/doctorworkstation/ZyDoctorGztWindow.java
Unescape View File

@ -13,6 +13,9 @@ import com.wat.core.component.event.ActionEvent;
import com.wat.core.component.event.ActionListener;
import com.wat.core.component.event.WindowAdapter;
import com.wat.core.component.event.WindowEvent;
import com.wat.core.config.DaoCreator;
import com.wat.core.dal.DxNormalDataManager;
import com.wat.delphi.util.Delphi;
public class ZyDoctorGztWindow extends WatSDIWindow {
private DxPanelBar panelBar1;
@ -58,6 +61,14 @@ public class ZyDoctorGztWindow extends WatSDIWindow {
return;
}
DxNormalDataManager jgryxxdicdao =DaoCreator.getNormalDao(this,"jgryxxdicdao");
jgryxxdicdao.reload(new Object[]{MainUtil.getCurCompanyID(),MainUtil.getCurUserAccount()});
String atddr_no= jgryxxdicdao.getColumnValueAsString("YBID");
if(Delphi.isNullString(atddr_no)) {
dlg.messageDlg("提示:当前登录账号未设置医保医师编码，请联系管理员进行维护",DxMessageDlg.ALERT,110);
return;
}
label12.setText(MainUtil.getCurKsName());
label13.setText(MainUtil.getCurUserName());

7
release/20241120_1738.text
Unescape View File

@ -47,6 +47,13 @@ develop/lyx_20241206_djfx
...........................................................................................................................................
<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
develop/lyx_20241210_kcdj
1.药事系统-调拨-调拨入库接收：修正接收后冻结数量为负数问题
2.门诊、住院医生工作站：增加未设置医保医师编码提示
3.门诊、住院医生工作站：修正开医嘱选择耗材药房未显示问题
4.传染病直报：增加时间过滤条件、排序优化
5.传染病填报：界面优化
...........................................................................................................................................
<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<

Write Preview
Loading…
Cancel
Save