develop/hrl_20241226_bjhzcrb

就诊患者艾滋/梅毒/乙肝记录门诊日志统计,艾滋/梅毒/乙肝阳性变红住院退药单查询页面病区过滤不生效
4 weeks ago · 53914e1437
parent 6767e89ab7
commit 53914e1437
8 changed files with 100 additions and 6 deletions
--- a/WEB-INF/conf/sysds_his.xml
+++ b/WEB-INF/conf/sysds_his.xml
@ -4970,7 +4970,7 @@
 			bl.XBS ,
 			bl.CLCS,
 			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
 			HIS_JZ_BASEINFO a
 		LEFT JOIN HIS_HZINFO b ON
@ -5015,7 +5015,7 @@
 							bl.XT ,
 							bl.ZS ,
 							bl.XBS ,
-							bl.CLCS
+							bl.CLCS,nvl(a.IFYG,0),nvl(a.IFMD,0) ,nvl(a.IFAZ,0)
        ]]></sql>
 //JJRQ,JJYS,XM,XB,JZNL,ZJHM,ZY,PHONE,XZDZ,MZNO,JYJG,JBBM,JBMC,JZZT,JZZB,FPRQ,SSY,SZY,XT,ZS,XBS,CLCS
        <fields>
@ -5044,6 +5044,9 @@
            <f name="CLCS"  type="12"  />
            <f name="jcgs"  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>
        <parameter>
            <p>12</p>
--- a/WEB-INF/conf/sysds_his_gzz.xml
+++ b/WEB-INF/conf/sysds_his_gzz.xml
@ -2711,6 +2711,7 @@ SELECT JGID,BM,MC,YZDL,YZZL,ISDDYZ,ISXSYZ,ISMZSY,ISJZSY,ISZYSY,DCZDJL,MTZDJL,ZDL
 		<sql>
 			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
 			,IFYG,IFMD,IFAZ
 			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=?
@ -2840,7 +2841,10 @@ SELECT JGID,BM,MC,YZDL,YZZL,ISDDYZ,ISXSYZ,ISMZSY,ISJZSY,ISZYSY,DCZDJL,MTZDJL,ZDL
 			<f name="YBLX" type="12" />
 			<f name="CYBED" 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>
 		<parameter>
 			<p>12</p>
--- a/WEB-INF/src/com/his/mz/gzzmanage/HisMzJbzdForm.java
+++ b/WEB-INF/src/com/his/mz/gzzmanage/HisMzJbzdForm.java
@ -53,6 +53,9 @@ public class HisMzJbzdForm extends WatWebForm implements IJbMbContainer{
 	private DxTitlePanel titlePanel4;
 	private DxTitlePanel titlePanel5;
 	private DxDataRadioGroup dbradio1;
 	private DxDataRadioGroup dbradio2;
 	private DxDataRadioGroup dbradio3;
 	private DxDataRadioGroup dbradio4;
 	private DxDataGrid dbgrid2;
 	private DxPopGridText dbedit1;
 	private DxCoolDataTextField dbedit2;
@ -741,6 +744,33 @@ public class HisMzJbzdForm extends WatWebForm implements IJbMbContainer{
 			setLabelShow("提示:就诊诊别保存成功");
 		}
 	}
 	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() {
@ -873,6 +903,25 @@ public class HisMzJbzdForm extends WatWebForm implements IJbMbContainer{
 				dbradio1Action();
 			}
 		});
 		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(){
 			public void actionPerformed(ActionEvent actionevent) {
--- a/WEB-INF/src/com/his/mz/gzzmanage/HisMzJbzdForm.xml
+++ b/WEB-INF/src/com/his/mz/gzzmanage/HisMzJbzdForm.xml
@ -44,6 +44,39 @@
 											</DxPanelBar>
 										</col>
 									</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>
 							</DxTitlePanel>
 						</col>
--- a/WEB-INF/src/com/his/zy/zyyfcxmanage/ZyTydFindForm.xml
+++ b/WEB-INF/src/com/his/zy/zyyfcxmanage/ZyTydFindForm.xml
@ -91,7 +91,7 @@
        <s ctrid="datetimepicker1" col="TYRQ" ctrtype="DxDateTimePick" coltype="93"   bjgx=">="/>
        <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="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="edit2" col="XM" ctrtype="DxCoolTextField" coltype="12"  isperc="true" bjgx="alllike"/>
        <s ctrid="edit3" col="ZYNO" ctrtype="DxCoolTextField" coltype="12"  isperc="true" bjgx="alllike"/>
--- a/WEB-INF/src/com/openIntegratedQuery/normalQuery/mzsr/MzrzCountForm.java
+++ b/WEB-INF/src/com/openIntegratedQuery/normalQuery/mzsr/MzrzCountForm.java
--- a/WEB-INF/src/com/openIntegratedQuery/normalQuery/mzsr/MzrzCountForm.xml
+++ b/WEB-INF/src/com/openIntegratedQuery/normalQuery/mzsr/MzrzCountForm.xml
--- a/release/20241225_1153.text
+++ b/release/20241225_1153.text
@ -63,6 +63,11 @@ develop/lyx_20241225_zycfdp
 ...........................................................................................................................................
 <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
 develop/hrl_20241226_bjhzcrb
 就诊患者艾滋/梅毒/乙肝记录
 门诊日志统计,艾滋/梅毒/乙肝 阳性变红
 住院退药单查询页面 病区过滤不生效
 ...........................................................................................................................................
 <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<