1.传染病报卡选项增加再次点击取消选择

2.处方点评统计优化

WEB-INF/conf/sysds_his.xml

@@ -4643,6 +4643,7 @@
 			where JGID=? 
 			AND ( YNZT='0' OR YNZT='1') 
 			AND CJRQ BETWEEN ? AND ? 
+			AND SBZT like ?
 			ORDER BY CJRQ DESC
 		</sql>
 		<tables>
@@ -4750,6 +4751,7 @@
 			<p>12</p>
 			<p>93</p>
 			<p>93</p>
+			<p>12</p>
 		</parameter>
 	</dao>
 	<dao id="crb_infodao_bypkey" log="true" type="1">

WEB-INF/src/com/his/crb/CrbManager.java

@@ -9,10 +9,8 @@ package com.his.crb;

import java.io.StringReader;
import java.sql.Timestamp;
im
 	private DxLabel label2;
 	private DxLabel label3;
 	private DxLabel label4;
-	private DxComboBox combobox1;
	private DxComboBox combobox2;
    private DxDateTimePick datetimepicker1;
    private DxDateTimePick datetimepicker2;
-

	public CrbManager() {
		super();
	}

	public static CrbManager newWindow() {
		return (CrbManager) WatForm.newWindow(CrbManager.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();
		

		combobox1.setSelectedIndex(3);   
		changetime();
		
		/* 系统自动生成，用于lds和dic中的需要参数的dao的初始化装载数据，默认参数填入机构参数，请根据实际情况修改参数*/
+	private DxComboBox combobox1;
	private DxComboBox combobox2;
	private DxComboBox combobox3;
    private DxDateTimePick datetimepicker1;
    private DxDateTimePick datetimepicker2;
+

	public CrbManager() {
		super();
	}

	public static CrbManager newWindow() {
		return (CrbManager) WatForm.newWindow(CrbManager.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");
		
		

		combobox3.addItem("全部", "%");
		combobox3.addItem("待上报", "0");
		combobox3.addItem("待审核", "1");
		combobox3.addItem("审核通过", "2");
	}


	public void beforeShowLoad() {
		super.beforeShowLoad();
		

		combobox3.setSelectedIndex(0);   
		combobox1.setSelectedIndex(3);   
		changetime();
		
		/* 系统自动生成，用于lds和dic中的需要参数的dao的初始化装载数据，默认参数填入机构参数，请根据实际情况修改参数*/
 		DxNormalDataManager jgrydicdao = DaoCreator.getNormalDao(this,"jgrydicdao");
		jgrydicdao.setNormalParameters(new Object[]{MainUtil.getCurCompanyID()});
		jgrydicdao.reloadByDictionary("NAME", "USERACCOUNT");
		DxNormalDataManager xbdao = DaoCreator.getNormalDao(this,"xbdao");
		xbdao.reloadByDictionary("MC", "BH");
 		DxNormalDataManager sc_crb_sbztdao = DaoCreator.getNormalDao(this,"sc_crb_sbztdao");
		sc_crb_sbztdao.reloadByDictionary("MC", "BH");
 		DxNormalDataManager sc_crb_byztdao = DaoCreator.getNormalDao(this,"sc_crb_byztdao");
		sc_crb_byztdao.reloadByDictionary("MC", "BH");

		DxNormalDataManager regiondic  = DaoCreator.getNormalDao(this,"regiondic");
		regiondic.reloadByDictionary("CNAME", "CODE");
		
		panelBar3selectAction();
		
@@ -44,7 +42,7 @@ package com.his.crb;

import java.io.StringReader;
import java.sql.Timestamp;
im
 
	private String CrbResponse(String strXml) {
		
//		strXml="<?xml version=\"1.0\" encoding=\"UTF-8\"?>\r"
//				+ "<DataExchange>\r"
//				+ "	<eventBody>\r"
//				+ "		<fileName>01-513434003-20240427120500535</fileName>\r"
//				+ "		<result>true</result>\r"
//				+ "		<ids>\r"
//				+ "			<diseaseInfo>\r"
//				+ "				<CardCode>513434003-2024-00067</CardCode>\r"
//				+ "				<Id>2404271233750820186259456</Id>\r"
//				+ "				<CardId>1233750820186259456</CardId>\r"
//				+ "			</diseaseInfo>\r"
//				+ "		</ids>\r"
//				+ "		<receiveTime>2024-04-27 12:05:17</receiveTime>\r"
//				+ "		<msgStatus> 发送成功</msgStatus>\r"
//				+ "	</eventBody>\r"
//				+ "</DataExchange>";
		
		try {
			//初始化
			//创建一个新的字符串
			StringReader stringReader = new StringReader(strXml);
			//创建新的输入源SAX 解析器将使用 InputSource 对象来确定如何读取 XML 输入
			InputSource inputSource = new InputSource(stringReader);
			//创建一个新的SAXBuilder
			SAXBuilder saxBuilder = new SAXBuilder();
			//通过输入源构造一个Document
			Document document = saxBuilder.build(inputSource);
			//取的根元素
			Element eleRoot = document.getRootElement();
			//System.err.println("1"+eleRoot.getName());
			//System.err.println("1"+eleRoot.getValue());
			Element eventBody=eleRoot.getChild("eventBody");
			Element ids=eventBody.getChild("ids");
			Element diseaseInfo=ids.getChild("diseaseInfo");
			String CardId=diseaseInfo.getChild("CardId").getValue();
			System.err.println(CardId);
			return CardId;
		} catch (Exception e) {
			// TODO: handle exception
			return "";
		}
	}
	
	
 	private void panelBar1lookAction() {
		String jgid=MainUtil.getCurCompanyID();
		String pkey=dbgrid1.getColumnValueAsString(dbgrid1.getSelectedRow(), "PKEY");
		DxNormalDataManager crbdata = DaoCreator.getNormalDao(this,"crbupdao");
		crbdata.reload(new Object[] {jgid,pkey});
		JSONObject rJson=new JSONObject();
		System.err.println(GzzNPCService.getInstance(jgid).crhsbhj());
		rJson.put("env", GzzNPCService.getInstance(jgid).crhsbhj());
		rJson.put("content", crbdata.getColumnValueAsString("EVENTID"));
		rJson.put("method","getChinaXml");
		String result=sendPost("http://10.35.0.62:8093/crbrquest/crbsb",rJson.toString());
		if(Delphi.isNullString(result)) {
			dlg.messageDlg("获取失败，请联系管理员");
		}else {
			try {
				JSONObject result_Json=new JSONObject(result);
				System.out.println(result_Json.toString());
				String data =result_Json.getString("data");
				System.err.println(data);
				if("0".equals(result_Json.getString("code"))) {
					if (data.contains("error-code")) {
						org.json.JSONObject object = XML.toJSONObject(data);
						System.err.println(object.toString());
						String errormsg=object.getJSONObject("DataExchange").getJSONObject("eventBody").getJSONObject("desc").getString("error-msg");
						String errordesc=object.getJSONObject("DataExchange").getJSONObject("eventBody").getJSONObject("desc").getString("error-desc");
						dlg.messageDlg("获取失败【"+errormsg+"】【"+errordesc+"】");
						return;
					}	
					
					
					DxNormalDataManager crb_infodao = (DxNormalDataManager)DaoCreator.getNormalDao(this,"crb_infodao_bypkey");
					crb_infodao.reload(new Object[] {jgid,pkey});
					crb_infodao.setColumnValue("SBZT","2");
					String CARDID = CrbResponse(data);
					if (Delphi.isNullString(CARDID)) {
						dlg.messageDlg("未获取到卡ID，国家结果返回有延迟，请稍等再重新获取！");
						return;
					}
					crb_infodao.setColumnValue("CARDID",CARDID);
					if(crb_infodao.commit()) {
						dlg.messageDlg("获取成功！");
					}else {
						dlg.messageDlg("获取成功，但是his保存失败！");
					}
				}else {
					dlg.messageDlg("获取失败【"+result_Json.getString("msg")+"】");
				}
			} catch (Exception e) {
				e.printStackTrace();
			}
		}
	}
 
-	private void panelBar1selectAction() {
		dbgrid1.setParameters(new Object[]{MainUtil.getCurCompanyID(),datetimepicker1.getTimeStamp(),datetimepicker2.getTimeStamp()});
		dbgrid1.reloadBySelect(this.getXmlSelectControl("s1"));
	}
+	private void panelBar1selectAction() {
		dbgrid1.setParameters(new Object[]{MainUtil.getCurCompanyID(),datetimepicker1.getTimeStamp(),datetimepicker2.getTimeStamp(),combobox3.getSelectedItem().getValue()});
		dbgrid1.reloadBySelect(this.getXmlSelectControl("s1"));
	}
 
 	private void panelBar1commitAction() {
		if(MainUtil.getFunctionValue((String)this.getWinParams("formid"), "Post").equals("0")){
			setLabelShow("提示:当前模块未开通该功能项,不允许操作!");
			return;
		}
		if(MainUtil.getUserAuthorityValues((String)this.getWinParams("formid"), "Post")==0){
			setLabelShow("提示:你没有该功能项权限,不允许操作!");
			return;
		}		
		if(!dbgrid1.hasDataChanged()) {
			setLabelShow("没有数据修改，不需要提交");
			return;
		}
		/*dml操作日志,也可以在dao的xml里面设置log="true",这样就不用在这里进行设置了*/
		MainLog.registerLogDao(dbgrid1.getDataObjectManager());		
		/**/		
		if(dbgrid1.commit()) {
			setLabelShow("保存成功");
		}else{
			setLabelShow("保存失败");
		}
	}
 
@@ -55,7 +53,7 @@ package com.his.crb;

import java.io.StringReader;
import java.sql.Timestamp;
im
 		}else if("reset".equals(command)) {
 			panelBar3resetAction();
 		}
	}
-	private void panelBar3selectAction() {
		dbgrid1.setParameters(new Object[]{MainUtil.getCurCompanyID(),datetimepicker1.getTimeStamp(),datetimepicker2.getTimeStamp()});
		dbgrid1.reloadBySelect(this.getXmlSelectControl("s1"));
	}
+	private void panelBar3selectAction() {
		dbgrid1.setParameters(new Object[]{MainUtil.getCurCompanyID(),datetimepicker1.getTimeStamp(),datetimepicker2.getTimeStamp(),combobox3.getSelectedItem().getValue()});
		dbgrid1.reloadBySelect(this.getXmlSelectControl("s1"));
	}
 
 	private void panelBar3resetAction() {
		edit1.setText("");
 		edit2.setText("");

WEB-INF/src/com/his/mz/cfdp/manage/CfdpHzCountForm.java

@@ -1,4 +1,4 @@
-package com.his.mz.cfdp.manage;

import java.text.SimpleDateFormat;
import java.util.Calendar;
import com.util.ApiUrlUtil;
import com.util.ApiUrlUtil.ServerType;
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.DxURLPage;
import com.wat.component.coolcomponent.DxCoolTab;
import com.wat.component.coolcomponent.DxCoolTextField;
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 CfdpHzCountForm extends WatWebForm {
    private DxDateTimePick datetimepicker1;
+package com.his.mz.cfdp.manage;

import java.text.SimpleDateFormat;
import java.util.Calendar;
import com.util.ApiUrlUtil;
import com.util.ApiUrlUtil.ServerType;
import com.util.MainUtil;
import com.util.SnowIdUtils;
import com.wat.component.DxCheckBox;
import com.wat.component.DxComboBox;
import com.wat.component.DxDateTimePick;
import com.wat.component.DxPanelBar;
import com.wat.component.DxURLPage;
import com.wat.component.coolcomponent.DxCoolTab;
import com.wat.component.coolcomponent.DxCoolTextField;
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 CfdpHzCountForm extends WatWebForm {
    private DxDateTimePick datetimepicker1;
     private DxDateTimePick datetimepicker2;
     private DxPanelBar panelBar1;
     private DxPanelBar panelBar2;
@@ -8,7 +8,7 @@ package com.his.mz.cfdp.manage;

import java.text.SimpleDateFormat;
import java.
 	

		combobox4.addItem("全部", "0");
		combobox4.addItem("抗菌", "1");
		combobox4.addItem("注射", "2");
		combobox4.addItem("基本", "3");
		
		
		dbedit1.setText("50");
		
		
	}


	public void beforeShowLoad() {
		super.beforeShowLoad();
		combobox1.setSelectedIndex(0);
		combobox2.setSelectedIndex(0);
		combobox3.setSelectedIndex(0);
		combobox4.setSelectedIndex(0);
		changetime();

		panelBar2selectAction();
		

	}

    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());
		}
    }
    
	public void modalFunction(int flag, Object para) {
		if(flag == 110) {
		}
	}
	
    private void panelBar2Action(String command) {
        if("select".equals(command)) {
             panelBar2selectAction();
         }else if("export".equals(command)) {
            panelBar2exportAction();
        }
    }
    
    private void panelBar2exportAction() {

//		if (combobox2.getSelectedIndex()==0) {
//			
//	    	dbgrid1.exportExcelByXls("门诊处方点评统计表",Delphi.getDateTimeStr(datetimepicker1.getTime())+"至"+Delphi.getDateTimeStr(datetimepicker2.getTime()));
//		}else {
//	    	dbgrid2.exportExcelByXls("住院处方点评统计表",Delphi.getDateTimeStr(datetimepicker1.getTime())+"至"+Delphi.getDateTimeStr(datetimepicker2.getTime()));
//		}
    	
    }
    
    
-	private void panelBar2selectAction() {
        long begin = datetimepicker1.getStartDay();
        long end = datetimepicker2.getEndDay();
        if(begin > end) {
    	   setLabelShow("提示:起始日期不能大于结束日期");
    	   return;
        }
        DxNormalDataManager jimuReportServerAddrDao = DaoCreator.getNormalDao(this,"jimuReportServerAddrDao");
        jimuReportServerAddrDao.reload();
        String addr = jimuReportServerAddrDao.getColumnValueAsString("REPORTADDR");
        addr = ApiUrlUtil.getApiUrl(ServerType.JMVIEW, "%", addr);//地址转换
        if(Delphi.isNullString(addr)) {
        	setLabelShow("提示:请设置积木报表服务器地址");
        	return;
        }
		SimpleDateFormat sdFormat=new SimpleDateFormat("yyyyMMddHHmmss");
		
		String dpsj="1";//是否点评日期
		String cfsj="1";//是否处方日期
		String sj="1";//随机
		String sjs=dbedit1.getText();//随机数
		if (combobox3.getSelectedIndex()==0) {
			dpsj="1";
			cfsj="2";
		}else {
			dpsj="2";
			cfsj="1";
		}
		if (checkbox1.isSelected()) {
			sj="0";
		}
		
1";
1";
1";
1";
			cfsj="2";
1";
		}else {
1";
			dpsj="2";
1";
			cfsj="1";
1";
		}
1";
		if (checkbox1.isSelected()) {
			kj="2";
1";
			cfsj="1";
1";
		}
1";
		
			kj="1";
			cfsj="2";
1";
		}
		}else if (combobox4.getSelectedIndex()==3) {
1";
			dpsj="2";
1";
			cfsj="1";
			cfsj="2";
			cfsj="2";
		}
		
		
		
			cfsj="2";
		}else {
			cfsj="2";
			dpsj="2";
			cfsj="2";
			cfsj="1";
			cfsj="2";
		}
			cfsj="2";
		if (checkbox1.isSelected()) {
			cfsj="2";
			sj="0";
			cfsj="2";
		
		}else {
		}else {
		}
		
		
		}else {
1";
		}else {
1";
		}else {
			cfsj="2";
		}else {
		}else {
		}else {
			dpsj="2";
		}else {
			cfsj="1";
		}else {
		}
		}else {
		if (checkbox1.isSelected()) {
		}else {
			sj="0";
		}else {
		}
//		}else {
			dpsj="2";
			dpsj="2";
1";
			dpsj="2";
			cfsj="2";
		}else {
		}
			dpsj="2";
		}else {
			dpsj="2";
			dpsj="2";
			dpsj="2";
			cfsj="1";
			dpsj="2";
		}
		//dbgrid2.setVisible(false);
			dpsj="2";
			sj="0";
	}
