From 53914e14371b989edc0dbbad010cc19c0d4519a3 Mon Sep 17 00:00:00 2001 From: Ray Shaw Date: Fri, 27 Dec 2024 16:11:39 +0800 Subject: [PATCH] develop/hrl_20241226_bjhzcrb MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 就诊患者艾滋/梅毒/乙肝记录 门诊日志统计,艾滋/梅毒/乙肝 阳性变红 住院退药单查询页面 病区过滤不生效 --- WEB-INF/conf/sysds_his.xml | 7 +++- WEB-INF/conf/sysds_his_gzz.xml | 6 ++- .../src/com/his/mz/gzzmanage/HisMzJbzdForm.java | 49 ++++++++++++++++++++++ WEB-INF/src/com/his/mz/gzzmanage/HisMzJbzdForm.xml | 33 +++++++++++++++ .../src/com/his/zy/zyyfcxmanage/ZyTydFindForm.xml | 2 +- .../normalQuery/mzsr/MzrzCountForm.java | 2 +- .../normalQuery/mzsr/MzrzCountForm.xml | 2 +- release/20241225_1153.text | 5 +++ 8 files changed, 100 insertions(+), 6 deletions(-) diff --git a/WEB-INF/conf/sysds_his.xml b/WEB-INF/conf/sysds_his.xml index 9825335..08d538d 100644 --- 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) ]]> //JJRQ,JJYS,XM,XB,JZNL,ZJHM,ZY,PHONE,XZDZ,MZNO,JYJG,JBBM,JBMC,JZZT,JZZB,FPRQ,SSY,SZY,XT,ZS,XBS,CLCS @@ -5044,6 +5044,9 @@ + + +

12

diff --git a/WEB-INF/conf/sysds_his_gzz.xml b/WEB-INF/conf/sysds_his_gzz.xml index c2fa449..8b6c590 100644 --- 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 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 - + + + +

12

