diff --git a/WEB-INF/conf/sysds_his.xml b/WEB-INF/conf/sysds_his.xml
index 7a477e3..9825335 100644
--- a/WEB-INF/conf/sysds_his.xml
+++ b/WEB-INF/conf/sysds_his.xml
@@ -4949,6 +4949,7 @@
         	a.PKEY,
 			a.JJRQ ,
 			a.JJYS ,
+			a.JJKS ,
 			b.XM ,
 			b.XB ,
 			a.JZNL ,
@@ -4995,6 +4996,7 @@
         					a.PKEY,
 							a.JJRQ ,
 							a.JJYS ,
+							a.JJKS ,
 							b.XM ,
 							b.XB ,
 							a.JZNL ,
@@ -5020,6 +5022,7 @@
             <f name="PKEY"  type="12"  />
             <f name="JJRQ"  type="93"  />
             <f name="JJYS"  type="12"  />
+            <f name="JJKS"  type="12"  />
             <f name="XM"  type="12"  />
             <f name="XB"  type="12"  />
             <f name="JZNL"  type="12"  />
diff --git a/WEB-INF/src/com/openIntegratedQuery/normalQuery/mzsr/MzrzCountForm.java b/WEB-INF/src/com/openIntegratedQuery/normalQuery/mzsr/MzrzCountForm.java
index 9dd1d27..c855e2a 100644
--- a/WEB-INF/src/com/openIntegratedQuery/normalQuery/mzsr/MzrzCountForm.java
+++ b/WEB-INF/src/com/openIntegratedQuery/normalQuery/mzsr/MzrzCountForm.java
@@ -1,22 +1 @@
-package com.openIntegratedQuery.normalQuery.mzsr;

import java.util.Calendar;
import java.util.Iterator;
import org.apache.commons.lang.SystemUtils;
import com.his.mz.ghmanage.model.MzKsjzModel;
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.DxLabel;
import com.wat.component.DxPanelBar;
import com.wat.component.DxPopGridText;
import com.wat.component.coolcomponent.DxCoolTextField;
import com.wat.component.datagrid.DesignColumns;
import com.wat.component.datagrid.DxDataGrid;
import com.wat.component.datagrid.event.DataGridCalcFieldListener;
import com.wat.component.datagrid.event.DxHtmlCallListener;
import com.wat.component.datagrid.DesignColumns.DesignColumnsCell;
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.DxDataManager;
import com.wat.core.dal.DxNormalDataManager;
import com.wat.core.util.MathUtil;
import com.wat.delphi.util.Delphi;