+	private void panelBar2selectAction() {
        long begin = datetimepicker1.getStartDay();
        long end = datetimepicker2.getEndDay();
        if(begin > end) {
    	   setLabelShow("提示:起始日期不能大于结束日期");
    	   return;
        }
        DxNormalDataManager jimuReportServerAddrDao = DaoCreator.getNormalDao(this,"jimuReportServerAddrDao");
        jimuReportServerAddrDao.reload();
        String addr = jimuReportServerAddrDao.getColumnValueAsString("REPORTADDR");
        addr = ApiUrlUtil.getApiUrl(ServerType.JMVIEW, "%", addr);//地址转换
        if(Delphi.isNullString(addr)) {
        	setLabelShow("提示:请设置积木报表服务器地址");
        	return;
        }
		SimpleDateFormat sdFormat=new SimpleDateFormat("yyyyMMddHHmmss");
		
		String dpsj="1";//是否点评日期
		String cfsj="1";//是否处方日期
		String sj="1";//随机
		String sjs=dbedit1.getText();//随机数
		if (combobox3.getSelectedIndex()==0) {
			dpsj="2";
			cfsj="1";
1";
			cfsj="1";
			cfsj="2";
			cfsj="1";
		}else {
			cfsj="1";
			dpsj="2";
			cfsj="1";
			cfsj="1";
			cfsj="1";
		}
			cfsj="1";
		if (checkbox1.isSelected()) {
		}
		
			cfsj="1";
		
		}
		}