diff --git a/WEB-INF/src/com/his/mz/gzzmanage/HisMzJbzdForm.java b/WEB-INF/src/com/his/mz/gzzmanage/HisMzJbzdForm.java index cedf7a1..5ffa334 100644 --- 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) { diff --git a/WEB-INF/src/com/his/mz/gzzmanage/HisMzJbzdForm.xml b/WEB-INF/src/com/his/mz/gzzmanage/HisMzJbzdForm.xml index 5862d1d..f897036 100644 --- a/WEB-INF/src/com/his/mz/gzzmanage/HisMzJbzdForm.xml +++ b/WEB-INF/src/com/his/mz/gzzmanage/HisMzJbzdForm.xml @@ -44,6 +44,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/WEB-INF/src/com/his/zy/zyyfcxmanage/ZyTydFindForm.xml b/WEB-INF/src/com/his/zy/zyyfcxmanage/ZyTydFindForm.xml index 71543bd..2320869 100644 --- a/WEB-INF/src/com/his/zy/zyyfcxmanage/ZyTydFindForm.xml +++ b/WEB-INF/src/com/his/zy/zyyfcxmanage/ZyTydFindForm.xml @@ -91,7 +91,7 @@ - + diff --git a/WEB-INF/src/com/openIntegratedQuery/normalQuery/mzsr/MzrzCountForm.java b/WEB-INF/src/com/openIntegratedQuery/normalQuery/mzsr/MzrzCountForm.java index c855e2a..189b7f1 100644 --- a/WEB-INF/src/com/openIntegratedQuery/normalQuery/mzsr/MzrzCountForm.java +++ b/WEB-INF/src/com/openIntegratedQuery/normalQuery/mzsr/MzrzCountForm.java @@ -1 +1 @@ -package com.openIntegratedQuery.normalQuery.mzsr; import java.util.Calendar; import com.lis.jygl.LisForGzzShow; import com.util.MainUtil; import com.wat.component.DxCheckBox; import com.wat.component.DxComboBox; import com.wat.component.DxDateTimePick; import com.wat.component.DxPanelBar; import com.wat.component.DxPopGridText; import com.wat.component.coolcomponent.DxCoolTextField; import com.wat.component.datagrid.DxDataGrid; import com.wat.component.datagrid.event.DataGridCalcFieldListener; import com.wat.component.datagrid.event.DxHtmlCallListener; import com.wat.core.component.WatForm; import com.wat.core.component.WatWebForm; 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 MzrzCountForm extends WatWebForm { private DxDateTimePick datetimepicker1; private DxDateTimePick datetimepicker2; private DxDataGrid dbgrid1; private DxPopGridText popgrid1; private DxPopGridText popgrid2; private DxPopGridText popgrid3; private DxPanelBar panelBar1; private DxPanelBar panelBar2; private DxComboBox combobox1; private DxCoolTextField edit1; private DxCheckBox checkbox1; private DxCheckBox checkbox2; private DxCheckBox checkbox3; private DxCheckBox checkbox4; public MzrzCountForm() { super(); } public static MzrzCountForm newWindow() { return (MzrzCountForm) WatForm.newWindow(MzrzCountForm.class.getName()); } public void initUI() { super.initUI(); customerInitUI(); } public void customerInitUI() { super.customerInitUI(); combobox1.addItem("统计今天", "1"); combobox1.addItem("统计昨天", "2"); combobox1.addItem("统计上月", "3"); combobox1.addItem("统计本月", "4"); combobox1.addItem("统计本年", "5"); combobox1.addItem("统计上午", "6"); combobox1.addItem("统计下午", "7"); combobox1.addItem("统计晚上", "8"); } public void beforeShowLoad() { super.beforeShowLoad(); DxNormalDataManager jgrydicdao = DaoCreator.getNormalDao(this, "jgrydicdao"); jgrydicdao.setNormalParameters(new Object[] { MainUtil.getCurCompanyID() }); jgrydicdao.reloadByDictionary("NAME", "USERACCOUNT"); edit1.setText(""); popgrid1.setValue(""); combobox1.setSelectedIndex(3); changetime(); } public void modalFunction(int flag, Object para) { if (flag == 110) { } } private void panelBar2Action(String command) { if ("select".equals(command)) { panelBar2selectAction(); } else if ("reset".equals(command)) { panelBar2resetAction(); } else if ("export".equals(command)) { panelBar2exportAction(); } } private void panelBar2exportAction() { dbgrid1.exportExcelByXls(Delphi.getDateTimeStr(datetimepicker1.getTime()) + "至" + Delphi.getDateTimeStr(datetimepicker2.getTime()) + "门诊日志统计"); } private void panelBar2selectAction() { DxNormalDataManager dao = DaoCreator.getNormalDao(this, "mzrztjdao"); String orignsql = dao.getOrignSql(); String select = ""; //select = " and b.YZXZYS='"+MainUtil.getCurUserAccount()+"'"; //select+=" and b.CFSHZT='1'"; String ks = popgrid3.getValue(); if (!Delphi.isNullString(ks)) { select += "and a.JJKS LIKE '%" + ks + "%'"; } String ys = popgrid2.getValue(); if (!Delphi.isNullString(ys)) { select += "and a.JJYS LIKE '%" + ys + "%'"; } String xm = edit1.getText(); if (!Delphi.isNullString(xm)) { select += "and b.XM LIKE '%" + xm + "%'"; } String bm = popgrid1.getValue(); if (!Delphi.isNullString(bm)) { select += "and zd.JBBM = '" + bm + "'"; } if (checkbox1.isSelected()) { select += "and zd.JBBM is null "; } if (checkbox2.isSelected()) { select += "and bl.SSY is null "; } if (checkbox3.isSelected()) { select += "and bl.XT is null "; } if (checkbox4.isSelected()) { select += "and nvl(SUBSTR(a.JZNL, 1, INSTR(a.JZNL, '岁') - 1),a.JZNL) >35 "; } orignsql = orignsql.replaceAll("#select#", select); dao.setSelect(orignsql, false, false); dao.reload(new Object[] { MainUtil.getCurCompanyID(), datetimepicker1.getTimeStamp(), datetimepicker2.getTimeStamp() }); dbgrid1.setDataObjectManager(dao); dbgrid1.reload(); //dbgrid1.reload(new Object[] {MainUtil.getCurCompanyID(),datetimepicker1.getTimeStamp(),datetimepicker2.getTimeStamp()}); } private void panelBar2resetAction() { edit1.setText(""); popgrid1.setValue(""); popgrid1.setText(""); popgrid2.setValue(""); popgrid2.setText(""); popgrid3.setValue(""); popgrid3.setText(""); checkbox1.setSelected(false); checkbox2.setSelected(false); checkbox3.setSelected(false); checkbox4.setSelected(false); } private void changetime() { Calendar begin = Calendar.getInstance(); Calendar end = Calendar.getInstance(); int selected = combobox1.getSelectedIndex(); if (selected == 0) { begin.set(Calendar.HOUR_OF_DAY, 0); begin.set(Calendar.MINUTE, 0); begin.set(Calendar.SECOND, 0); begin.set(Calendar.HOUR_OF_DAY, 0); begin.set(Calendar.MINUTE, 0); begin.set(Calendar.SECOND, 0); end.set(Calendar.HOUR_OF_DAY, 23); end.set(Calendar.MINUTE, 59); end.set(Calendar.SECOND, 59); datetimepicker1.setTime(begin.getTimeInMillis()); datetimepicker2.setTime(end.getTimeInMillis()); } else if (selected == 1) { begin.set(Calendar.DAY_OF_MONTH, begin.get(Calendar.DAY_OF_MONTH) - 1); begin.set(Calendar.HOUR_OF_DAY, 0); begin.set(Calendar.MINUTE, 0); begin.set(Calendar.SECOND, 0); end.set(Calendar.DAY_OF_MONTH, end.get(Calendar.DAY_OF_MONTH) - 1); end.set(Calendar.HOUR_OF_DAY, 23); end.set(Calendar.MINUTE, 59); end.set(Calendar.SECOND, 59); datetimepicker1.setTime(begin.getTimeInMillis()); datetimepicker2.setTime(end.getTimeInMillis()); } else if (selected == 2) { begin.set(Calendar.MONTH, begin.get(Calendar.MONTH) - 1); begin.set(Calendar.DAY_OF_MONTH, 1); begin.set(Calendar.HOUR_OF_DAY, 0); begin.set(Calendar.MINUTE, 0); begin.set(Calendar.SECOND, 0); end.set(Calendar.DAY_OF_MONTH, 1); end.set(Calendar.DAY_OF_MONTH, end.get(Calendar.DAY_OF_MONTH) - 1); end.set(Calendar.HOUR_OF_DAY, 23); end.set(Calendar.MINUTE, 59); end.set(Calendar.SECOND, 59); datetimepicker1.setTime(begin.getTimeInMillis()); datetimepicker2.setTime(end.getTimeInMillis()); } else if (selected == 3) { begin.set(Calendar.DAY_OF_MONTH, 1); begin.set(Calendar.HOUR_OF_DAY, 0); begin.set(Calendar.MINUTE, 0); begin.set(Calendar.SECOND, 0); end.set(Calendar.MONTH, begin.get(Calendar.MONTH) + 1); end.set(Calendar.DAY_OF_MONTH, 1); end.set(Calendar.DAY_OF_MONTH, end.get(Calendar.DAY_OF_MONTH) - 1); end.set(Calendar.HOUR_OF_DAY, 23); end.set(Calendar.MINUTE, 59); end.set(Calendar.SECOND, 59); datetimepicker1.setTime(begin.getTimeInMillis()); datetimepicker2.setTime(end.getTimeInMillis()); } else if (selected == 4) { begin.set(Calendar.MONTH, 0); begin.set(Calendar.DAY_OF_MONTH, 1); begin.set(Calendar.DAY_OF_MONTH, begin.get(Calendar.DAY_OF_MONTH) - 1); begin.set(Calendar.HOUR_OF_DAY, 0); begin.set(Calendar.MINUTE, 0); begin.set(Calendar.SECOND, 0); end.set(Calendar.MONTH, begin.get(Calendar.MONTH) + 1); end.set(Calendar.DAY_OF_MONTH, 1); end.set(Calendar.DAY_OF_MONTH, end.get(Calendar.DAY_OF_MONTH) - 1); end.set(Calendar.HOUR_OF_DAY, 23); end.set(Calendar.MINUTE, 59); end.set(Calendar.SECOND, 59); datetimepicker1.setTime(begin.getTimeInMillis()); datetimepicker2.setTime(end.getTimeInMillis()); } else if (selected == 5) { begin.set(Calendar.HOUR_OF_DAY, 8); begin.set(Calendar.MINUTE, 0); begin.set(Calendar.SECOND, 1); end.set(Calendar.HOUR_OF_DAY, 12); end.set(Calendar.MINUTE, 0); end.set(Calendar.SECOND, 59); datetimepicker1.setTime(begin.getTimeInMillis()); datetimepicker2.setTime(end.getTimeInMillis()); } else if (selected == 6) { begin.set(Calendar.HOUR_OF_DAY, 13); begin.set(Calendar.MINUTE, 0); begin.set(Calendar.SECOND, 1); end.set(Calendar.HOUR_OF_DAY, 17); end.set(Calendar.MINUTE, 30); end.set(Calendar.SECOND, 59); datetimepicker1.setTime(begin.getTimeInMillis()); datetimepicker2.setTime(end.getTimeInMillis()); } else if (selected == 7) { begin.set(Calendar.HOUR_OF_DAY, 20); begin.set(Calendar.MINUTE, 0); begin.set(Calendar.SECOND, 1); end.set(Calendar.DAY_OF_MONTH, end.get(Calendar.DAY_OF_MONTH) + 1); end.set(Calendar.HOUR_OF_DAY, 0); end.set(Calendar.MINUTE, 0); end.set(Calendar.SECOND, 59); datetimepicker1.setTime(begin.getTimeInMillis()); datetimepicker2.setTime(end.getTimeInMillis()); } } private void popgrid1Action(String Command) { if (Command == null) { popgrid1.loadListSource(); } else { } } private void dbgrijyjgquery2Action() { LisForGzzShow form = LisForGzzShow.newWindow(); form.setWindow(this); form.setWinParams("JZPKEY", dbgrid1.getColumnValue("PKEY")); form.showAsModal(); } private void closeAction() { if ("true".equals(getWinParams("saveflag"))) { this.doModalCallbackAction(null); } } private void popgrid3Action(String command) { if(command == null) { String key = popgrid3.getText(); if (key != null && !"".equals(key.trim())) { key = "%" + key.toUpperCase() + "%"; } else { key = "%"; } popgrid3.getListSource().setNormalParameters(new Object[]{MainUtil.getCurCompanyID(),key,key,key}); popgrid3.loadListSource(); }else{ } } private void popgrid2Action(String command) { String key = popgrid2.getText(); if (command == null) { if (!Delphi.isNullString(key)) { key = "%" + key.toUpperCase() + "%"; } else { key="%"; } popgrid2.setListSourceParameters(new Object[] {MainUtil.getCurCompanyID(),"%","%",key,key,key }); popgrid2.loadListSource(); } } protected void initEvent() { super.initEvent(); this.addWindowListener(new WindowAdapter() { public void windowClosed(WindowEvent windowevent) { closeAction(); } }); panelBar2.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent actionevent) { panelBar2Action(actionevent.getActionCommand()); } }); combobox1.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent actionevent) { changetime(); } }); popgrid1.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent arg0) { popgrid1Action(arg0.getActionCommand()); } }); popgrid2.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent arg0) { popgrid2Action(arg0.getActionCommand()); } }); popgrid3.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent arg0) { popgrid3Action(arg0.getActionCommand()); } }); dbgrid1.addHtmlCallListener(new DxHtmlCallListener() { public void actionPerformed(ActionEvent actionevent) { String command = actionevent.getActionCommand(); if ("jyjg".equals(command)) { dbgrijyjgquery2Action(); } } }); dbgrid1.addDataGridCalcFieldListener(new DataGridCalcFieldListener() { public void calcField(int rowNum) { int jcgs = dbgrid1.getColumnValueAsInt(rowNum, "jcgs"); if (jcgs > 0) { String html = "
检验结果查询√
"; dbgrid1.setCalcFieldValue(rowNum, "jyjg", html); } else { String html = "
检验结果查询
"; dbgrid1.setCalcFieldValue(rowNum, "", html); } String jbbm = dbgrid1.getColumnValueAsString(rowNum, "JBBM") + ""; String jbmc = dbgrid1.getColumnValueAsString(rowNum, "JBMC") + ""; //艾滋 if (jbbm.startsWith("B20") || jbbm.startsWith("B21") || jbbm.startsWith("B22") || jbbm.startsWith("B23")) { dbgrid1.setCalcFieldValue(rowNum, "JBAZ", "✓"); } if (jbmc.contains("艾滋") || jbmc.contains("HIV") || jbmc.contains("人类免疫缺陷病毒") || jbmc.contains("艾滋其他标识")) { dbgrid1.setCalcFieldValue(rowNum, "JBAZ", "✓"); } //梅毒 if (jbbm.startsWith("A50") || jbbm.startsWith("A51") || jbbm.startsWith("A52") || jbbm.startsWith("A53")) { dbgrid1.setCalcFieldValue(rowNum, "JBMD", "✓"); } if (jbmc.contains("梅毒") || jbmc.contains("梅毒其他标识")) { dbgrid1.setCalcFieldValue(rowNum, "JBMD", "✓"); } //乙肝 if (jbbm.startsWith("B16") || jbbm.startsWith("B18.0") || jbbm.startsWith("B18.1")) { dbgrid1.setCalcFieldValue(rowNum, "JBYG", "✓"); } if (jbmc.contains("乙肝") || jbmc.contains("乙肝其他标识")) { dbgrid1.setCalcFieldValue(rowNum, "JBYG", "✓"); } } }); } } \ No newline at end of file +package com.openIntegratedQuery.normalQuery.mzsr; import java.util.Calendar; import com.lis.jygl.LisForGzzShow; import com.util.MainUtil; import com.wat.component.DxCheckBox; import com.wat.component.DxComboBox; import com.wat.component.DxDateTimePick; import com.wat.component.DxPanelBar; import com.wat.component.DxPopGridText; import com.wat.component.coolcomponent.DxCoolTextField; import com.wat.component.datagrid.DxDataGrid; import com.wat.component.datagrid.event.DataGridCalcFieldListener; import com.wat.component.datagrid.event.DataGridCellColorListener; import com.wat.component.datagrid.event.DxHtmlCallListener; import com.wat.core.component.WatForm; import com.wat.core.component.WatWebForm; 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 MzrzCountForm extends WatWebForm { private DxDateTimePick datetimepicker1; private DxDateTimePick datetimepicker2; private DxDataGrid dbgrid1; private DxPopGridText popgrid1; private DxPopGridText popgrid2; private DxPopGridText popgrid3; private DxPanelBar panelBar1; private DxPanelBar panelBar2; private DxComboBox combobox1; private DxCoolTextField edit1; private DxCheckBox checkbox1; private DxCheckBox checkbox2; private DxCheckBox checkbox3; private DxCheckBox checkbox4; public MzrzCountForm() { super(); } public static MzrzCountForm newWindow() { return (MzrzCountForm) WatForm.newWindow(MzrzCountForm.class.getName()); } public void initUI() { super.initUI(); customerInitUI(); } public void customerInitUI() { super.customerInitUI(); combobox1.addItem("统计今天", "1"); combobox1.addItem("统计昨天", "2"); combobox1.addItem("统计上月", "3"); combobox1.addItem("统计本月", "4"); combobox1.addItem("统计本年", "5"); combobox1.addItem("统计上午", "6"); combobox1.addItem("统计下午", "7"); combobox1.addItem("统计晚上", "8"); } public void beforeShowLoad() { super.beforeShowLoad(); DxNormalDataManager jgrydicdao = DaoCreator.getNormalDao(this, "jgrydicdao"); jgrydicdao.setNormalParameters(new Object[] { MainUtil.getCurCompanyID() }); jgrydicdao.reloadByDictionary("NAME", "USERACCOUNT"); edit1.setText(""); popgrid1.setValue(""); combobox1.setSelectedIndex(3); changetime(); } public void modalFunction(int flag, Object para) { if (flag == 110) { } } private void panelBar2Action(String command) { if ("select".equals(command)) { panelBar2selectAction(); } else if ("reset".equals(command)) { panelBar2resetAction(); } else if ("export".equals(command)) { panelBar2exportAction(); } } private void panelBar2exportAction() { dbgrid1.exportExcelByXls(Delphi.getDateTimeStr(datetimepicker1.getTime()) + "至" + Delphi.getDateTimeStr(datetimepicker2.getTime()) + "门诊日志统计"); } private void panelBar2selectAction() { DxNormalDataManager dao = DaoCreator.getNormalDao(this, "mzrztjdao"); String orignsql = dao.getOrignSql(); String select = ""; //select = " and b.YZXZYS='"+MainUtil.getCurUserAccount()+"'"; //select+=" and b.CFSHZT='1'"; String ks = popgrid3.getValue(); if (!Delphi.isNullString(ks)) { select += "and a.JJKS LIKE '%" + ks + "%'"; } String ys = popgrid2.getValue(); if (!Delphi.isNullString(ys)) { select += "and a.JJYS LIKE '%" + ys + "%'"; } String xm = edit1.getText(); if (!Delphi.isNullString(xm)) { select += "and b.XM LIKE '%" + xm + "%'"; } String bm = popgrid1.getValue(); if (!Delphi.isNullString(bm)) { select += "and zd.JBBM = '" + bm + "'"; } if (checkbox1.isSelected()) { select += "and zd.JBBM is null "; } if (checkbox2.isSelected()) { select += "and bl.SSY is null "; } if (checkbox3.isSelected()) { select += "and bl.XT is null "; } if (checkbox4.isSelected()) { select += "and nvl(SUBSTR(a.JZNL, 1, INSTR(a.JZNL, '岁') - 1),a.JZNL) >35 "; } orignsql = orignsql.replaceAll("#select#", select); dao.setSelect(orignsql, false, false); dao.reload(new Object[] { MainUtil.getCurCompanyID(), datetimepicker1.getTimeStamp(), datetimepicker2.getTimeStamp() }); dbgrid1.setDataObjectManager(dao); dbgrid1.reload(); //dbgrid1.reload(new Object[] {MainUtil.getCurCompanyID(),datetimepicker1.getTimeStamp(),datetimepicker2.getTimeStamp()}); } private void panelBar2resetAction() { edit1.setText(""); popgrid1.setValue(""); popgrid1.setText(""); popgrid2.setValue(""); popgrid2.setText(""); popgrid3.setValue(""); popgrid3.setText(""); checkbox1.setSelected(false); checkbox2.setSelected(false); checkbox3.setSelected(false); checkbox4.setSelected(false); } private void changetime() { Calendar begin = Calendar.getInstance(); Calendar end = Calendar.getInstance(); int selected = combobox1.getSelectedIndex(); if (selected == 0) { begin.set(Calendar.HOUR_OF_DAY, 0); begin.set(Calendar.MINUTE, 0); begin.set(Calendar.SECOND, 0); begin.set(Calendar.HOUR_OF_DAY, 0); begin.set(Calendar.MINUTE, 0); begin.set(Calendar.SECOND, 0); end.set(Calendar.HOUR_OF_DAY, 23); end.set(Calendar.MINUTE, 59); end.set(Calendar.SECOND, 59); datetimepicker1.setTime(begin.getTimeInMillis()); datetimepicker2.setTime(end.getTimeInMillis()); } else if (selected == 1) { begin.set(Calendar.DAY_OF_MONTH, begin.get(Calendar.DAY_OF_MONTH) - 1); begin.set(Calendar.HOUR_OF_DAY, 0); begin.set(Calendar.MINUTE, 0); begin.set(Calendar.SECOND, 0); end.set(Calendar.DAY_OF_MONTH, end.get(Calendar.DAY_OF_MONTH) - 1); end.set(Calendar.HOUR_OF_DAY, 23); end.set(Calendar.MINUTE, 59); end.set(Calendar.SECOND, 59); datetimepicker1.setTime(begin.getTimeInMillis()); datetimepicker2.setTime(end.getTimeInMillis()); } else if (selected == 2) { begin.set(Calendar.MONTH, begin.get(Calendar.MONTH) - 1); begin.set(Calendar.DAY_OF_MONTH, 1); begin.set(Calendar.HOUR_OF_DAY, 0); begin.set(Calendar.MINUTE, 0); begin.set(Calendar.SECOND, 0); end.set(Calendar.DAY_OF_MONTH, 1); end.set(Calendar.DAY_OF_MONTH, end.get(Calendar.DAY_OF_MONTH) - 1); end.set(Calendar.HOUR_OF_DAY, 23); end.set(Calendar.MINUTE, 59); end.set(Calendar.SECOND, 59); datetimepicker1.setTime(begin.getTimeInMillis()); datetimepicker2.setTime(end.getTimeInMillis()); } else if (selected == 3) { begin.set(Calendar.DAY_OF_MONTH, 1); begin.set(Calendar.HOUR_OF_DAY, 0); begin.set(Calendar.MINUTE, 0); begin.set(Calendar.SECOND, 0); end.set(Calendar.MONTH, begin.get(Calendar.MONTH) + 1); end.set(Calendar.DAY_OF_MONTH, 1); end.set(Calendar.DAY_OF_MONTH, end.get(Calendar.DAY_OF_MONTH) - 1); end.set(Calendar.HOUR_OF_DAY, 23); end.set(Calendar.MINUTE, 59); end.set(Calendar.SECOND, 59); datetimepicker1.setTime(begin.getTimeInMillis()); datetimepicker2.setTime(end.getTimeInMillis()); } else if (selected == 4) { begin.set(Calendar.MONTH, 0); begin.set(Calendar.DAY_OF_MONTH, 1); begin.set(Calendar.DAY_OF_MONTH, begin.get(Calendar.DAY_OF_MONTH) - 1); begin.set(Calendar.HOUR_OF_DAY, 0); begin.set(Calendar.MINUTE, 0); begin.set(Calendar.SECOND, 0); end.set(Calendar.MONTH, begin.get(Calendar.MONTH) + 1); end.set(Calendar.DAY_OF_MONTH, 1); end.set(Calendar.DAY_OF_MONTH, end.get(Calendar.DAY_OF_MONTH) - 1); end.set(Calendar.HOUR_OF_DAY, 23); end.set(Calendar.MINUTE, 59); end.set(Calendar.SECOND, 59); datetimepicker1.setTime(begin.getTimeInMillis()); datetimepicker2.setTime(end.getTimeInMillis()); } else if (selected == 5) { begin.set(Calendar.HOUR_OF_DAY, 8); begin.set(Calendar.MINUTE, 0); begin.set(Calendar.SECOND, 1); end.set(Calendar.HOUR_OF_DAY, 12); end.set(Calendar.MINUTE, 0); end.set(Calendar.SECOND, 59); datetimepicker1.setTime(begin.getTimeInMillis()); datetimepicker2.setTime(end.getTimeInMillis()); } else if (selected == 6) { begin.set(Calendar.HOUR_OF_DAY, 13); begin.set(Calendar.MINUTE, 0); begin.set(Calendar.SECOND, 1); end.set(Calendar.HOUR_OF_DAY, 17); end.set(Calendar.MINUTE, 30); end.set(Calendar.SECOND, 59); datetimepicker1.setTime(begin.getTimeInMillis()); datetimepicker2.setTime(end.getTimeInMillis()); } else if (selected == 7) { begin.set(Calendar.HOUR_OF_DAY, 20); begin.set(Calendar.MINUTE, 0); begin.set(Calendar.SECOND, 1); end.set(Calendar.DAY_OF_MONTH, end.get(Calendar.DAY_OF_MONTH) + 1); end.set(Calendar.HOUR_OF_DAY, 0); end.set(Calendar.MINUTE, 0); end.set(Calendar.SECOND, 59); datetimepicker1.setTime(begin.getTimeInMillis()); datetimepicker2.setTime(end.getTimeInMillis()); } } private void popgrid1Action(String Command) { if (Command == null) { popgrid1.loadListSource(); } else { } } private void dbgrijyjgquery2Action() { LisForGzzShow form = LisForGzzShow.newWindow(); form.setWindow(this); form.setWinParams("JZPKEY", dbgrid1.getColumnValue("PKEY")); form.showAsModal(); } private void closeAction() { if ("true".equals(getWinParams("saveflag"))) { this.doModalCallbackAction(null); } } private void popgrid3Action(String command) { if(command == null) { String key = popgrid3.getText(); if (key != null && !"".equals(key.trim())) { key = "%" + key.toUpperCase() + "%"; } else { key = "%"; } popgrid3.getListSource().setNormalParameters(new Object[]{MainUtil.getCurCompanyID(),key,key,key}); popgrid3.loadListSource(); }else{ } } private void popgrid2Action(String command) { String key = popgrid2.getText(); if (command == null) { if (!Delphi.isNullString(key)) { key = "%" + key.toUpperCase() + "%"; } else { key="%"; } popgrid2.setListSourceParameters(new Object[] {MainUtil.getCurCompanyID(),"%","%",key,key,key }); popgrid2.loadListSource(); } } private String dbgrid1CellColorAction(int rowNum,int column, int datagridcolumnnum) { if("1".equals(dbgrid1.getColumnValueAsString(rowNum,"IFMD")) && datagridcolumnnum == 13) { return "#FF0000"; }else if ("1".equals(dbgrid1.getColumnValueAsString(rowNum,"IFAZ")) && datagridcolumnnum == 14) { return "#FF0000"; }else if ("1".equals(dbgrid1.getColumnValueAsString(rowNum,"IFYG")) && datagridcolumnnum == 15) { return "#FF0000"; } return null; } protected void initEvent() { super.initEvent(); this.addWindowListener(new WindowAdapter() { public void windowClosed(WindowEvent windowevent) { closeAction(); } }); panelBar2.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent actionevent) { panelBar2Action(actionevent.getActionCommand()); } }); combobox1.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent actionevent) { changetime(); } }); popgrid1.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent arg0) { popgrid1Action(arg0.getActionCommand()); } }); popgrid2.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent arg0) { popgrid2Action(arg0.getActionCommand()); } }); popgrid3.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent arg0) { popgrid3Action(arg0.getActionCommand()); } }); dbgrid1.addHtmlCallListener(new DxHtmlCallListener() { public void actionPerformed(ActionEvent actionevent) { String command = actionevent.getActionCommand(); if ("jyjg".equals(command)) { dbgrijyjgquery2Action(); } } }); dbgrid1.addDataGridCalcFieldListener(new DataGridCalcFieldListener() { public void calcField(int rowNum) { int jcgs = dbgrid1.getColumnValueAsInt(rowNum, "jcgs"); if (jcgs > 0) { String html = "
检验结果查询√
"; dbgrid1.setCalcFieldValue(rowNum, "jyjg", html); } else { String html = "
检验结果查询
"; dbgrid1.setCalcFieldValue(rowNum, "", html); } String jbbm = dbgrid1.getColumnValueAsString(rowNum, "JBBM") + ""; String jbmc = dbgrid1.getColumnValueAsString(rowNum, "JBMC") + ""; //艾滋 if (jbbm.startsWith("B20") || jbbm.startsWith("B21") || jbbm.startsWith("B22") || jbbm.startsWith("B23")) { dbgrid1.setCalcFieldValue(rowNum, "JBAZ", "✓"); } if (jbmc.contains("艾滋") || jbmc.contains("HIV") || jbmc.contains("人类免疫缺陷病毒") || jbmc.contains("艾滋其他标识")) { dbgrid1.setCalcFieldValue(rowNum, "JBAZ", "✓"); } //梅毒 if (jbbm.startsWith("A50") || jbbm.startsWith("A51") || jbbm.startsWith("A52") || jbbm.startsWith("A53")) { dbgrid1.setCalcFieldValue(rowNum, "JBMD", "✓"); } if (jbmc.contains("梅毒") || jbmc.contains("梅毒其他标识")) { dbgrid1.setCalcFieldValue(rowNum, "JBMD", "✓"); } //乙肝 if (jbbm.startsWith("B16") || jbbm.startsWith("B18.0") || jbbm.startsWith("B18.1")) { dbgrid1.setCalcFieldValue(rowNum, "JBYG", "✓"); } if (jbmc.contains("乙肝") || jbmc.contains("乙肝其他标识")) { dbgrid1.setCalcFieldValue(rowNum, "JBYG", "✓"); } } }); dbgrid1.addDataGridCellColorListener(new DataGridCellColorListener() { public String fieldColor(int rowNum, int column,int datagridcolumnnum) { System.err.println("======="+datagridcolumnnum); return dbgrid1CellColorAction(rowNum,column,datagridcolumnnum); } }); } } \ No newline at end of file diff --git a/WEB-INF/src/com/openIntegratedQuery/normalQuery/mzsr/MzrzCountForm.xml b/WEB-INF/src/com/openIntegratedQuery/normalQuery/mzsr/MzrzCountForm.xml index 6f8f585..0631d4c 100644 --- a/WEB-INF/src/com/openIntegratedQuery/normalQuery/mzsr/MzrzCountForm.xml +++ b/WEB-INF/src/com/openIntegratedQuery/normalQuery/mzsr/MzrzCountForm.xml @@ -1 +1 @@ - 就诊日期 就诊医生 姓名 性别 就诊年龄 证件号码 职业 联系电话 住址 门诊号 检验结果查询 诊断编码 诊断名称 梅毒 艾滋 乙肝 确拟诊 诊别 发病时间 收缩压 舒张压 血糖 主诉 简要病史 处理措施 \ No newline at end of file + 就诊日期 就诊医生 姓名 性别 就诊年龄 证件号码 职业 联系电话 住址 门诊号 检验结果查询 诊断编码 诊断名称 梅毒 艾滋 乙肝 确拟诊 诊别 发病时间 收缩压 舒张压 血糖 主诉 简要病史 处理措施 \ No newline at end of file diff --git a/release/20241225_1153.text b/release/20241225_1153.text index b6dc962..d7c09ec 100644 --- a/release/20241225_1153.text +++ b/release/20241225_1153.text @@ -63,6 +63,11 @@ develop/lyx_20241225_zycfdp ........................................................................................................................................... <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< +develop/hrl_20241226_bjhzcrb + +就诊患者艾滋/梅毒/乙肝记录 +门诊日志统计,艾滋/梅毒/乙肝 阳性变红 +住院退药单查询页面 病区过滤不生效 ........................................................................................................................................... <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<