public class MzrzCountForm extends WatWebForm {
    private DxDateTimePick datetimepicker1;
-    private DxDateTimePick datetimepicker2;
-    private DxDataGrid dbgrid1;
-    private DxPopGridText popgrid1;
-    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 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("");
		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);
		}
	}
	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());
			}
		});
		
		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 = "<center><a style='text-align:center;font-size:12' href=javascript:top.DxDataGrid.htmlCall('" + dbgrid1.getRenderFormId() + "','" + dbgrid1.getRenderComponentId() + "','jyjg')>检验结果查询√</a></center>";
					dbgrid1.setCalcFieldValue(rowNum, "jyjg", html);
				} else {
					String html = "<center><a style='text-align:center;font-size:12' href=javascript:top.DxDataGrid.htmlCall('" + dbgrid1.getRenderFormId() + "','" + dbgrid1.getRenderComponentId() + "','jyjg')>检验结果查询</a></center>";
					dbgrid1.setCalcFieldValue(rowNum, "", html);
				}
			}
		});
	}
}
\ 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.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 = "<center><a style='text-align:center;font-size:12' href=javascript:top.DxDataGrid.htmlCall('" + dbgrid1.getRenderFormId() + "','" + dbgrid1.getRenderComponentId() + "','jyjg')>检验结果查询√</a></center>";
					dbgrid1.setCalcFieldValue(rowNum, "jyjg", html);
				} else {
					String html = "<center><a style='text-align:center;font-size:12' href=javascript:top.DxDataGrid.htmlCall('" + dbgrid1.getRenderFormId() + "','" + dbgrid1.getRenderComponentId() + "','jyjg')>检验结果查询</a></center>";
					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
diff --git a/WEB-INF/src/com/openIntegratedQuery/normalQuery/mzsr/MzrzCountForm.xml b/WEB-INF/src/com/openIntegratedQuery/normalQuery/mzsr/MzrzCountForm.xml
index 27c68d0..6f8f585 100644
--- a/WEB-INF/src/com/openIntegratedQuery/normalQuery/mzsr/MzrzCountForm.xml
+++ b/WEB-INF/src/com/openIntegratedQuery/normalQuery/mzsr/MzrzCountForm.xml
@@ -1,2 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
<window size="927,550" title="门诊日志统计" controlbutton="false,false,true">

		<DxDIVGrid bkcolor="255,255,255" class="LayoutManager" location="0,0" size="100,100" unit="%,%">
	        <row height="40" unit="px">
	            <col>
	                <DxPanelBar id="panelBar1" border-bottom="1px solid #b8ced7" border-top="1px solid #b8ced7"  size="100,38" unit="%">
	                  <item align="left" autoExtend="false">
	                      <DxLabel id="label1"  size="60,13"  title="常用时段"/>
	                      <DxComboBox id="combobox1" size="140,28" />
	                  </item>
	                  <item align="left" autoExtend="false">
	                      <DxLabel id="label2"  size="60,13"  title="开始日期"/>
	                      <DxDateTimePick id="datetimepicker1" size="140,28" type="date" />
	                  </item>
	                  <item align="left" autoExtend="false">
	                      <DxLabel id="label3"  size="60,13"  title="结束日期"/>
	                      <DxDateTimePick id="datetimepicker2" size="140,28" type="date" />
	                  </item>
<!-- 	                  <item align="left" autoExtend="false">
	                      <DxLabel id="label4"  size="35,13"  title="医院"/>
	                      <DxComboBox id="dblookupcombobox1" size="140,28" />
	                  </item>
	                  <item align="left">
	                      <DxLabel id="label4"  size="96,13"  title="类型"/>
	                      <DxComboBox id="combobox2" size="80,28" />
	                  </item>	 -->                  
	                </DxPanelBar>
	            </col>
	        </row>
	        <row height="40" unit="px">
	            <col>
	                <DxPanelBar id="panelBar2"    size="100,38" unit="%">
	                
	                  <item align="left" autoExtend="false">
	                      <DxLabel id="label5"  size="60,13"  title="诊断名称"/>
	                       <DxPopGridText id="popgrid1" popbutton="true" frontquery="true" lds="JBMC:JBBM@gzzJbPopByFrontCacheForWesternDao" frontquerystr="PYM LIKE '%@%' OR WBM LIKE '%@%' OR JBMC like '%@%' or JBBM like '%@%' or JBNAME like '%@%'" dic="JBMC:JBBM@gzzJbDic" instantsearch="true" frontcache="true" ds=":jbbm@" names="编码,名称,别名" values="JBBM,JBMC,JBNAME" nulltip="请输入内容" chinese="true" onlyoneautoset="false" showdetail="false" size="140,28" tag="1" />
	                  </item>
	                  
	                  <item align="left" autoExtend="false">
	                      	<DxLabel id="label6"  size="60,13"  title="病人姓名"/>
                    		<DxCoolTextField id="edit1"  size="140,28" tag="1" />
	                  </item>
	                  
	                  <item align="left" autoExtend="false">
	                      	<DxCheckBox id="checkbox1" size="81,17" location="408,48" title="没填诊断" tabindex="4"></DxCheckBox>
							<DxCheckBox id="checkbox2" size="81,17" location="496,48" title="没测血压" tabindex="5"></DxCheckBox>
							<DxCheckBox id="checkbox3" size="81,17" location="584,48" title="没测血糖" tabindex="6"></DxCheckBox>
							<DxCheckBox id="checkbox4" size="97,17" location="672,48" title="大于等于35岁" tabindex="7"></DxCheckBox>
	                  </item>
	                  
	                  <item align="left" command="select" image="/resources/normal/query.png" title="查询" type="button"/>
	                  <item align="left" command="reset" image="/resources/normal/reset.png" title="重置" type="button"/>
	                  
	                  <item align="left" command="export" image="/resources/normal/export.png"  color="#ffffff" bkcolor="#009688"  title="导出" type="button"/>
	                </DxPanelBar>
	            </col>
	        </row>
		    <row height="99">
		        <col>
		            <DxDataGrid ds="mzrztjdao"  id="dbgrid1" showfoot="true" size="100,100" unit="%,%">
		                <column   align="center"  fieldname="JJRQ" type="DATETIMESHOW_CELL"      width="120">就诊日期</column>
		                <column   align="center"  fieldname="JJYS" type="DICTIONARYLABEL_CELL"     dic="NAME:USERACCOUNT@jgrydicdao"   width="120">就诊医生</column>
		                <column   align="center"  fieldname="XM" type="LABEL_CELL"      width="120">姓名</column>
		                <column   align="center"  fieldname="XB" type="DICTIONARYLABEL_CELL"   dic="MC:BH@xbdao"    width="120">性别</column>
		                <column   align="center"  fieldname="JZNL" type="LABEL_CELL"      width="120">就诊年龄</column>
		                <column   align="center"  fieldname="ZJHM" type="LABEL_CELL"      width="180">证件号码</column>
		                <column   align="center"  fieldname="ZY" type="DICTIONARYLABEL_CELL"    dic="MC:BH@zyfldic"  width="120">职业</column>
		                <column   align="center"  fieldname="PHONE" type="LABEL_CELL"      width="120">联系电话</column>
		                <column   align="center"  fieldname="XZDZ" type="LABEL_CELL"      width="220">住址</column>
		                <column   align="center"  fieldname="MZNO" type="LABEL_CELL"      width="120">门诊号</column>
		                <column   align="center"  fieldname="jyjg" type="HTMLDISPLAY_CELL"   calc="true"    width="120">检验结果查询</column>
		                <column   align="center"  fieldname="JBBM" type="LABEL_CELL"      width="180">诊断编码</column>
		                <column   align="center"  fieldname="JBMC" type="LABEL_CELL"      width="180">诊断名称</column>
		                <column   align="center"  fieldname="JZZT" type="DICTIONARYLABEL_CELL"    dic="MC:BH@mzzdztdic"   width="120">确拟诊</column>
		                <column   align="center"  fieldname="JZZB" type="DICTIONARYLABEL_CELL"    mapjson="{C:初诊,F:复诊}"    width="120">诊别</column>
		                <column   align="center"  fieldname="FBSJ" type="DATETIMESHOW_CELL"      width="120">发病时间</column>
		                <column   align="center"  fieldname="SSY" type="LABEL_CELL"      width="120">收缩压</column>
		                <column   align="center"  fieldname="SZY" type="LABEL_CELL"      width="120">舒张压</column>
		                <column   align="center"  fieldname="XT" type="LABEL_CELL"      width="120">血糖</column>
		                <column   align="center"  fieldname="ZS" type="LABEL_CELL"      width="300">主诉</column>
		                <column   align="center"  fieldname="XBS" type="LABEL_CELL"      width="300">简要病史</column>
		                <column   align="center"  fieldname="CLCS" type="LABEL_CELL"      width="300">处理措施</column>
		            </DxDataGrid>	        
		        </col>
		    </row>
		    	    	    	    
		 </DxDIVGrid>

-
	<datasource>
	</datasource>
</window>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
<window size="927,550" title="门诊日志统计" controlbutton="false,false,true">
	<DxDIVGrid bkcolor="255,255,255" class="LayoutManager" location="0,0" size="100,100" unit="%,%">
		<row height="40" unit="px">
			<col>
				<DxPanelBar id="panelBar1" border-bottom="1px solid #b8ced7" border-top="1px solid #b8ced7" size="100,38" unit="%">
					<item align="left" autoExtend="false">
						<DxLabel id="label1" size="60,13" title="常用时段" />
						<DxComboBox id="combobox1" size="140,28" />
					</item>
					<item align="left" autoExtend="false">
						<DxLabel id="label2" size="60,13" title="开始日期" />
						<DxDateTimePick id="datetimepicker1" size="140,28" type="date" />
					</item>
					<item align="left" autoExtend="false">
						<DxLabel id="label3" size="60,13" title="结束日期" />
						<DxDateTimePick id="datetimepicker2" size="140,28" type="date" />
					</item>
					
	                  <item align="left" autoExtend="false">
	                      <DxLabel id="label5"  size="40,13"  title="科室"/>
	                      <DxPopGridText id="popgrid3" instantsearch="true"  popbutton="true" lds="DPTNAME:DPTID@kspopDao"  names="编码,名称,助记码" values="DPTID,DPTNAME,DPTZJM"  nulltip="请输入内容 " size="130,28" />
	                  </item>
	                   <item align="left">
                      <DxLabel id="label6"  size="96,13"  title="医生"/>
                      <DxPopGridText id="popgrid2" instantsearch="true"  frontcache="true" frontquery="true" frontquerystr="USERACCOUNT like '%@%' or NAME like '%@%' or PYM like '%@%' " lds="NAME:USERACCOUNT@jgrynokspopdao" names="姓名,帐号"  nulltip="请输入内容" values="NAME,USERACCOUNT" size="130,28" />
                  </item>
					<!-- <item align="left" autoExtend="false">
						<DxLabel id="label4" size="35,13" title="医院"/>
						<DxComboBox id="dblookupcombobox1" size="140,28" />
						</item>
						<item align="left">
						<DxLabel id="label4" size="96,13" title="类型"/>
						<DxComboBox id="combobox2" size="80,28" />
						</item> -->
				</DxPanelBar>
			</col>
		</row>
		<row height="40" unit="px">
			<col>
				<DxPanelBar id="panelBar2" size="100,38" unit="%">
					<item align="left" autoExtend="false">
						<DxLabel id="label5" size="60,13" title="诊断名称" />
						<DxPopGridText id="popgrid1" popbutton="true" frontquery="true" lds="JBMC:JBBM@gzzJbPopByFrontCacheForWesternDao" frontquerystr="PYM LIKE '%@%' OR WBM LIKE '%@%' OR JBMC like '%@%' or JBBM like '%@%' or JBNAME like '%@%'" dic="JBMC:JBBM@gzzJbDic" instantsearch="true" frontcache="true" ds=":jbbm@" names="编码,名称,别名" values="JBBM,JBMC,JBNAME" nulltip="请输入内容" chinese="true" onlyoneautoset="false" showdetail="false" size="140,28" tag="1" />
					</item>
					<item align="left" autoExtend="false">
						<DxLabel id="label6" size="60,13" title="病人姓名" />
						<DxCoolTextField id="edit1" size="140,28" tag="1" />
					</item>
					<item align="left" autoExtend="false">
						<DxCheckBox id="checkbox1" size="81,17" location="408,48" title="没填诊断" tabindex="4"></DxCheckBox>
						<DxCheckBox id="checkbox2" size="81,17" location="496,48" title="没测血压" tabindex="5"></DxCheckBox>
						<DxCheckBox id="checkbox3" size="81,17" location="584,48" title="没测血糖" tabindex="6"></DxCheckBox>
						<DxCheckBox id="checkbox4" size="97,17" location="672,48" title="大于等于35岁" tabindex="7"></DxCheckBox>
					</item>
					<item align="left" command="select" image="/resources/normal/query.png" title="查询" type="button" />
					<item align="left" command="reset" image="/resources/normal/reset.png" title="重置" type="button" />
					<item align="left" command="export" image="/resources/normal/export.png" color="#ffffff" bkcolor="#009688" title="导出" type="button" />
				</DxPanelBar>
			</col>
		</row>
		<row height="99">
			<col>
				<DxDataGrid ds="mzrztjdao" id="dbgrid1" showfoot="true" size="100,100" unit="%,%">
					<column align="center" fieldname="JJRQ" type="DATETIMESHOW_CELL" width="120">就诊日期</column>
					<column align="center" fieldname="JJYS" type="DICTIONARYLABEL_CELL" dic="NAME:USERACCOUNT@jgrydicdao" width="120">就诊医生</column>
					<column align="center" fieldname="XM" type="LABEL_CELL" width="120">姓名</column>
					<column align="center" fieldname="XB" type="DICTIONARYLABEL_CELL" dic="MC:BH@xbdao" width="120">性别</column>
					<column align="center" fieldname="JZNL" type="LABEL_CELL" width="120">就诊年龄</column>
					<column align="center" fieldname="ZJHM" type="LABEL_CELL" width="180">证件号码</column>
					<column align="center" fieldname="ZY" type="DICTIONARYLABEL_CELL" dic="MC:BH@zyfldic" width="120">职业</column>
					<column align="center" fieldname="PHONE" type="LABEL_CELL" width="120">联系电话</column>
					<column align="center" fieldname="XZDZ" type="LABEL_CELL" width="220">住址</column>
					<column align="center" fieldname="MZNO" type="LABEL_CELL" width="120">门诊号</column>
					<column align="center" fieldname="jyjg" type="HTMLDISPLAY_CELL" calc="true" width="120">检验结果查询</column>
					<column align="center" fieldname="JBBM" type="LABEL_CELL" width="180">诊断编码</column>
					<column align="center" fieldname="JBMC" type="LABEL_CELL" width="180">诊断名称</column>
					<column align="center" fieldname="JBMD" type="LABEL_CELL" width="60" calc="true">梅毒</column>
					<column align="center" fieldname="JBAZ" type="LABEL_CELL" width="60" calc="true">艾滋</column>
					<column align="center" fieldname="JBYG" type="LABEL_CELL" width="60" calc="true">乙肝</column>
					<column align="center" fieldname="JZZT" type="DICTIONARYLABEL_CELL" dic="MC:BH@mzzdztdic" width="120">确拟诊</column>
					<column align="center" fieldname="JZZB" type="DICTIONARYLABEL_CELL" mapjson="{C:初诊,F:复诊}" width="120">诊别</column>
					<column align="center" fieldname="FBSJ" type="DATETIMESHOW_CELL" width="120">发病时间</column>
					<column align="center" fieldname="SSY" type="LABEL_CELL" width="120">收缩压</column>
					<column align="center" fieldname="SZY" type="LABEL_CELL" width="120">舒张压</column>
					<column align="center" fieldname="XT" type="LABEL_CELL" width="120">血糖</column>
					<column align="center" fieldname="ZS" type="LABEL_CELL" width="300">主诉</column>
					<column align="center" fieldname="XBS" type="LABEL_CELL" width="300">简要病史</column>
					<column align="center" fieldname="CLCS" type="LABEL_CELL" width="300">处理措施</column>
				</DxDataGrid>
			</col>
		</row>
		<row height="15" unit="px">
			<col>
				<DxLabel id="label10" size="700,13" title="艾滋：诊断编码以“B20、B21、B22、B23”开头或名称包含“艾滋、HIV、人类免疫缺陷病毒、艾滋其他标识”" />
			</col>
		</row>
		<row height="15" unit="px">
			<col>
				<DxLabel id="label11" size="700,13" title="梅毒：诊断编码以“A50、A51、A52、A53”开头或名称包含“梅毒、梅毒其他标识”" />
			</col>
		</row>
		<row height="15" unit="px">
			<col>
				<DxLabel id="label12" size="700,13" title="乙肝：诊断编码以“B16、B18.0、B18.1”开头或名称包含“乙肝、乙肝其他标识" />
			</col>
		</row>
	</DxDIVGrid>
	<datasource>
	</datasource>
</window>
\ No newline at end of file
diff --git a/release/20241225_1153.text b/release/20241225_1153.text
index 5fff96b..a29b5fe 100644
--- a/release/20241225_1153.text
+++ b/release/20241225_1153.text
@@ -39,6 +39,9 @@ develop/lyx_20241224_bbtj
 ...........................................................................................................................................
 
 <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+develop/xl_20241225_bbxg1
+
+门诊日志统计：增加乙梅爱标识、科室医生过滤条件、乙梅爱注释
 ...........................................................................................................................................
 
 <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<