1";
		}
			cfsj="2";
		}
		}else {
		}
			dpsj="2";
		}
			cfsj="1";
		}
		}
		}
		if (checkbox1.isSelected()) {
			zs="1";
		}
			cfsj="1";
		}else if (combobox4.getSelectedIndex()==2) {
		}
		}else {
		}
		
			jb="1";
		if (checkbox1.isSelected()) {
		}
		}else {
		}
			dpsj="2";
		if (checkbox1.isSelected()) {
1";
			cfsj="1";
			cfsj="1";
		
		
		
		if (checkbox1.isSelected()) {
			cfsj="2";


			//是否随机
			if ("0".equals(sj)) {
		if (checkbox1.isSelected()) {
		}
		        cfdp_sjdao.reload(new Object[] {MainUtil.getCurCompanyID(),MainUtil.getCurUserAccount()});
		        cfdp_sjdao.deleteAll();

		if (checkbox1.isSelected()) {
		
		        cfdp_mzdptjdao.reload(new Object[] {MainUtil.getCurCompanyID(),
		        		dpsj,datetimepicker1.getTimeStamp(),datetimepicker2.getTimeStamp(),
			sj="0";
			cfsj="2";
			sj="0";
		}else {
			sj="0";
			dpsj="2";
			sj="0";
			cfsj="1";
			sj="0";
		}
			sj="0";
		if (checkbox1.isSelected()) {
		        	System.err.println(cfdp_mzdptjdao.getColumnValueAsString(i,"PKEY"));
			sj="0";
		
		
		        	cfdp_sjdao.setColumnValue("ZBPKEY", cfdp_mzdptjdao.getColumnValueAsString(i,"PKEY"));
		        	cfdp_sjdao.setColumnValue("JGID", MainUtil.getCurCompanyID());
		
		}else {
		        	cfdp_sjdao.setColumnValue("CFH", cfdp_mzdptjdao.getColumnValueAsString(i,"CFH"));
				}
		
		}
		
		if (checkbox1.isSelected()) {
		
			sj="0";
	        report.setHttpURL(addr+"1028527664797315072"+"?JGID="+MainUtil.getCurCompanyID()+
1";
		String kj="1";//抗菌处方
1";
		String kj="1";//抗菌处方
			cfsj="2";
		String kj="1";//抗菌处方
		}else {
		String kj="1";//抗菌处方
			dpsj="2";
		if (checkbox1.isSelected()) {
		}else {
		String kj="1";//抗菌处方
			cfsj="1";
	        
		}else {
			
			//是否随机
			if ("0".equals(sj)) {
		if (checkbox1.isSelected()) {
		}
		if (checkbox1.isSelected()) {
		if (checkbox1.isSelected()) {
		if (checkbox1.isSelected()) {
			sj="0";
		if (checkbox1.isSelected()) {
		}else {
		String kj="1";//抗菌处方
		}
		        cfdp_zydptjdao.reload(new Object[] {MainUtil.getCurCompanyID(),
1";
			sj="0";
			sj="0";
			dpsj="2";
		        });
		        
1";
		
		        	System.err.println(cfdp_zydptjdao.getColumnValueAsString(i,"PKEY"));
		        	cfdp_sjdao.absolute(cfdp_sjdao.insert(cfdp_sjdao.getRowCount()));
		        	cfdp_sjdao.setColumnValue("PKEY", SnowIdUtils.uniqueLong());
		        	cfdp_sjdao.setColumnValue("ZBPKEY", cfdp_zydptjdao.getColumnValueAsString(i,"PKEY"));
		
			cfsj="2";
		
		}else {
		        	cfdp_sjdao.setColumnValue("CFH", cfdp_zydptjdao.getColumnValueAsString(i,"CFH"));
				}
		
		}
			}
			
			
			
		String zs="1";//注射处方
		}else {
		String zs="1";//注射处方
			dpsj="2";
		String zs="1";//注射处方
			cfsj="1";
		String zs="1";//注射处方
		}
		}
			cfsj="1";
			sj="0";
	}
 
 	private void closeAction() {
		if("true".equals(getWinParams("saveflag"))) {
			this.doModalCallbackAction(null);
		}
	}
	
	private void combobox2Action() {
		if (combobox2.getSelectedIndex()==1) {
			combobox3.setSelectedIndex(0);
			combobox4.setSelectedIndex(0);
			combobox3.setEnabled(false);
			combobox4.setEnabled(false);
			checkbox1.setSelected(false);
		}else {
			combobox3.setEnabled(true);
			combobox4.setEnabled(true);
		}
	}
	 
	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();
			}
		});
		
		combobox2.addActionListener(new ActionListener(){
			public void actionPerformed(ActionEvent actionevent) {
				combobox2Action();
			}
		});
		
	}
}

WEB-INF/src/com/his/mz/cfdp/manage/CfdpHzCountForm.xml

@@ -115,83 +115,88 @@
 
 	<datasource>
 		
-	
-    <dao id="mzdptjdao" log="true"  type="1">
+    <dao id="cfdp_sjdao" log="true"  type="1">
         <sql>
-        SELECT distinct dp.CFH ,dp.CZRQ,a.JZNL ,
-		(SELECT LISTAGG(zd.JBMC,';') WITHIN GROUP (ORDER BY zd.JBBM) FROM HIS_JZ_MZZD zd WHERE zd.JGID =dp.JGID AND zd.HZPKEY =dp.HZPKEY AND zd.JZPKEY =dp.JZPKEY AND  zd.ZDLX='003')  zdmc,
-		dp.YPPZS ,dp.KJYPZS,
-		decode(nvl(dp.KJYPZS,0),0,'0','1') kjy,
-		decode(nvl(dp.ZSYPZS,0),0,'0','1') zsj,
-		dp.JBYPZS ,dp.YPTYMS ,dp.YPZJE ,dp.JBYWJE ,dp.KJYWJE ,mx.YZXZYS ,ys.NAME cfys,dp.CZR ,cz.NAME shr,
-		decode(nvl(dp.CFDPZT,'null'),'0','合理','1','不合理') hlzt ,
-		(SELECT LISTAGG(zd.mc,'') WITHIN GROUP (ORDER BY zd.BH)  FROM HIS_CFDP_ZB_BM bm left join MAIN_ZDB zd on zd.ZDZB_BH = 'CFDP01' and zd.BH = bm.CODE WHERE bm.JGID=dp.JGID AND bm.DPZBPKEY=dp.PKEY AND bm.CODE!='0') dpmc,
-		(SELECT LISTAGG(wz.MESSAGE,';') WITHIN GROUP (ORDER BY wz.MESSAGE)  FROM HIS_CFDP_ZB_WZ wz WHERE wz.JGID=dp.JGID AND wz.DPZBPKEY=dp.PKEY) dpwz,
-		(SELECT LISTAGG(zd.BH,';') WITHIN GROUP (ORDER BY zd.BH)  FROM HIS_CFDP_ZB_BM bm left join MAIN_ZDB zd on zd.ZDZB_BH = 'CFDP01' and zd.BH = bm.CODE WHERE bm.JGID=dp.JGID AND bm.DPZBPKEY=dp.PKEY AND bm.CODE!='0') dpbm, 
-		'处方点评' cfly,mx.YZZXKS fy,yf.DPTNAME fyname,mx.YZLX,mx.YZXZKS ks,ks.DPTNAME ksname
-		FROM HIS_CFDP_ZB dp
-		LEFT JOIN HIS_JZ_BASEINFO a ON dp.JGID = a.JGID AND dp.JZPKEY = a.PKEY 
-		LEFT JOIN HIS_HZINFO b ON dp.JGID = b.JGID AND dp.HZPKEY = b.PKEY 
-		LEFT JOIN HIS_YZ_MXB mx ON dp.JGID=mx.JGID AND dp.CFH=mx.CFH AND (mx.yzlb='01' or mx.yzlb='02' or mx.yzlb='03')
-		LEFT JOIN MAIN_YHXX ys ON mx.YZXZYS=ys.USERACCOUNT
-		LEFT JOIN MAIN_YHXX cz ON dp.CZR=cz.USERACCOUNT
-		LEFT JOIN MAIN_KS yf ON mx.YZZXKS=yf.DPTID AND mx.JGID=yf.JGID
-		LEFT JOIN MAIN_KS ks ON mx.YZXZKS=ks.DPTID AND mx.JGID=ks.JGID
-		WHERE dp.CFDPZT IS NOT NULL AND a.jzlx='M'
-		AND dp.JGID=? 
-		AND dp.CZRQ between ? and ?
+                select PKEY,ZBPKEY,JGID,CZR,CFH from HIS_CFDP_SJ where JGID=? and CZR =?
         </sql>
-//CFH,CZRQ,JZNL,ZDMC,YPPZS,KJYPZS,KJY,ZSJ,JBYPZS,YPTYMS,YPZJE,JBYWJE,KJYWJE,YZXZYS,CFYS,CZR,SHR,HLZT,DPMC,DPWZ,DPBM,CFLY,FY,FYNAME,YZLX,KS,KSNAME
+        <tables>
+            <table name="HIS_CFDP_SJ" insert="true" update="true" delete="true">
+                <primary>PKEY</primary>
+                <primary>ZBPKEY</primary>
+                <primary>JGID</primary>
+                <primary>CZR</primary>
+            </table>
+        </tables>
+//PKEY,JGID,CZR
         <fields>
+            <f name="PKEY"  type="12"  table="HIS_CFDP_SJ" />
+            <f name="ZBPKEY"  type="12"  table="HIS_CFDP_SJ" />
+            <f name="JGID"  type="12"  table="HIS_CFDP_SJ" />
+            <f name="CZR"  type="12"  table="HIS_CFDP_SJ" />
+            <f name="CFH"  type="12"  table="HIS_CFDP_SJ" />
+        </fields>
+        <parameter>
+            <p>12</p>
+            <p>12</p>
+        </parameter>
+    </dao>
+
+	
+    <dao id="cfdp_mzdptjdao" log="true"  type="1">
+        <sql><![CDATA[
+			SELECT 
+			PKEY,CFH,CZRQ,JZNL
+			FROM (
+			        SELECT distinct dp.pkey,dp.CFH ,dp.CZRQ,a.JZNL
+					FROM HIS_CFDP_ZB dp
+					LEFT JOIN HIS_JZ_BASEINFO a ON dp.JGID = a.JGID AND dp.JZPKEY = a.PKEY 
+					LEFT JOIN HIS_HZINFO b ON dp.JGID = b.JGID AND dp.HZPKEY = b.PKEY 
+					LEFT JOIN HIS_YZ_MXB mx ON dp.JGID=mx.JGID AND dp.CFH=mx.CFH AND (mx.yzlb='01' or mx.yzlb='02' or mx.yzlb='03')
+					LEFT JOIN MAIN_YHXX ys ON mx.YZXZYS=ys.USERACCOUNT
+					LEFT JOIN MAIN_YHXX cz ON dp.CZR=cz.USERACCOUNT
+					LEFT JOIN MAIN_KS yf ON mx.YZZXKS=yf.DPTID AND mx.JGID=yf.JGID
+					LEFT JOIN MAIN_KS ks ON mx.YZXZKS=ks.DPTID AND mx.JGID=ks.JGID
+					WHERE dp.CFDPZT IS NOT NULL AND a.jzlx='M' 
+					AND dp.JGID=?
+					AND (1=? OR (dp.CZRQ between ? AND ?))
+					AND (1=? OR (mx.YZXZSJ between ? AND ?))
+					AND (1=? OR nvl(dp.KJYPZS,0)>0)
+					AND (1=? OR nvl(dp.ZSYPZS,0)>0)
+					AND (1=? OR nvl(dp.JBYPZS,0)>0)
+					ORDER BY dbms_random.value
+					) WHERE  1=1 AND (1=? OR rownum<=?)
+        ]]></sql>
+//PKEY,CFH,CZRQ,JZNL,ZDMC,YPPZS,KJYPZS,KJY,ZSJ,JBYPZS,YPTYMS,YPZJE,JBYWJE,KJYWJE,YZXZYS,CFYS,CZR,SHR,HLZT,DPMC,DPWZ,DPBM,CFLY,FY,FYNAME,YZLX,KS,KSNAME,YZXZSJ
+        <fields>
+            <f name="PKEY"  type="12"  />
             <f name="CFH"  type="12"  />
             <f name="CZRQ"  type="93"  />
             <f name="JZNL"  type="12"  />
-            <f name="ZDMC"  type="12"  />
-            <f name="YPPZS"  type="4"  />
-            <f name="KJYPZS"  type="4"  />
-            <f name="KJY"  type="12"  />
-            <f name="ZSJ"  type="12"  />
-            <f name="JBYPZS"  type="4"  />
-            <f name="YPTYMS"  type="4"  />
-            <f name="YPZJE"  type="8"  />
-            <f name="JBYWJE"  type="8"  />
-            <f name="KJYWJE"  type="8"  />
-            <f name="YZXZYS"  type="12"  />
-            <f name="CFYS"  type="12"  />
-            <f name="CZR"  type="12"  />
-            <f name="SHR"  type="12"  />
-            <f name="HLZT"  type="12"  />
-            <f name="DPMC"  type="12"  />
-            <f name="DPWZ"  type="12"  />
-            <f name="DPBM"  type="12"  />
-            <f name="CFLY"  type="1"  />
-            <f name="FY"  type="12"  />
-            <f name="FYNAME"  type="12"  />
-            <f name="YZLX"  type="12"  />
-            <f name="KS"  type="12"  />
-            <f name="KSNAME"  type="12"  />
         </fields>
-		<parameter>
-			<p>12</p>
-			<p>93</p>
-			<p>93</p>
-		</parameter>
+        <parameter>
+            <p>12</p>
+            <p>12</p>
+            <p>93</p>
+            <p>93</p>
+            <p>12</p>
+            <p>93</p>
+            <p>93</p>
+            <p>12</p>
+            <p>12</p>
+            <p>12</p>
+            <p>12</p>
+            <p>12</p>
+        </parameter>
     </dao>
+
     
-    <dao id="zydptjdao" log="true"  type="1">
-        <sql>
-		SELECT distinct a.zyno CFH ,dp.CZRQ,a.JZNL ,
-		(SELECT LISTAGG(zd.JBMC,';') WITHIN GROUP (ORDER BY zd.JBBM) FROM HIS_JZ_MZZD zd WHERE zd.JGID =dp.JGID AND zd.HZPKEY =dp.HZPKEY AND zd.JZPKEY =dp.JZPKEY AND  zd.ZDLX='001')  ryzdmc,
-		(SELECT LISTAGG(zd.JBMC,';') WITHIN GROUP (ORDER BY zd.JBBM) FROM HIS_JZ_MZZD zd WHERE zd.JGID =dp.JGID AND zd.HZPKEY =dp.HZPKEY AND zd.JZPKEY =dp.JZPKEY AND  zd.ZDLX='002')  cyzdmc,
-		dp.YPPZS ,dp.KJYPZS,
-		decode(nvl(dp.KJYPZS,0),0,'0','1') kjy,
-		decode(nvl(dp.ZSYPZS,0),0,'0','1') zsj,
-		dp.JBYPZS ,dp.YPTYMS ,dp.YPZJE ,dp.JBYWJE ,dp.KJYWJE ,mx.YZXZYS ,ys.NAME cfys,dp.CZR ,cz.NAME shr,
-		decode(nvl(dp.CFDPZT,'null'),'0','合理','1','不合理') hlzt ,
-		(SELECT LISTAGG(zd.mc,'') WITHIN GROUP (ORDER BY zd.BH)  FROM HIS_CFDP_ZB_BM bm left join MAIN_ZDB zd on zd.ZDZB_BH = 'CFDP01' and zd.BH = bm.CODE WHERE bm.JGID=dp.JGID AND bm.DPZBPKEY=dp.PKEY AND bm.CODE!='0') dpmc,
-		(SELECT LISTAGG(wz.MESSAGE,';') WITHIN GROUP (ORDER BY wz.MESSAGE)  FROM HIS_CFDP_ZB_WZ wz WHERE wz.JGID=dp.JGID AND wz.DPZBPKEY=dp.PKEY) dpwz,
-		(SELECT LISTAGG(zd.BH,';') WITHIN GROUP (ORDER BY zd.BH)  FROM HIS_CFDP_ZB_BM bm left join MAIN_ZDB zd on zd.ZDZB_BH = 'CFDP01' and zd.BH = bm.CODE WHERE bm.JGID=dp.JGID AND bm.DPZBPKEY=dp.PKEY AND bm.CODE!='0') dpbm, 
-		'处方点评' cfly,mx.YZZXKS fy,yf.DPTNAME fyname,mx.YZLX,mx.YZXZKS ks,ks.DPTNAME ksname
+    
+    <dao id="cfdp_zydptjdao" log="true"  type="1">
+        <sql><![CDATA[
+	SELECT 
+	PKEY,CFH,CZRQ,JZNL
+	FROM (
+		SELECT distinct dp.pkey,a.zyno CFH ,dp.CZRQ,a.JZNL
 		FROM HIS_CFDP_ZB dp
 		LEFT JOIN HIS_JZ_BASEINFO a ON dp.JGID = a.JGID AND dp.JZPKEY = a.PKEY 
 		LEFT JOIN HIS_HZINFO b ON dp.JGID = b.JGID AND dp.HZPKEY = b.PKEY 
@@ -201,44 +206,23 @@
 		LEFT JOIN MAIN_KS yf ON mx.YZZXKS=yf.DPTID AND mx.JGID=yf.JGID
 		LEFT JOIN MAIN_KS ks ON mx.YZXZKS=ks.DPTID AND mx.JGID=ks.JGID
 		WHERE dp.CFDPZT IS NOT NULL AND a.jzlx='Z'
-		AND dp.JGID=? 
-		AND dp.CZRQ between ? and ?
-        </sql>
+		AND dp.JGID=? AND dp.CZRQ between  ? AND  ?
+	ORDER BY dbms_random.value
+	) WHERE  1=1 AND (1=? OR rownum<=?)
+        ]]></sql>
 //CFH,CZRQ,JZNL,ZDMC,YPPZS,KJYPZS,KJY,ZSJ,JBYPZS,YPTYMS,YPZJE,JBYWJE,KJYWJE,YZXZYS,CFYS,CZR,SHR,HLZT,DPMC,DPWZ,DPBM,CFLY,FY,FYNAME,YZLX,KS,KSNAME
         <fields>
+            <f name="PKEY"  type="12"  />
             <f name="CFH"  type="12"  />
             <f name="CZRQ"  type="93"  />
             <f name="JZNL"  type="12"  />
-            <f name="RYZDMC"  type="12"  />
-            <f name="CYZDMC"  type="12"  />
-            <f name="YPPZS"  type="4"  />
-            <f name="KJYPZS"  type="4"  />
-            <f name="KJY"  type="12"  />
-            <f name="ZSJ"  type="12"  />
-            <f name="JBYPZS"  type="4"  />
-            <f name="YPTYMS"  type="4"  />
-            <f name="YPZJE"  type="8"  />
-            <f name="JBYWJE"  type="8"  />
-            <f name="KJYWJE"  type="8"  />
-            <f name="YZXZYS"  type="12"  />
-            <f name="CFYS"  type="12"  />
-            <f name="CZR"  type="12"  />
-            <f name="SHR"  type="12"  />
-            <f name="HLZT"  type="12"  />
-            <f name="DPMC"  type="12"  />
-            <f name="DPWZ"  type="12"  />
-            <f name="DPBM"  type="12"  />
-            <f name="CFLY"  type="1"  />
-            <f name="FY"  type="12"  />
-            <f name="FYNAME"  type="12"  />
-            <f name="YZLX"  type="12"  />
-            <f name="KS"  type="12"  />
-            <f name="KSNAME"  type="12"  />
         </fields>
 		<parameter>
 			<p>12</p>
 			<p>93</p>
 			<p>93</p>
+			<p>12</p>
+			<p>12</p>
 		</parameter>
     </dao>
 

sql/lyx2024.txt

@@ -532,7 +532,18 @@ VALUES('044E8CC6-1A61-381B-9E14-1D6D251A8CEC', 'C071-F000-S004-T013', '住院重
 	
 	
 	
-	
+--20241216
+	CREATE TABLE HIS_CFDP_SJ
+	   (
+		"PKEY" VARCHAR2(40),
+		"ZBPKEY" VARCHAR2(40),
+		"JGID" VARCHAR2(50),
+		"CZR" VARCHAR2(20),
+		"CFH" VARCHAR2(30)
+	   );
+	COMMENT ON COLUMN HIS_CFDP_SJ.ZBPKEY IS '处方点评主表PKEY';
+	COMMENT ON COLUMN HIS_CFDP_SJ.JGID IS '机构ID';
+	COMMENT ON COLUMN HIS_CFDP_SJ.CZR IS '统计操作人员';