diff --git a/.project b/.project
index a278d67..67c4296 100644
--- a/.project
+++ b/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>klhis2</name>
+	<name>klhis_git</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/WEB-INF/conf/sysds_emr.xml b/WEB-INF/conf/sysds_emr.xml
index 3541c8e..2e3e4a1 100644
--- a/WEB-INF/conf/sysds_emr.xml
+++ b/WEB-INF/conf/sysds_emr.xml
@@ -1796,7 +1796,7 @@
     </dao>
 	<dao id="emrbasyBaseforpkeydao" log="true"  type="1" memo="病案首页基础数据查询-forpkey">
         <sql>        select PKEY,HZPKEY,JZPKEY,ZYNO,ZLLB,SSLCLJ,ISZYZJ,ISZYZLSB,ISZYZLJS,ISBZSH,BLFX,LCLJBL,QJCS,CGCS,BRLY,ZYBZZLF,ZYBZHZF,ZYZDBM,ZYZDMC,ZYWZ,ZYGS,ZYZCZF,ZYTNZL,ZYGCZL,ZYTSZL,ZYQT,ZYTSTPJG,ZYBZSS,ZYZJF,A01,A02,A48,A49,B12,B15,A47,A46C,A11,A12C,A13,A14,A15C,A21C,A38C,A19C,A20N,A20,A22,A23C,A24,A25C,A26,A27,A28C,A29,A30,A31C,A32,A33C,A34,A35,B38,B11C,B13C,B14,B21C,B16C,B17,B20,C01C,C02N,F01,F02C,F03N,F04,C09C,C10N,C11,F07X01C,F08X01N,F09X01,F07X02C,F08X02N,F09X02,C12C,C13N,C24C,C25,F10,F11,F12,B22C,B22,B23C,B23,B24C,B24,B25C,B25,B26C,B26,B27,B28,B29,B30C,B31,B32,B33,C34C,C26C,C27C,F17,F18,F19,F20,F21,F22,F23,F24,F25,F26,A16,A18X01,A18X02,A18X03,A18X04,A18X05,A17,C28,C29,C30,C31,C32,C33,C47,B36C,B37,B34C,B35,D01,D09,D11,D12,D13,D14,D15,D16,D17,D18,D19,D19X01,D20,D20X01,D20X02,D21,D22,D23,D23X01,D24,D25,D26,D27,D28,D29,D30,D31,D32,D33,D34,CJR,CJRQ,XGR,XGRQ,JGID,XSERYFS,A17X02,A17X03,A17X04,A17X05,YBXYZD,YBXYZDMC,YBZYZD,YBZYZDMC,B35C,DIEFLAG,YBFFFS,CYZLJG,C47X01,C47X02,C47X03,ZYZD,A23C1,RYSQK,ZYZHBM1,ZYZHMC1,YBZYZHBM1,YBZYZHMC1,ZYZHBM2,ZYZHMC2,YBZYZHBM2,YBZYZHMC2,PFKLF,
-        WCLCLJ,TCYY,YYGRQK,SFFSYC,YCFQ,SYFY,YFFYDYW,ZYQJSFFSDDHZC,ZYQJSTYS 
+        WCLCLJ,TCYY,YYGRQK,SFFSYC,YCFQ,SYFY,YFFYDYW,ZYQJSFFSDDHZC,ZYQJSTYS,LYSTSNSDZ 
          from HIS_EMR_BASY where JGID=? and PKEY=?
          </sql>
         <tables>
@@ -2019,6 +2019,7 @@
             <f name="YFFYDYW"  type="12"  table="HIS_EMR_BASY" />
             <f name="ZYQJSFFSDDHZC"  type="12"  table="HIS_EMR_BASY" />
             <f name="ZYQJSTYS"  type="12"  table="HIS_EMR_BASY" />
+            <f name="LYSTSNSDZ"  type="12"  table="HIS_EMR_BASY" />
         </fields>
         <parameter>
             <p>12</p>
diff --git a/WEB-INF/conf/sysds_his.xml b/WEB-INF/conf/sysds_his.xml
index bb0f87b..ef75ee5 100644
--- a/WEB-INF/conf/sysds_his.xml
+++ b/WEB-INF/conf/sysds_his.xml
@@ -4573,12 +4573,15 @@
 	<dao id="hissfxyppopbyksdao" type="1">
 		<sql>
 
-			select a.JGID,a.BM,a.MC,a.JBDW,a.FYDL,a.FYZL,a.HSZFL,a.KJZFL,a.MZZFL,a.ZYZFL,a.BASYFL,a.KCFL,a.RKDW,a.ZHXS,a.MZFYDW,a.ZYFYDW,a.JG,a.JBJG,a.SFYJ,a.SFXMSM,a.BZ,a.ZT,b.CSXX,b.GG,a.DWVIEW,c.LASTJJ,d.value2 kclz,a.YBBM,a.YBMC,kc.SL from HIS_SFX a
+			select a.JGID,a.BM,a.MC,a.JBDW,a.FYDL,a.FYZL,a.HSZFL,a.KJZFL,a.MZZFL,a.ZYZFL,a.BASYFL,a.KCFL,a.RKDW,a.ZHXS,a.MZFYDW,a.ZYFYDW,a.JG,a.JBJG,a.SFYJ,a.SFXMSM,a.BZ,a.ZT,b.CSXX,b.GG,a.DWVIEW,c.LASTJJ,d.value2 kclz,a.YBBM,a.YBMC,kc.SL 
+			from HIS_SFX a
 			left join HIS_YPXX b on a.BM=b.BM
 			left join HIS_YFYK_YPJJ c on a.bm=c.SFX_BM and a.JGID=c.JGID
 			left join HIS_KSKC kc on a.bm=kc.SFX_BM and a.JGID=kc.JGID and kc.DPTID=?
 			left join MAIN_JGZDB d on a.kcfl=d.bh and d.jgzdlb_bh='Z00008' and d.JGID=a.JGID
-			where a.JGID=? and a.GLLX='Y'  and b.zt='1'  and a.KCFL in (select bh from MAIN_JGZDB where JGID=a.JGID and jgzdlb_bh='Z00008' and value2 like ?) and (a.BM like ? or a.MC like ? or EXISTS (SELECT 1 FROM HIS_SFX_ZJM b WHERE b.SFX_BM = a.BM and b.JGID=a.JGID and b.PYM like ?))
+			left join HIS_YZX y on a.BM=y.BM 
+			where a.JGID=? and y.JGID=? and a.zt='1'
+			and a.GLLX='Y'  and b.zt='1'  and a.KCFL in (select bh from MAIN_JGZDB where JGID=a.JGID and jgzdlb_bh='Z00008' and value2 like ?) and (a.BM like ? or a.MC like ? or EXISTS (SELECT 1 FROM HIS_SFX_ZJM b WHERE b.SFX_BM = a.BM and b.JGID=a.JGID and b.PYM like ?))
 
 		</sql>
 		<tables>
@@ -4626,6 +4629,7 @@
 			<p>12</p>
 			<p>12</p>
 			<p>12</p>
+			<p>12</p>
 		</parameter>
 	</dao>
 	<dao id="crb_infodao" log="true" type="1">
diff --git a/WEB-INF/src/com/emr/Basy/EmrBasyBaseForm.java b/WEB-INF/src/com/emr/Basy/EmrBasyBaseForm.java
index 4551e84..43ef5cb 100644
--- a/WEB-INF/src/com/emr/Basy/EmrBasyBaseForm.java
+++ b/WEB-INF/src/com/emr/Basy/EmrBasyBaseForm.java
@@ -314,6 +314,7 @@ public class EmrBasyBaseForm extends WatWebForm {
     private DxCoolDataTextField dbedit113;
     private DxCoolDataTextField dbedit114;
     private DxCoolDataTextField dbedit121;
+    private DxCoolDataTextField dctLystxxtftnsdz;
     
     
 	public EmrBasyBaseForm() {
@@ -1560,6 +1561,9 @@ public class EmrBasyBaseForm extends WatWebForm {
         		if ("ZYQJSTYS".equals(arr[i])) {
         			dcbYs.setFocus();
     			}
+        		if ("LYSTSNSDZ".equals(arr[i])) {
+        			dctLystxxtftnsdz.setFocus();
+    			}
 			}
     	}
     }
diff --git a/WEB-INF/src/com/his/crb/CrbManager.java b/WEB-INF/src/com/his/crb/CrbManager.java
index a2b069c..5314c89 100644
--- a/WEB-INF/src/com/his/crb/CrbManager.java
+++ b/WEB-INF/src/com/his/crb/CrbManager.java
@@ -1,4 +1,4 @@
-package com.his.crb;

import java.io.StringReader;
import java.sql.Timestamp;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.List;
import org.apache.commons.collections.iterators.ObjectGraphIterator;
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.HttpStatus;
import org.apache.commons.httpclient.methods.PostMethod;
import org.apache.commons.httpclient.methods.StringRequestEntity;
import org.jdom.Document;
import org.jdom.Element;
import org.jdom.input.SAXBuilder;
import org.json.XML;
import org.xml.sax.InputSource;
import com.his.mz.service.GzzNPCService;
import com.util.MainLog;
import com.util.MainUtil;
import com.wat.component.DxComboBox;
import com.wat.component.DxLabel;
import com.wat.component.DxPanelBar;
import com.wat.component.DxPrinter;
import com.wat.component.DxStatisticsReport;
import com.wat.component.coolcomponent.DxCoolTextField;
import com.wat.component.datagrid.DxDataGrid;
import com.wat.component.json.JSONObject;
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.delphi.util.Delphi;

public class CrbManager extends WatWebForm {
	private DxDataGrid dbgrid1;
+package com.his.crb;

import java.io.StringReader;
import java.sql.Timestamp;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.List;
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.HttpStatus;
import org.apache.commons.httpclient.methods.PostMethod;
import org.apache.commons.httpclient.methods.StringRequestEntity;
import org.jdom.Document;
import org.jdom.Element;
import org.jdom.input.SAXBuilder;
import org.json.XML;
import org.xml.sax.InputSource;
import com.his.mz.service.GzzNPCService;
import com.util.MainLog;
import com.util.MainUtil;
import com.wat.component.DxComboBox;
import com.wat.component.DxLabel;
import com.wat.component.DxPanelBar;
import com.wat.component.DxPrinter;
import com.wat.component.DxStatisticsReport;
import com.wat.component.coolcomponent.DxCoolTextField;
import com.wat.component.datagrid.DxDataGrid;
import com.wat.component.json.JSONObject;
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.delphi.util.Delphi;

public class CrbManager extends WatWebForm {
	private DxDataGrid dbgrid1;
 	private DxPanelBar panelBar1;
 	private DxPanelBar panelBar2;
 	private DxPanelBar panelBar3;
@@ -42,7 +42,7 @@ package com.his.crb;

import java.io.StringReader;
import java.sql.Timestamp;
im
 
 	private void panelBar1editAction() {
		if(MainUtil.getFunctionValue((String)this.getWinParams("formid"), "Edit").equals("0")){
			setLabelShow("提示:当前模块未开通该功能项,不允许操作!");
			return;
		}
		if(MainUtil.getUserAuthorityValues((String)this.getWinParams("formid"), "Edit")==0){
			setLabelShow("提示:你没有该功能项权限,不允许操作!");
			return;
		}
		if(dbgrid1.getSelectedRow() < 0) {
			setLabelShow("请选择需要编辑的机构");
			return;
		}

		CrbManagerEdit form = CrbManagerEdit.newWindow();
		form.setWindow(this);
		form.setWinParams("formstate", "editflag");
		form.setWinParams("dbgridmaster", dbgrid1);
		form.setWinParams("companyid", MainUtil.getCurCompanyID());
		form.setWinParams("formid",this.getWinParams("formid"));
		form.setWinParams("formtitle",this.getWinParams("formtitle"));
		form.setWinParams("pkey",dbgrid1.getColumnValueAsString(dbgrid1.getSelectedRow(), "PKEY"));
		form.setFlag(100);
		form.showAsModal();
	}
 
	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，请重新获取！");
					}
					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 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()});
		dbgrid1.reloadBySelect(this.getXmlSelectControl("s1"));
	}
 
@@ -73,6 +73,6 @@ package com.his.crb;

import java.io.StringReader;
import java.sql.Timestamp;
im
 		dataList.add(dbgrid1.getDataObjectManager());
 		Object result = Delphi.transCommit(dataList, this, "保存失败");
 		if("ok".equals(result)){
-
			this.setWinParams("saveflag", "true");
			setLabelShow("提示:编辑保存成功!");
			return;
		}
		else{
			setLabelShow("提示:编辑保存失败!");
			return;
		}

	}

	private void closeAction() {
		if("true".equals(getWinParams("saveflag"))) {
			this.doModalCallbackAction(null);
		}
	}
	//上报
	private void upAction() {
		String jgid=MainUtil.getCurCompanyID();
		String pkey=dbgrid1.getColumnValueAsString(dbgrid1.getSelectedRow(), "PKEY");
		DxNormalDataManager crbdata = DaoCreator.getNormalDao(this,"crbupdao");
		crbdata.reload(new Object[] {jgid,pkey});
		String str="";
		String type="";
		if("0".equals(crbdata.getColumnValueAsString("SBZT"))) {
			type="Add";
		}else if("1".equals(crbdata.getColumnValueAsString("SBZT"))) { 
			type="Mod";
		}else if("2".equals(crbdata.getColumnValueAsString("SBZT"))) { 
			type="Mod";
		}else if("3".equals(crbdata.getColumnValueAsString("SBZT"))) { 
			type="Res";
		}else {
			type="Add";
		}
		SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
		/**
		 * "<!--Add:初报、Mod:修订、Aud:审核、Del:删除、Res恢复-->"
		 */
		
		
		String eventId=crbdata.getColumnValueAsString("BGDWBM")+"-"+MainUtil.format(System.currentTimeMillis(), "yyyyMMddHHmmss")+"-"+crbdata.getColumnValueAsString("ID").substring(crbdata.getColumnValueAsString("ID").length() - 3);
		
		String CardID=crbdata.getColumnValueAsString("CARDID");
		if ("Add".equals(type)) {
			CardID="";
		}else { 
			eventId=crbdata.getColumnValueAsString("EVENTID");
		}
		
		//D8    2003-01-05
		//D10  2003-01-05 09
		//D12  2003-01-05 09:48
		//D14  2003-01-05 09:48:43
		String DiagnosisDate=MainUtil.format(crbdata.getColumnValueAsLong("ZDRQ"),"yyyy-MM-dd HH");//D10
		String CardFillingTime=MainUtil.format(crbdata.getColumnValueAsLong("BGRQ"),"yyyy-MM-dd");//D8
		String CreatingTime=MainUtil.format(crbdata.getColumnValueAsLong("CJRQ"),"yyyy-MM-dd HH:mm:ss");//D14
		String OnsetDate=MainUtil.format(crbdata.getColumnValueAsLong("FBRQ"),"yyyy-MM-dd");//D8

		String Customer=crbdata.getColumnValueAsString("CJR");
		DxNormalDataManager crbuserdao = DaoCreator.getNormalDao(this,"crbuserdao");
		crbuserdao.reload(new Object[] {Customer});
		Customer=crbuserdao.getColumnValueAsString("IDENTITYID");//证件号
		

		String IDR_OccupationCode=crbdata.getColumnValueAsString("ZY");
		String OtherOccupationName=crbdata.getColumnValueAsString("QTZY");
		if (!"99".equals(IDR_OccupationCode)) {
			OtherOccupationName="";
		}
		DxNormalDataManager regiondic  = DaoCreator.getNormalDao(this,"regiondic");
		String XZDZ_SHENG=regiondic.getDicValue(crbdata.getColumnValueAsString("XZDZ_SHENG"));
		String XZDZ_SHI=regiondic.getDicValue(crbdata.getColumnValueAsString("XZDZ_SHI"));
		String XZDZ_XIAN=regiondic.getDicValue(crbdata.getColumnValueAsString("XZDZ_XIAN"));
		String XZDZ_ZHEN=regiondic.getDicValue(crbdata.getColumnValueAsString("XZDZ_ZHEN"));
		String XZDZ_CUN=regiondic.getDicValue(crbdata.getColumnValueAsString("XZDZ_CUN"));
		String LivingAddressName=XZDZ_SHENG+XZDZ_SHI+XZDZ_XIAN+XZDZ_ZHEN+XZDZ_CUN;
		
		str="<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
				+ "<DataExchange>"
				+ "<eventHead>"
				+ "<eventId>"+eventId+"</eventId>"
				+ "<entityName>IDR</entityName>"
				+ "<operateType>"+type+"</operateType>"
				+ "</eventHead>"
				+ "<eventBody>"
				
				+ "<BaseInfo>"
				+ "<PatientName>"+crbdata.getColumnValueAsString("NAME")+"</PatientName>"
				+ "<BirthDate>"+sdf.format(crbdata.getColumnValueAsLong("BRDY"))+"</BirthDate>"
				+ "<GenderCode>"+crbdata.getColumnValueAsString("SEX")+"</GenderCode>"
				+ "<GenderName>"+crbdata.getColumnValueAsString("SEX_MC")+"</GenderName>"
				+ "<NationCode>"+crbdata.getColumnValueAsString("MZ")+"</NationCode>"
				+ "<NationName>"+crbdata.getColumnValueAsString("MZ_MC")+"</NationName>"
				+ "<EmployerOrgName>"+crbdata.getColumnValueAsString("GZDW")+"</EmployerOrgName>"
				+ "<IDR_OccupationCode>"+IDR_OccupationCode+"</IDR_OccupationCode>"
				//+ "<NCD_OccupationCode>"+crbdata.getColumnValueAsString("")+"</NCD_OccupationCode><!--职业编码-->"
				//+ "<CODRIS_OccupationCode>"+crbdata.getColumnValueAsString("")+"</CODRIS_OccupationCode><!--职业编码-->"
				+ "<OccupationName>"+crbdata.getColumnValueAsString("ZY_MC")+"</OccupationName>"
				+ "<OtherOccupationName>"+OtherOccupationName+"</OtherOccupationName>"
				+ "<GuardianName>"+crbdata.getColumnValueAsString("JZ_NAME")+"</GuardianName>"
				+ "<TeleCom>"+crbdata.getColumnValueAsString("LXDH")+"</TeleCom>"
				+ "<OrgCountyCode>51343400</OrgCountyCode>"
				+ "<OrgCountyName>四川省凉山彝族自治州越西县</OrgCountyName>"
				+ "<OrgCode>"+crbdata.getColumnValueAsString("BGDWBM")+"</OrgCode>"
				+ "<OrgName>"+crbdata.getColumnValueAsString("BGDWMC")+"</OrgName>"
				+ "<LivingAddressAttributionCode>"+crbdata.getColumnValueAsString("BRSY")+"</LivingAddressAttributionCode>"
				+ "<LivingAddressAttributionName>"+crbdata.getColumnValueAsString("BRSY_MC")+"</LivingAddressAttributionName>"
				+ "<LivingAddressCode>"+crbdata.getColumnValueAsString("XZDZ")+"</LivingAddressCode>"
				+ "<LivingAddressName>"+LivingAddressName+"</LivingAddressName>"
				+ "<LivingAddressDetails>"+LivingAddressName+crbdata.getColumnValueAsString("XZDZ_XX")+"</LivingAddressDetails>"
				+ "<IDCardType>1</IDCardType>"
				+ "<IDCardCode>"+crbdata.getColumnValueAsString("SFZH")+"</IDCardCode>"
				+ "<DiagnosisDate>"+DiagnosisDate+"</DiagnosisDate>"
				+ "<DiseaseCode>"+crbdata.getColumnValueAsString("JBBM")+"</DiseaseCode>"
				+ "<DiseaseName>"+crbdata.getColumnValueAsString("JBMC")+"</DiseaseName>"
				+ "<DiseaseCause>"+crbdata.getColumnValueAsString("JBBM")+"</DiseaseCause>"
				+ "<CardNotes>"+crbdata.getColumnValueAsString("BZ")+"</CardNotes>"//备注信息
				+ "<DeathDate>"+crbdata.getColumnValueAsString("SWRQ")+"</DeathDate>"
				+ "<FillingDoctorName>"+crbdata.getColumnValueAsString("TKYS")+"</FillingDoctorName>"
				+ "<CardFillingTime>"+CardFillingTime+"</CardFillingTime>"
				+ "<DomicileAddressCode>"+crbdata.getColumnValueAsString("HJDZ")+"</DomicileAddressCode>"
				+ "<DomicileAddressName>"+crbdata.getColumnValueAsString("HJDZ_MC")+"</DomicileAddressName>"
				+ "<DomicileAdrressDetails>"+crbdata.getColumnValueAsString("HZDZ_XX")+"</DomicileAdrressDetails>"
				+ "<DomicileAddressAttributionCode>"+crbdata.getColumnValueAsString("HJDLX")+"</DomicileAddressAttributionCode>"
				+ "<DomicileAddressAttributionName>"+crbdata.getColumnValueAsString("HJDLX_MC")+"</DomicileAddressAttributionName>"
				+ "<Country>中国大陆</Country>"
				
				
				+ "<MaritalStatusCode>"+crbdata.getColumnValueAsString("HYZK")+"</MaritalStatusCode>"
				+ "<MaritalStatusName>"+crbdata.getColumnValueAsString("HYZK_MC")+"</MaritalStatusName>"
				+ "<EducationLevelCode>"+crbdata.getColumnValueAsString("WHCD")+"</EducationLevelCode>"
				+ "<EducationLevelName>"+crbdata.getColumnValueAsString("WHCD_MC")+"</EducationLevelName>"
				
//				+ "<LifeTimeAddr>"+crbdata.getColumnValueAsString("XZDZ")+"</LifeTimeAddr>	"
//				+ "<LifeTimeZoneCode>"+crbdata.getColumnValueAsString("XZDZ")+"</LifeTimeZoneCode>"
//				+ "<LifeTimeVillageCode></LifeTimeVillageCode>"//<!--生前常住村编码-->
//				+ "<LifeTimeAddrTypeCode>1</LifeTimeAddrTypeCode>"
//				+ "<RegisterVillageCode></RegisterVillageCode>"//-户籍所在村编码
				
				+ "<DeathPlaceCode>2</DeathPlaceCode>"
				+ "<DiagnosisTypeCode>"+crbdata.getColumnValueAsString("ZDLX")+"</DiagnosisTypeCode>"
				+ "<DiagnosisTypeName>"+crbdata.getColumnValueAsString("ZDLX_MC")+"</DiagnosisTypeName>"
				+ "<Hospitalnum>"+crbdata.getColumnValueAsString("ZYH")+"</Hospitalnum>"
				+ "<CardID>"+CardID+"</CardID>"//<!--卡片ID-->
				+ "<CreatingTime>"+CreatingTime+"</CreatingTime>"
				+ "</BaseInfo>"
				
				
				//<!--传染病数据-->
				+ "<IDRCard>"
				+ "<CaseClassificationCode>"+crbdata.getColumnValueAsString("BLFL")+"</CaseClassificationCode>"
				+ "<CaseClassificationName>"+crbdata.getColumnValueAsString("BLFL_MC")+"</CaseClassificationName>"
				+ "<OtherDiseaseName>"+crbdata.getColumnValueAsString("QTJBMC")+"</OtherDiseaseName>"
				+ "<OnsetDate>"+OnsetDate+"</OnsetDate>"
				+ "<CloseContactsSymptomCode>"+crbdata.getColumnValueAsString("MJZYWXTZZ")+"</CloseContactsSymptomCode>"
				+ "<CloseContactsSymptomName>"+crbdata.getColumnValueAsString("MJZYWXTZZ_MC")+"</CloseContactsSymptomName>"
				+ "<Customer>"+Customer+"</Customer>"
				+ "<DeletingReasonDetails></DeletingReasonDetails>"
				+ "<DeletingTypeCode></DeletingTypeCode>"
				+ "<DeletingTypeName></DeletingTypeName>"

//				+ "<NewPneumSeverityCode></NewPneumSeverityCode>"
//				+ "<NewPneumSeverityName></NewPneumSeverityName>"
//				+ "<ForeignTypeCode></ForeignTypeCode>"
//				+ "<ForeignTypeName></ForeignTypeName>"
//				+ "<MgmtStatusCode></MgmtStatusCode>"
//				+ "<IsDeadByThisCode></IsDeadByThisCode>"
//				+ "<SymptomsCode></SymptomsCode>"
				
				
				//艾滋病
				+ "<AIDS>"
				+ "<AIDSCardID>"+CardID+"</AIDSCardID>"
				+ "<ContactHistoryCode>"+crbdata.getColumnValueAsString("JCS")+"</ContactHistoryCode>"
				+ "<ContactHistoryName>"+crbdata.getColumnValueAsString("JCS_MC")+"</ContactHistoryName>"
				+ "<InjectionTogetherNum>"+crbdata.getColumnValueAsString("JCS_DPZSRS")+"</InjectionTogetherNum>"
				+ "<NonmaritalSexNum>"+crbdata.getColumnValueAsString("JSC_XJCSRS")+"</NonmaritalSexNum>"
				+ "<HomosexualSexNum>"+crbdata.getColumnValueAsString("JSC_NNRS")+"</HomosexualSexNum>"
				+ "<OtherContactHistory>"+crbdata.getColumnValueAsString("JSC_QTNR")+"</OtherContactHistory>"
				+ "<VenerealHistoryCode>"+crbdata.getColumnValueAsString("XBS")+"</VenerealHistoryCode>"
				+ "<VenerealHistoryName>"+crbdata.getColumnValueAsString("XBS_MC")+"</VenerealHistoryName>"
				+ "<PossibleInfectionRouteCode>"+crbdata.getColumnValueAsString("ZYKNGRTJ")+"</PossibleInfectionRouteCode>"
				+ "<PossibleInfectionRouteName>"+crbdata.getColumnValueAsString("ZYKNGRTJ_MC")+"</PossibleInfectionRouteName>"
				+ "<OtherInfectionRoute>"+crbdata.getColumnValueAsString("GRTJQT")+"</OtherInfectionRoute>"
				+ "<SpecimenSourceCode>"+crbdata.getColumnValueAsString("HIV_YBLY")+"</SpecimenSourceCode>"
				+ "<SpecimenSourceName>"+crbdata.getColumnValueAsString("HIV_YBLY_MC")+"</SpecimenSourceName>"
				+ "<OtherSampleSource>"+crbdata.getColumnValueAsString("HIV_YBLYQT")+"</OtherSampleSource>"
				+ "<LaborTestConclusionCode>"+crbdata.getColumnValueAsString("SYSJCJL")+"</LaborTestConclusionCode>"
				+ "<LaborTestConclusionName>"+crbdata.getColumnValueAsString("SYSJCJL_MC")+"</LaborTestConclusionName>"
				+ "<ConfirmedTestPositiveDate>"+crbdata.getColumnValueAsString("HIV_JCYXRQ")+"</ConfirmedTestPositiveDate>"
				+ "<ConfirmedTestPositiveOrgName>"+crbdata.getColumnValueAsString("HIV_JCDW")+"</ConfirmedTestPositiveOrgName>"
				+ "<AIDSDiagnosisDate>"+crbdata.getColumnValueAsString("HIVZDRQ")+"</AIDSDiagnosisDate>"
				+ "<ChlamydialTrachomatisCode>"+crbdata.getColumnValueAsString("SZDSYYYTGR")+"</ChlamydialTrachomatisCode>"
				+ "<ChlamydialTrachomatisName>"+crbdata.getColumnValueAsString("SZDSYYYTGR_MC")+"</ChlamydialTrachomatisName>"
				+ "</AIDS>"
				//<!—手足口病附卡
				+ "<HFMD>"
				+ "<HFMDCardID>"+CardID+"</HFMDCardID>"
				+ "<IntensivePatientCode>"+crbdata.getColumnValueAsString("SZK_ZZHZ")+"</IntensivePatientCode>"
				+ "<IntensivePatientName>"+crbdata.getColumnValueAsString("SZK_ZZHZ_MC")+"</IntensivePatientName>"
				+ "<LaborTestResultCode>"+crbdata.getColumnValueAsString("SZK_SYSJG")+"</LaborTestResultCode>"
				+ "<LaborTestResultName>"+crbdata.getColumnValueAsString("SZK_SYSJG_MC")+"</LaborTestResultName>"
				+ "</HFMD>"
				//HB乙肝填写此栏
				+"<HB>"
				+ "<HBCardID>"+CardID+"</HBCardID>"
				+ "<HBsAgTestPositiveTypeCode>"+crbdata.getColumnValueAsString("HB_YXSJ")+"</HBsAgTestPositiveTypeCode>"
				+ "<HBsAgTestPositiveTypeName>"+crbdata.getColumnValueAsString("HB_YXSJ_MC")+"</HBsAgTestPositiveTypeName>"
				+ "<FirstHBSymptomTime>"+crbdata.getColumnValueAsString("HB_SCSJ")+"</FirstHBSymptomTime>"
				+ "<LastAltValue>"+crbdata.getColumnValueAsString("HB_ALT")+"</LastAltValue>"
				+ "<HBcAbIgMTestCode>"+crbdata.getColumnValueAsString("HB_1000")+"</HBcAbIgMTestCode>"
				+ "<HBcAbIgMTestName>"+crbdata.getColumnValueAsString("HB_1000_MC")+"</HBcAbIgMTestName>"
				+ "<LiveRpunctureTestCode>"+crbdata.getColumnValueAsString("HB_GCJCJG")+"</LiveRpunctureTestCode>"
				+ "<LiveRpunctureTestName>"+crbdata.getColumnValueAsString("HB_GCJCJG_MC")+"</LiveRpunctureTestName>"
				+ "<HBsAgNorHBsAbpCode>"+crbdata.getColumnValueAsString("HB_SAG")+"</HBsAgNorHBsAbpCode>"
				+ "<HBsAgNorHBsAbpName>"+crbdata.getColumnValueAsString("HB_SAG_MC")+"</HBsAgNorHBsAbpName>"
				+ "<FirstHBSymptomUnsureCode>"+crbdata.getColumnValueAsString("HB_SCSJCHECK")+"</FirstHBSymptomUnsureCode>"
				+ "</HB>"
				//<AFP><!—AFP附卡
				//+ "<AFP>"
				//+ "	<AFPCardID>"+crbdata.getColumnValueAsString("ID")+"</AFPCardID><!--主键-->"
				//+ "<!--病人所属地类型编码-->"
				//+ "	<PatientResidenceTypeCode>"+crbdata.getColumnValueAsString("BRSY")+"</PatientResidenceTypeCode>"
				//+ "	<PatientResidenceTypeCodeName>"+crbdata.getColumnValueAsString("BRSY_MC")+"</PatientResidenceTypeCodeName>"
				//+ "	<!--麻痹日期-->"
				//+ "	<PalsyDate>"+crbdata.getColumnValueAsString("")+"</PalsyDate>"
				//+ "<!--来现就诊地日期-->"
				//+ "	<TreatmentlandDate>"+crbdata.getColumnValueAsString("")+"</TreatmentlandDate>"
				//+ "<!--现就诊地住址类型编码-->"
				//+ "<TreatmentlandTypeCode>"+crbdata.getColumnValueAsString("")+"</TreatmentlandTypeCode>"
				//+ "<!--现就诊地住址类型名称-->"
				//+ "	<TreatmentlandTypeName>"+crbdata.getColumnValueAsString("")+"</TreatmentlandTypeName>"
				//+ "<!--现就诊地住址国标编码-->"
				//+ "	<TreatmentlandZoneCode>"+crbdata.getColumnValueAsString("")+"</TreatmentlandZoneCode>"
				//+ "<!--现就诊地住址国标名称-->"
				//+ "<TreatmentlandZoneName>"+crbdata.getColumnValueAsString("")+"</TreatmentlandZoneName>"
				//+ " 	<!--现就诊地详细住址-->"
				//+ "	<TreatmentlandLivingAddressDetails>"
				//+ "</TreatmentlandLivingAddressDetails>"
				//+ "<!--麻痹症状-->"
				//+ "< PalsySymptom >"+crbdata.getColumnValueAsString("")+"</ PalsySymptom >"
				//+ "</AFP>"
				+ "</IDRCard>"
				//+ "<NCDCard><!--慢病数据-->"
				//+ "<LastXycdzss>"+crbdata.getColumnValueAsString("")+"</LastXycdzss><!--舒张压-->"
				//+ "<LastXycdzsz>"+crbdata.getColumnValueAsString("")+"</LastXycdzsz><!--收缩压-->"
				//+ "<LastKfxtcdz>"+crbdata.getColumnValueAsString("")+"</LastKfxtcdz><!--空腹血糖测定值-->"
				//+ "<LastChxtcdz>"+crbdata.getColumnValueAsString("")+"</LastChxtcdz><!--餐后血糖测定值-->"
				//+ "<Bgv>"+crbdata.getColumnValueAsString("")+"</Bgv><!--空腹血糖测定值-->"
				//+ "<OutcomeCode>"+crbdata.getColumnValueAsString("")+"</OutcomeCode><!--转归编码（参见7.24）-->"
				//+ "<Pathology>"+crbdata.getColumnValueAsString("")+"</Pathology><!--病理诊断，限肿瘤填写-->"
				//+ "<Patientnum>"+crbdata.getColumnValueAsString("")+"</Patientnum><!--门诊号-->"
				//+ "<Pathologynum>"+crbdata.getColumnValueAsString("")+"</Pathologynum><!--病理号，限肿瘤填写-->"
				//+ "<FirstCase>"+crbdata.getColumnValueAsString("")+"</FirstCase><!--是否首发病例，限心脑填写（参见7.25）-->"
				//+ "<!--ICDO3形态学，限肿瘤填写-->"
				//+ "<Icdo3Morphology>"+crbdata.getColumnValueAsString("")+"</Icdo3Morphology>"
				//+ "<!--ICDO3分化程度，限肿瘤填写（参见7.26）-->"
				//+ "<Icdo3Degree>"+crbdata.getColumnValueAsString("")+"</Icdo3Degree>"
				//+ "<!--肿瘤分期是否不详，限肿瘤填写（参见7.27）-->"
				//+ "<StagingUnknown>"+crbdata.getColumnValueAsString("")+"</StagingUnknown>"
				//+ "<!--肿瘤分期T，限肿瘤填写（参见7.28）-->"
				//+ "<TumorstageT>"+crbdata.getColumnValueAsString("")+"</TumorstageT>"
				//+ "<!--肿瘤分期N，限肿瘤填写（参见7.29）-->"
				//+ "<TumorstageN>"+crbdata.getColumnValueAsString("")+"</TumorstageN>"
				//+ "<!--肿瘤分期M，限肿瘤填写（参见7.30）-->"
				//+ "<TumorstageM>"+crbdata.getColumnValueAsString("")+"</TumorstageM>"
				//+ "<!--肿瘤分期0-IV，限肿瘤填写（参见7.31）-->"
				//+ "<TumorstageIv>"+crbdata.getColumnValueAsString("")+"</TumorstageIv>"
				//+ "<Admissiontime>"+crbdata.getColumnValueAsString("")+"</Admissiontime><!--住院时间，限肿瘤填写-->"
				//+ "<Dischargetime>"+crbdata.getColumnValueAsString("")+"</Dischargetime><!--出院时间，限肿瘤填写-->"
				//+ "<TumorDiagnosis>"+crbdata.getColumnValueAsString("")+"</TumorDiagnosis>"
				//+ "<HeartbrainDiagnosis>"+crbdata.getColumnValueAsString("")+"</HeartbrainDiagnosis>"
				//+ "<HighestDiagnosisUnit>"+crbdata.getColumnValueAsString("")+"</HighestDiagnosisUnit>"
				//+ "<Managerzonecode>33020300</Managerzonecode>"
				//+ "<Managerorgcode>330203002</Managerorgcode>"
				//+ "<DeathCause>"+crbdata.getColumnValueAsString("")+"</DeathCause><!--死亡原因编码（参见7.24）-->"
				//+ "<SpecifiDeathCause>"+crbdata.getColumnValueAsString("")+"</SpecifiDeathCause>"
				//+ "<Delflag>1</Delflag>"
				//+ "<UseridCreate>"+crbdata.getColumnValueAsString("")+"</UseridCreate>"
				//+ "</NCDCard>"
				//<!--死因数据--开始
				//				+ "<CODRISCard>"
				//				+ "<CauseA>C00</CauseA>"
				//				+ "<ICDCodeA>C00</ICDCodeA>"
				//				+ "<IntervalTimeA>"+crbdata.getColumnValueAsString("")+"</IntervalTimeA>"
				//				+ "<IntervalUnitCodeA>"+crbdata.getColumnValueAsString("")+"</IntervalUnitCodeA>"
				//				+ "<CauseB>"+crbdata.getColumnValueAsString("")+"</CauseB>"
				//				+ "<ICDCodeB>"+crbdata.getColumnValueAsString("")+"</ICDCodeB>"
				//				+ "<IntervalTimeB>"+crbdata.getColumnValueAsString("")+"</IntervalTimeB>"
				//				+ "<IntervalUnitCodeB>"+crbdata.getColumnValueAsString("")+"</IntervalUnitCodeB>"
				//				+ "<CauseC>"+crbdata.getColumnValueAsString("")+"</CauseC>"
				//				+ "<ICDCodeC>"+crbdata.getColumnValueAsString("")+"</ICDCodeC>"
				//				+ "<IntervalTimeC>"+crbdata.getColumnValueAsString("")+"</IntervalTimeC>"
				//				+ "<IntervalUnitCodeC>"+crbdata.getColumnValueAsString("")+"</IntervalUnitCodeC>"
				//				+ "<CauseD>"+crbdata.getColumnValueAsString("")+"</CauseD>"
				//				+ "<ICDCodeD>"+crbdata.getColumnValueAsString("")+"</ICDCodeD>"
				//				+ "<IntervalTimeD>"+crbdata.getColumnValueAsString("")+"</IntervalTimeD>"
				//				+ "<IntervalUnitCodeD>"+crbdata.getColumnValueAsString("")+"</IntervalUnitCodeD>"
				//				+ "<CauseOther>"+crbdata.getColumnValueAsString("")+"</CauseOther>"
				//				+ "<ICDCodeOther>"+crbdata.getColumnValueAsString("")+"</ICDCodeOther>"
				//				+ "<BasicCause>唇恶性肿瘤</BasicCause>"
				//				+ "<BasicICDCode>C00</BasicICDCode>"
				//				+ "<DiagnosticUnitCode>2</DiagnosticUnitCode>"
				//				+ "<DiagnosticBasisCode>2</DiagnosticBasisCode>"
				//				+ "<DoctorName>daf</DoctorName>"
				//				+ "<PoliceName>jingguan</PoliceName>"
				//				+ "<FillCardDate>2013-06-24T00:00:00</FillCardDate>"
				//				+ "<Symptoms>"+crbdata.getColumnValueAsString("")+"</Symptoms>"
				//				+ "<InvestigatedName>"+crbdata.getColumnValueAsString("")+"</InvestigatedName>"
				//				+ "<Relationship>"+crbdata.getColumnValueAsString("")+"</Relationship>"
				//				+ "<InvestigatedTel>"+crbdata.getColumnValueAsString("")+"</InvestigatedTel>"
				//				+ "<InferCause>"+crbdata.getColumnValueAsString("")+"</InferCause>"
				//				+ "<Investigator>"+crbdata.getColumnValueAsString("")+"</Investigator>"
				//				+ "<InvestigateDate>"+crbdata.getColumnValueAsString("")+"</InvestigateDate>"
				//				+ "<CardFillingTime>"+crbdata.getColumnValueAsString("BGRQ")+"</CardFillingTime>"
				//				+ "<EntryPeopleName>莫洛作布</EntryPeopleName>"
				//				+ "<ValidTime>"+crbdata.getColumnValueAsString("SHSJ")+"</ValidTime>"
				//				+ "<CorrectionState>0</CorrectionState>"
				//				+ "<AuditPeopleName>莫洛作布</AuditPeopleName>"
				//				+ "<FirstValidTime>"+crbdata.getColumnValueAsString("")+"</FirstValidTime>"
				//				+ "<HospitalNo>"+crbdata.getColumnValueAsString("ZYH")+"</HospitalNo>"
				//				+ "<AuditState>3</AuditState>" 
				//				+ "<WomanTypeCode></WomanTypeCode>"
				//				+ "</CODRISCard>"
				//<!--死因数据--结束
				+ "</eventBody>"
				+ "</DataExchange>";
		JSONObject rJson=new JSONObject();
		System.err.println(GzzNPCService.getInstance(jgid).crhsbhj());
		rJson.put("env", GzzNPCService.getInstance(jgid).crhsbhj());
		rJson.put("content", str);
		rJson.put("method","transferDataToDmp");
		System.err.println(rJson.toString());
		System.err.println(str);

		//String result=sendPost("http://127.0.0.1:8099/crbrquest/crbsb",rJson.toString());
		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);
				if("0".equals(result_Json.getString("code"))) {
					DxNormalDataManager crb_infodao = (DxNormalDataManager)DaoCreator.getNormalDao(this,"crb_infodao_bypkey");
					crb_infodao.reload(new Object[] {jgid,pkey});
					crb_infodao.setColumnValue("SBRY",MainUtil.getCurUserAccount());
					crb_infodao.setColumnValue("SBZT","1");
					crb_infodao.setColumnValue("SBSJ", new Timestamp(System.currentTimeMillis()));
					crb_infodao.setColumnValue("EVENTID",eventId);
					if(crb_infodao.commit()) {
						dlg.messageDlg("上报成功");
					}else {
						dlg.messageDlg("上报成功，但是his保存失败");
					}
				}else {
					dlg.messageDlg("上报失败【"+result_Json.getString("msg")+"】");
				}
			} catch (ParseException e) {
				e.printStackTrace();
			}
		}
	}
	private String sendPost(String url,String param){
		boolean lb=false;
		PostMethod postMethod = new PostMethod(url);
		try {
			HttpClient httpClient = new HttpClient();
			httpClient.setConnectionTimeout(60*1000);
			postMethod.setRequestHeader("Content-Type","application/json;charset=UTF-8");  
//			postMethod.setRequestHeader("charset","utf-8");  
			postMethod.setRequestEntity(new StringRequestEntity(param,"application/json","utf-8"));     
			int statusCode = httpClient.executeMethod(postMethod);
			if(statusCode == HttpStatus.SC_OK) {
				lb=true;
				String str = new String(postMethod.getResponseBody());//本机要UTF-8
				System.out.println("===回调通知第三方返回==" +str);
				return str;
			}else {
				System.out.println("调用失败！错误码：" + statusCode);
				return "";
			}
		} catch (Exception e) {
			e.printStackTrace();
		}
		return "";
	}
	protected void initEvent() {
		super.initEvent();
		this.addWindowListener(new WindowAdapter(){
			public void windowClosed(WindowEvent windowevent) {
				closeAction();
			}
		});		
		panelBar1.addActionListener(new ActionListener(){
			public void actionPerformed(ActionEvent actionevent) {
				panelBar1Action(actionevent.getActionCommand());
			}
		});
+
			this.setWinParams("saveflag", "true");
			setLabelShow("提示:编辑保存成功!");
			return;
		}
		else{
			setLabelShow("提示:编辑保存失败!");
			return;
		}

	}

	private void closeAction() {
		if("true".equals(getWinParams("saveflag"))) {
			this.doModalCallbackAction(null);
		}
	}
	//上报
	private void upAction() {
		String jgid=MainUtil.getCurCompanyID();
		String pkey=dbgrid1.getColumnValueAsString(dbgrid1.getSelectedRow(), "PKEY");
		DxNormalDataManager crbdata = DaoCreator.getNormalDao(this,"crbupdao");
		crbdata.reload(new Object[] {jgid,pkey});
		String str="";
		String type="";
		if("0".equals(crbdata.getColumnValueAsString("SBZT"))) {
			type="Add";
		}else if("1".equals(crbdata.getColumnValueAsString("SBZT"))) { 
			//type="Mod";无修改权限
			type="Edit";
		}else if("2".equals(crbdata.getColumnValueAsString("SBZT"))) { 
			//type="Mod";
			type="Edit";
		}else if("3".equals(crbdata.getColumnValueAsString("SBZT"))) { 
			type="Res";
		}else {
			type="Add";
		}
		SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
		/**
		 * "<!--Add:初报、Mod:修订、Aud:审核、Del:删除、Res恢复-->"
		 */
		
		
		String eventId=crbdata.getColumnValueAsString("BGDWBM")+"-"+MainUtil.format(System.currentTimeMillis(), "yyyyMMddHHmmss")+"-"+crbdata.getColumnValueAsString("ID").substring(crbdata.getColumnValueAsString("ID").length() - 3);
		
		String CardID=crbdata.getColumnValueAsString("CARDID");
		if ("Add".equals(type)) {
			CardID="";
		}else { 
			eventId=crbdata.getColumnValueAsString("EVENTID");
		}
		
		//D8    2003-01-05
		//D10  2003-01-05 09
		//D12  2003-01-05 09:48
		//D14  2003-01-05 09:48:43
		String DiagnosisDate=MainUtil.format(crbdata.getColumnValueAsLong("ZDRQ"),"yyyy-MM-dd HH");//D10
		String CardFillingTime=MainUtil.format(crbdata.getColumnValueAsLong("BGRQ"),"yyyy-MM-dd");//D8
		String CreatingTime=MainUtil.format(crbdata.getColumnValueAsLong("CJRQ"),"yyyy-MM-dd HH:mm:ss");//D14
		String OnsetDate=MainUtil.format(crbdata.getColumnValueAsLong("FBRQ"),"yyyy-MM-dd");//D8

		String Customer=crbdata.getColumnValueAsString("CJR");
		DxNormalDataManager crbuserdao = DaoCreator.getNormalDao(this,"crbuserdao");
		crbuserdao.reload(new Object[] {Customer});
		Customer=crbuserdao.getColumnValueAsString("IDENTITYID");//证件号
		

		String IDR_OccupationCode=crbdata.getColumnValueAsString("ZY");
		String OtherOccupationName=crbdata.getColumnValueAsString("QTZY");
		if (!"99".equals(IDR_OccupationCode)) {
			OtherOccupationName="";
		}
		DxNormalDataManager regiondic  = DaoCreator.getNormalDao(this,"regiondic");
		String XZDZ_SHENG=regiondic.getDicValue(crbdata.getColumnValueAsString("XZDZ_SHENG"));
		String XZDZ_SHI=regiondic.getDicValue(crbdata.getColumnValueAsString("XZDZ_SHI"));
		String XZDZ_XIAN=regiondic.getDicValue(crbdata.getColumnValueAsString("XZDZ_XIAN"));
		String XZDZ_ZHEN=regiondic.getDicValue(crbdata.getColumnValueAsString("XZDZ_ZHEN"));
		String XZDZ_CUN=regiondic.getDicValue(crbdata.getColumnValueAsString("XZDZ_CUN"));
		String LivingAddressName=XZDZ_SHENG+XZDZ_SHI+XZDZ_XIAN+XZDZ_ZHEN+XZDZ_CUN;
		
		str="<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
				+ "<DataExchange>"
				+ "<eventHead>"
				+ "<eventId>"+eventId+"</eventId>"
				+ "<entityName>IDR</entityName>"
				+ "<operateType>"+type+"</operateType>"
				+ "</eventHead>"
				+ "<eventBody>"
				
				+ "<BaseInfo>"
				+ "<PatientName>"+crbdata.getColumnValueAsString("NAME")+"</PatientName>"
				+ "<BirthDate>"+sdf.format(crbdata.getColumnValueAsLong("BRDY"))+"</BirthDate>"
				+ "<GenderCode>"+crbdata.getColumnValueAsString("SEX")+"</GenderCode>"
				+ "<GenderName>"+crbdata.getColumnValueAsString("SEX_MC")+"</GenderName>"
				+ "<NationCode>"+crbdata.getColumnValueAsString("MZ")+"</NationCode>"
				+ "<NationName>"+crbdata.getColumnValueAsString("MZ_MC")+"</NationName>"
				+ "<EmployerOrgName>"+crbdata.getColumnValueAsString("GZDW")+"</EmployerOrgName>"
				+ "<IDR_OccupationCode>"+IDR_OccupationCode+"</IDR_OccupationCode>"
				//+ "<NCD_OccupationCode>"+crbdata.getColumnValueAsString("")+"</NCD_OccupationCode><!--职业编码-->"
				//+ "<CODRIS_OccupationCode>"+crbdata.getColumnValueAsString("")+"</CODRIS_OccupationCode><!--职业编码-->"
				+ "<OccupationName>"+crbdata.getColumnValueAsString("ZY_MC")+"</OccupationName>"
				+ "<OtherOccupationName>"+OtherOccupationName+"</OtherOccupationName>"
				+ "<GuardianName>"+crbdata.getColumnValueAsString("JZ_NAME")+"</GuardianName>"
				+ "<TeleCom>"+crbdata.getColumnValueAsString("LXDH")+"</TeleCom>"
				+ "<OrgCountyCode>51343400</OrgCountyCode>"
				+ "<OrgCountyName>四川省凉山彝族自治州越西县</OrgCountyName>"
				+ "<OrgCode>"+crbdata.getColumnValueAsString("BGDWBM")+"</OrgCode>"
				+ "<OrgName>"+crbdata.getColumnValueAsString("BGDWMC")+"</OrgName>"
				+ "<LivingAddressAttributionCode>"+crbdata.getColumnValueAsString("BRSY")+"</LivingAddressAttributionCode>"
				+ "<LivingAddressAttributionName>"+crbdata.getColumnValueAsString("BRSY_MC")+"</LivingAddressAttributionName>"
				+ "<LivingAddressCode>"+crbdata.getColumnValueAsString("XZDZ")+"</LivingAddressCode>"
				+ "<LivingAddressName>"+LivingAddressName+"</LivingAddressName>"
				+ "<LivingAddressDetails>"+LivingAddressName+crbdata.getColumnValueAsString("XZDZ_XX")+"</LivingAddressDetails>"
				+ "<IDCardType>1</IDCardType>"
				+ "<IDCardCode>"+crbdata.getColumnValueAsString("SFZH")+"</IDCardCode>"
				+ "<DiagnosisDate>"+DiagnosisDate+"</DiagnosisDate>"
				+ "<DiseaseCode>"+crbdata.getColumnValueAsString("JBBM")+"</DiseaseCode>"
				+ "<DiseaseName>"+crbdata.getColumnValueAsString("JBMC")+"</DiseaseName>"
				//+ "<DiseaseCause>"+crbdata.getColumnValueAsString("JBBM")+"</DiseaseCause>"
				+ "<DiseaseCause></DiseaseCause>"
				+ "<CardNotes>"+crbdata.getColumnValueAsString("BZ")+"</CardNotes>"//备注信息
				+ "<DeathDate>"+crbdata.getColumnValueAsString("SWRQ")+"</DeathDate>"
				+ "<FillingDoctorName>"+crbdata.getColumnValueAsString("TKYS")+"</FillingDoctorName>"
				+ "<CardFillingTime>"+CardFillingTime+"</CardFillingTime>"
				+ "<DomicileAddressCode>"+crbdata.getColumnValueAsString("HJDZ")+"</DomicileAddressCode>"
				+ "<DomicileAddressName>"+crbdata.getColumnValueAsString("HJDZ_MC")+"</DomicileAddressName>"
				+ "<DomicileAdrressDetails>"+crbdata.getColumnValueAsString("HZDZ_XX")+"</DomicileAdrressDetails>"
				+ "<DomicileAddressAttributionCode>"+crbdata.getColumnValueAsString("HJDLX")+"</DomicileAddressAttributionCode>"
				+ "<DomicileAddressAttributionName>"+crbdata.getColumnValueAsString("HJDLX_MC")+"</DomicileAddressAttributionName>"
				+ "<Country>中国大陆</Country>"
				
				
				+ "<MaritalStatusCode>"+crbdata.getColumnValueAsString("HYZK")+"</MaritalStatusCode>"
				+ "<MaritalStatusName>"+crbdata.getColumnValueAsString("HYZK_MC")+"</MaritalStatusName>"
				+ "<EducationLevelCode>"+crbdata.getColumnValueAsString("WHCD")+"</EducationLevelCode>"
				+ "<EducationLevelName>"+crbdata.getColumnValueAsString("WHCD_MC")+"</EducationLevelName>"
				
//				+ "<LifeTimeAddr>"+crbdata.getColumnValueAsString("XZDZ")+"</LifeTimeAddr>	"
//				+ "<LifeTimeZoneCode>"+crbdata.getColumnValueAsString("XZDZ")+"</LifeTimeZoneCode>"
//				+ "<LifeTimeVillageCode></LifeTimeVillageCode>"//<!--生前常住村编码-->
//				+ "<LifeTimeAddrTypeCode>1</LifeTimeAddrTypeCode>"
//				+ "<RegisterVillageCode></RegisterVillageCode>"//-户籍所在村编码
				
				+ "<DeathPlaceCode>2</DeathPlaceCode>"
				+ "<DiagnosisTypeCode>"+crbdata.getColumnValueAsString("ZDLX")+"</DiagnosisTypeCode>"
				+ "<DiagnosisTypeName>"+crbdata.getColumnValueAsString("ZDLX_MC")+"</DiagnosisTypeName>"
				+ "<Hospitalnum>"+crbdata.getColumnValueAsString("ZYH")+"</Hospitalnum>"
				+ "<CardID>"+CardID+"</CardID>"//<!--卡片ID-->
				+ "<CreatingTime>"+CreatingTime+"</CreatingTime>"
				+ "</BaseInfo>"
				
				
				//<!--传染病数据-->
				+ "<IDRCard>"
				+ "<CaseClassificationCode>"+crbdata.getColumnValueAsString("BLFL")+"</CaseClassificationCode>"
				+ "<CaseClassificationName>"+crbdata.getColumnValueAsString("BLFL_MC")+"</CaseClassificationName>"
				+ "<OtherDiseaseName>"+crbdata.getColumnValueAsString("QTJBMC")+"</OtherDiseaseName>"
				+ "<OnsetDate>"+OnsetDate+"</OnsetDate>"
				+ "<CloseContactsSymptomCode>"+crbdata.getColumnValueAsString("MJZYWXTZZ")+"</CloseContactsSymptomCode>"
				+ "<CloseContactsSymptomName>"+crbdata.getColumnValueAsString("MJZYWXTZZ_MC")+"</CloseContactsSymptomName>"
				+ "<Customer>"+Customer+"</Customer>"
				+ "<DeletingReasonDetails></DeletingReasonDetails>"
				+ "<DeletingTypeCode></DeletingTypeCode>"
				+ "<DeletingTypeName></DeletingTypeName>"

//				+ "<NewPneumSeverityCode></NewPneumSeverityCode>"
//				+ "<NewPneumSeverityName></NewPneumSeverityName>"
//				+ "<ForeignTypeCode></ForeignTypeCode>"
//				+ "<ForeignTypeName></ForeignTypeName>"
//				+ "<MgmtStatusCode></MgmtStatusCode>"
//				+ "<IsDeadByThisCode></IsDeadByThisCode>"
//				+ "<SymptomsCode></SymptomsCode>"
				
				
				//艾滋病
				+ "<AIDS>"
				+ "<AIDSCardID>"+CardID+"</AIDSCardID>"
				+ "<ContactHistoryCode>"+crbdata.getColumnValueAsString("JCS")+"</ContactHistoryCode>"
				+ "<ContactHistoryName>"+crbdata.getColumnValueAsString("JCS_MC")+"</ContactHistoryName>"
				+ "<InjectionTogetherNum>"+crbdata.getColumnValueAsString("JCS_DPZSRS")+"</InjectionTogetherNum>"
				+ "<NonmaritalSexNum>"+crbdata.getColumnValueAsString("JSC_XJCSRS")+"</NonmaritalSexNum>"
				+ "<HomosexualSexNum>"+crbdata.getColumnValueAsString("JSC_NNRS")+"</HomosexualSexNum>"
				+ "<OtherContactHistory>"+crbdata.getColumnValueAsString("JSC_QTNR")+"</OtherContactHistory>"
				+ "<VenerealHistoryCode>"+crbdata.getColumnValueAsString("XBS")+"</VenerealHistoryCode>"
				+ "<VenerealHistoryName>"+crbdata.getColumnValueAsString("XBS_MC")+"</VenerealHistoryName>"
				+ "<PossibleInfectionRouteCode>"+crbdata.getColumnValueAsString("ZYKNGRTJ")+"</PossibleInfectionRouteCode>"
				+ "<PossibleInfectionRouteName>"+crbdata.getColumnValueAsString("ZYKNGRTJ_MC")+"</PossibleInfectionRouteName>"
				+ "<OtherInfectionRoute>"+crbdata.getColumnValueAsString("GRTJQT")+"</OtherInfectionRoute>"
				+ "<SpecimenSourceCode>"+crbdata.getColumnValueAsString("HIV_YBLY")+"</SpecimenSourceCode>"
				+ "<SpecimenSourceName>"+crbdata.getColumnValueAsString("HIV_YBLY_MC")+"</SpecimenSourceName>"
				+ "<OtherSampleSource>"+crbdata.getColumnValueAsString("HIV_YBLYQT")+"</OtherSampleSource>"
				+ "<LaborTestConclusionCode>"+crbdata.getColumnValueAsString("SYSJCJL")+"</LaborTestConclusionCode>"
				+ "<LaborTestConclusionName>"+crbdata.getColumnValueAsString("SYSJCJL_MC")+"</LaborTestConclusionName>"
				+ "<ConfirmedTestPositiveDate>"+crbdata.getColumnValueAsString("HIV_JCYXRQ")+"</ConfirmedTestPositiveDate>"
				+ "<ConfirmedTestPositiveOrgName>"+crbdata.getColumnValueAsString("HIV_JCDW")+"</ConfirmedTestPositiveOrgName>"
				+ "<AIDSDiagnosisDate>"+crbdata.getColumnValueAsString("HIVZDRQ")+"</AIDSDiagnosisDate>"
				+ "<ChlamydialTrachomatisCode>"+crbdata.getColumnValueAsString("SZDSYYYTGR")+"</ChlamydialTrachomatisCode>"
				+ "<ChlamydialTrachomatisName>"+crbdata.getColumnValueAsString("SZDSYYYTGR_MC")+"</ChlamydialTrachomatisName>"
				+ "</AIDS>"
				//<!—手足口病附卡
				+ "<HFMD>"
				+ "<HFMDCardID>"+CardID+"</HFMDCardID>"
				+ "<IntensivePatientCode>"+crbdata.getColumnValueAsString("SZK_ZZHZ")+"</IntensivePatientCode>"
				+ "<IntensivePatientName>"+crbdata.getColumnValueAsString("SZK_ZZHZ_MC")+"</IntensivePatientName>"
				+ "<LaborTestResultCode>"+crbdata.getColumnValueAsString("SZK_SYSJG")+"</LaborTestResultCode>"
				+ "<LaborTestResultName>"+crbdata.getColumnValueAsString("SZK_SYSJG_MC")+"</LaborTestResultName>"
				+ "</HFMD>"
				//HB乙肝填写此栏
				+"<HB>"
				+ "<HBCardID>"+CardID+"</HBCardID>"
				+ "<HBsAgTestPositiveTypeCode>"+crbdata.getColumnValueAsString("HB_YXSJ")+"</HBsAgTestPositiveTypeCode>"
				+ "<HBsAgTestPositiveTypeName>"+crbdata.getColumnValueAsString("HB_YXSJ_MC")+"</HBsAgTestPositiveTypeName>"
				+ "<FirstHBSymptomTime>"+crbdata.getColumnValueAsString("HB_SCSJ")+"</FirstHBSymptomTime>"
				+ "<LastAltValue>"+crbdata.getColumnValueAsString("HB_ALT")+"</LastAltValue>"
				+ "<HBcAbIgMTestCode>"+crbdata.getColumnValueAsString("HB_1000")+"</HBcAbIgMTestCode>"
				+ "<HBcAbIgMTestName>"+crbdata.getColumnValueAsString("HB_1000_MC")+"</HBcAbIgMTestName>"
				+ "<LiveRpunctureTestCode>"+crbdata.getColumnValueAsString("HB_GCJCJG")+"</LiveRpunctureTestCode>"
				+ "<LiveRpunctureTestName>"+crbdata.getColumnValueAsString("HB_GCJCJG_MC")+"</LiveRpunctureTestName>"
				+ "<HBsAgNorHBsAbpCode>"+crbdata.getColumnValueAsString("HB_SAG")+"</HBsAgNorHBsAbpCode>"
				+ "<HBsAgNorHBsAbpName>"+crbdata.getColumnValueAsString("HB_SAG_MC")+"</HBsAgNorHBsAbpName>"
				+ "<FirstHBSymptomUnsureCode>"+crbdata.getColumnValueAsString("HB_SCSJCHECK")+"</FirstHBSymptomUnsureCode>"
				+ "</HB>"
				//<AFP><!—AFP附卡
				//+ "<AFP>"
				//+ "	<AFPCardID>"+crbdata.getColumnValueAsString("ID")+"</AFPCardID><!--主键-->"
				//+ "<!--病人所属地类型编码-->"
				//+ "	<PatientResidenceTypeCode>"+crbdata.getColumnValueAsString("BRSY")+"</PatientResidenceTypeCode>"
				//+ "	<PatientResidenceTypeCodeName>"+crbdata.getColumnValueAsString("BRSY_MC")+"</PatientResidenceTypeCodeName>"
				//+ "	<!--麻痹日期-->"
				//+ "	<PalsyDate>"+crbdata.getColumnValueAsString("")+"</PalsyDate>"
				//+ "<!--来现就诊地日期-->"
				//+ "	<TreatmentlandDate>"+crbdata.getColumnValueAsString("")+"</TreatmentlandDate>"
				//+ "<!--现就诊地住址类型编码-->"
				//+ "<TreatmentlandTypeCode>"+crbdata.getColumnValueAsString("")+"</TreatmentlandTypeCode>"
				//+ "<!--现就诊地住址类型名称-->"
				//+ "	<TreatmentlandTypeName>"+crbdata.getColumnValueAsString("")+"</TreatmentlandTypeName>"
				//+ "<!--现就诊地住址国标编码-->"
				//+ "	<TreatmentlandZoneCode>"+crbdata.getColumnValueAsString("")+"</TreatmentlandZoneCode>"
				//+ "<!--现就诊地住址国标名称-->"
				//+ "<TreatmentlandZoneName>"+crbdata.getColumnValueAsString("")+"</TreatmentlandZoneName>"
				//+ " 	<!--现就诊地详细住址-->"
				//+ "	<TreatmentlandLivingAddressDetails>"
				//+ "</TreatmentlandLivingAddressDetails>"
				//+ "<!--麻痹症状-->"
				//+ "< PalsySymptom >"+crbdata.getColumnValueAsString("")+"</ PalsySymptom >"
				//+ "</AFP>"
				+ "</IDRCard>"
				//+ "<NCDCard><!--慢病数据-->"
				//+ "<LastXycdzss>"+crbdata.getColumnValueAsString("")+"</LastXycdzss><!--舒张压-->"
				//+ "<LastXycdzsz>"+crbdata.getColumnValueAsString("")+"</LastXycdzsz><!--收缩压-->"
				//+ "<LastKfxtcdz>"+crbdata.getColumnValueAsString("")+"</LastKfxtcdz><!--空腹血糖测定值-->"
				//+ "<LastChxtcdz>"+crbdata.getColumnValueAsString("")+"</LastChxtcdz><!--餐后血糖测定值-->"
				//+ "<Bgv>"+crbdata.getColumnValueAsString("")+"</Bgv><!--空腹血糖测定值-->"
				//+ "<OutcomeCode>"+crbdata.getColumnValueAsString("")+"</OutcomeCode><!--转归编码（参见7.24）-->"
				//+ "<Pathology>"+crbdata.getColumnValueAsString("")+"</Pathology><!--病理诊断，限肿瘤填写-->"
				//+ "<Patientnum>"+crbdata.getColumnValueAsString("")+"</Patientnum><!--门诊号-->"
				//+ "<Pathologynum>"+crbdata.getColumnValueAsString("")+"</Pathologynum><!--病理号，限肿瘤填写-->"
				//+ "<FirstCase>"+crbdata.getColumnValueAsString("")+"</FirstCase><!--是否首发病例，限心脑填写（参见7.25）-->"
				//+ "<!--ICDO3形态学，限肿瘤填写-->"
				//+ "<Icdo3Morphology>"+crbdata.getColumnValueAsString("")+"</Icdo3Morphology>"
				//+ "<!--ICDO3分化程度，限肿瘤填写（参见7.26）-->"
				//+ "<Icdo3Degree>"+crbdata.getColumnValueAsString("")+"</Icdo3Degree>"
				//+ "<!--肿瘤分期是否不详，限肿瘤填写（参见7.27）-->"
				//+ "<StagingUnknown>"+crbdata.getColumnValueAsString("")+"</StagingUnknown>"
				//+ "<!--肿瘤分期T，限肿瘤填写（参见7.28）-->"
				//+ "<TumorstageT>"+crbdata.getColumnValueAsString("")+"</TumorstageT>"
				//+ "<!--肿瘤分期N，限肿瘤填写（参见7.29）-->"
				//+ "<TumorstageN>"+crbdata.getColumnValueAsString("")+"</TumorstageN>"
				//+ "<!--肿瘤分期M，限肿瘤填写（参见7.30）-->"
				//+ "<TumorstageM>"+crbdata.getColumnValueAsString("")+"</TumorstageM>"
				//+ "<!--肿瘤分期0-IV，限肿瘤填写（参见7.31）-->"
				//+ "<TumorstageIv>"+crbdata.getColumnValueAsString("")+"</TumorstageIv>"
				//+ "<Admissiontime>"+crbdata.getColumnValueAsString("")+"</Admissiontime><!--住院时间，限肿瘤填写-->"
				//+ "<Dischargetime>"+crbdata.getColumnValueAsString("")+"</Dischargetime><!--出院时间，限肿瘤填写-->"
				//+ "<TumorDiagnosis>"+crbdata.getColumnValueAsString("")+"</TumorDiagnosis>"
				//+ "<HeartbrainDiagnosis>"+crbdata.getColumnValueAsString("")+"</HeartbrainDiagnosis>"
				//+ "<HighestDiagnosisUnit>"+crbdata.getColumnValueAsString("")+"</HighestDiagnosisUnit>"
				//+ "<Managerzonecode>33020300</Managerzonecode>"
				//+ "<Managerorgcode>330203002</Managerorgcode>"
				//+ "<DeathCause>"+crbdata.getColumnValueAsString("")+"</DeathCause><!--死亡原因编码（参见7.24）-->"
				//+ "<SpecifiDeathCause>"+crbdata.getColumnValueAsString("")+"</SpecifiDeathCause>"
				//+ "<Delflag>1</Delflag>"
				//+ "<UseridCreate>"+crbdata.getColumnValueAsString("")+"</UseridCreate>"
				//+ "</NCDCard>"
				//<!--死因数据--开始
				//				+ "<CODRISCard>"
				//				+ "<CauseA>C00</CauseA>"
				//				+ "<ICDCodeA>C00</ICDCodeA>"
				//				+ "<IntervalTimeA>"+crbdata.getColumnValueAsString("")+"</IntervalTimeA>"
				//				+ "<IntervalUnitCodeA>"+crbdata.getColumnValueAsString("")+"</IntervalUnitCodeA>"
				//				+ "<CauseB>"+crbdata.getColumnValueAsString("")+"</CauseB>"
				//				+ "<ICDCodeB>"+crbdata.getColumnValueAsString("")+"</ICDCodeB>"
				//				+ "<IntervalTimeB>"+crbdata.getColumnValueAsString("")+"</IntervalTimeB>"
				//				+ "<IntervalUnitCodeB>"+crbdata.getColumnValueAsString("")+"</IntervalUnitCodeB>"
				//				+ "<CauseC>"+crbdata.getColumnValueAsString("")+"</CauseC>"
				//				+ "<ICDCodeC>"+crbdata.getColumnValueAsString("")+"</ICDCodeC>"
				//				+ "<IntervalTimeC>"+crbdata.getColumnValueAsString("")+"</IntervalTimeC>"
				//				+ "<IntervalUnitCodeC>"+crbdata.getColumnValueAsString("")+"</IntervalUnitCodeC>"
				//				+ "<CauseD>"+crbdata.getColumnValueAsString("")+"</CauseD>"
				//				+ "<ICDCodeD>"+crbdata.getColumnValueAsString("")+"</ICDCodeD>"
				//				+ "<IntervalTimeD>"+crbdata.getColumnValueAsString("")+"</IntervalTimeD>"
				//				+ "<IntervalUnitCodeD>"+crbdata.getColumnValueAsString("")+"</IntervalUnitCodeD>"
				//				+ "<CauseOther>"+crbdata.getColumnValueAsString("")+"</CauseOther>"
				//				+ "<ICDCodeOther>"+crbdata.getColumnValueAsString("")+"</ICDCodeOther>"
				//				+ "<BasicCause>唇恶性肿瘤</BasicCause>"
				//				+ "<BasicICDCode>C00</BasicICDCode>"
				//				+ "<DiagnosticUnitCode>2</DiagnosticUnitCode>"
				//				+ "<DiagnosticBasisCode>2</DiagnosticBasisCode>"
				//				+ "<DoctorName>daf</DoctorName>"
				//				+ "<PoliceName>jingguan</PoliceName>"
				//				+ "<FillCardDate>2013-06-24T00:00:00</FillCardDate>"
				//				+ "<Symptoms>"+crbdata.getColumnValueAsString("")+"</Symptoms>"
				//				+ "<InvestigatedName>"+crbdata.getColumnValueAsString("")+"</InvestigatedName>"
				//				+ "<Relationship>"+crbdata.getColumnValueAsString("")+"</Relationship>"
				//				+ "<InvestigatedTel>"+crbdata.getColumnValueAsString("")+"</InvestigatedTel>"
				//				+ "<InferCause>"+crbdata.getColumnValueAsString("")+"</InferCause>"
				//				+ "<Investigator>"+crbdata.getColumnValueAsString("")+"</Investigator>"
				//				+ "<InvestigateDate>"+crbdata.getColumnValueAsString("")+"</InvestigateDate>"
				//				+ "<CardFillingTime>"+crbdata.getColumnValueAsString("BGRQ")+"</CardFillingTime>"
				//				+ "<EntryPeopleName>莫洛作布</EntryPeopleName>"
				//				+ "<ValidTime>"+crbdata.getColumnValueAsString("SHSJ")+"</ValidTime>"
				//				+ "<CorrectionState>0</CorrectionState>"
				//				+ "<AuditPeopleName>莫洛作布</AuditPeopleName>"
				//				+ "<FirstValidTime>"+crbdata.getColumnValueAsString("")+"</FirstValidTime>"
				//				+ "<HospitalNo>"+crbdata.getColumnValueAsString("ZYH")+"</HospitalNo>"
				//				+ "<AuditState>3</AuditState>" 
				//				+ "<WomanTypeCode></WomanTypeCode>"
				//				+ "</CODRISCard>"
				//<!--死因数据--结束
				+ "</eventBody>"
				+ "</DataExchange>";
		JSONObject rJson=new JSONObject();
		System.err.println(GzzNPCService.getInstance(jgid).crhsbhj());
		rJson.put("env", GzzNPCService.getInstance(jgid).crhsbhj());
		rJson.put("content", str);
		rJson.put("method","transferDataToDmp");
		System.err.println(rJson.toString());
		System.err.println(str);

		//String result=sendPost("http://127.0.0.1:8099/crbrquest/crbsb",rJson.toString());
		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);
				if("0".equals(result_Json.getString("code"))) {
					DxNormalDataManager crb_infodao = (DxNormalDataManager)DaoCreator.getNormalDao(this,"crb_infodao_bypkey");
					crb_infodao.reload(new Object[] {jgid,pkey});
					crb_infodao.setColumnValue("SBRY",MainUtil.getCurUserAccount());
					crb_infodao.setColumnValue("SBZT","1");
					crb_infodao.setColumnValue("SBSJ", new Timestamp(System.currentTimeMillis()));
					crb_infodao.setColumnValue("EVENTID",eventId);
					if(crb_infodao.commit()) {
						dlg.messageDlg("上报成功");
					}else {
						dlg.messageDlg("上报成功，但是his保存失败");
					}
				}else {
					dlg.messageDlg("上报失败【"+result_Json.getString("msg")+"】");
				}
			} catch (ParseException e) {
				e.printStackTrace();
			}
		}
	}
	private String sendPost(String url,String param){
		boolean lb=false;
		PostMethod postMethod = new PostMethod(url);
		try {
			HttpClient httpClient = new HttpClient();
			httpClient.setConnectionTimeout(60*1000);
			postMethod.setRequestHeader("Content-Type","application/json;charset=UTF-8");  
//			postMethod.setRequestHeader("charset","utf-8");  
			postMethod.setRequestEntity(new StringRequestEntity(param,"application/json","utf-8"));     
			int statusCode = httpClient.executeMethod(postMethod);
			if(statusCode == HttpStatus.SC_OK) {
				lb=true;
				String str = new String(postMethod.getResponseBody());//本机要UTF-8
				System.out.println("===回调通知第三方返回==" +str);
				return str;
			}else {
				System.out.println("调用失败！错误码：" + statusCode);
				return "";
			}
		} catch (Exception e) {
			e.printStackTrace();
		}
		return "";
	}
	protected void initEvent() {
		super.initEvent();
		this.addWindowListener(new WindowAdapter(){
			public void windowClosed(WindowEvent windowevent) {
				closeAction();
			}
		});		
		panelBar1.addActionListener(new ActionListener(){
			public void actionPerformed(ActionEvent actionevent) {
				panelBar1Action(actionevent.getActionCommand());
			}
		});
 		panelBar3.addActionListener(new ActionListener(){
			public void actionPerformed(ActionEvent actionevent) {
				panelBar3Action(actionevent.getActionCommand());
			}
		});
 

	}
}
\ No newline at end of file
diff --git a/WEB-INF/src/com/his/cwgl/ksbb/fybb/SrfltjForm.xml b/WEB-INF/src/com/his/cwgl/ksbb/fybb/SrfltjForm.xml
index 76ea47a..da1a460 100644
--- a/WEB-INF/src/com/his/cwgl/ksbb/fybb/SrfltjForm.xml
+++ b/WEB-INF/src/com/his/cwgl/ksbb/fybb/SrfltjForm.xml
@@ -124,8 +124,8 @@
 						AND d.JGID = sfx.JGID 
 						left join MAIN_JGZDB fydlzd on fydlzd.JGID = sfx.JGID and fydlzd.JGZDLB_BH = 'Z00003' and fydlzd.BH = sfx.FYDL
 						left join MAIN_JGZDB fyzlzd on fyzlzd.JGID = sfx.JGID and fyzlzd.JGZDLB_BH = 'Z00004' and fyzlzd.BH = sfx.FYZL
-						left join HIS_YB_DJ dj on b.pkey=dj.ZDZBPKEY and b.JGID=dj.JGID 
-						left join HIS_YB_JSB js on dj.JGID=js.JGID and dj.IPT_NO=js.IPT_NO and dj.MDTRT_ID=js.MDTRT_ID
+						left join HIS_YB_DJ dj on b.pkey=dj.ZDZBPKEY and b.JGID=dj.JGID  and dj.djcxzt='0' 
+						left join HIS_YB_JSB js on dj.JGID=js.JGID and dj.IPT_NO=js.IPT_NO and dj.MDTRT_ID=js.MDTRT_ID and js.cxzt='0'
 					WHERE
 						a.JGID =?
 						AND c.SFRQ >=?
@@ -167,8 +167,8 @@
 					left join MAIN_JGZDB fydlzd on fydlzd.JGID = sfx.JGID and fydlzd.JGZDLB_BH = 'Z00003' and fydlzd.BH = sfx.FYDL
 					left join MAIN_JGZDB fyzlzd on fyzlzd.JGID = sfx.JGID and fyzlzd.JGZDLB_BH = 'Z00004' and fyzlzd.BH = sfx.FYZL
 					LEFT JOIN HIS_JZ_BASEINFO d ON mxb.jzpkey = d.pkey AND mxb.JGID = d.JGID
-					left join HIS_YB_DJ dj on zb.pkey=dj.ZDZBPKEY and zb.JGID=dj.JGID 
-					left join HIS_YB_JSB js on dj.JGID=js.JGID and dj.IPT_NO=js.IPT_NO and dj.MDTRT_ID=js.MDTRT_ID
+					left join HIS_YB_DJ dj on zb.pkey=dj.ZDZBPKEY and zb.JGID=dj.JGID and dj.djcxzt='0' 
+					left join HIS_YB_JSB js on dj.JGID=js.JGID and dj.IPT_NO=js.IPT_NO and dj.MDTRT_ID=js.MDTRT_ID and js.cxzt='0'
 					where #select#
 						and sfxmxb.JGID = ?
 						AND ( d.JZLX = 'Z' OR d.JZLX = 'J' ) 
@@ -217,8 +217,8 @@
 						AND d.JGID = sfx.JGID 
 						left join MAIN_JGZDB fydlzd on fydlzd.JGID = sfx.JGID and fydlzd.JGZDLB_BH = 'Z00003' and fydlzd.BH = sfx.FYDL
 						left join MAIN_JGZDB fyzlzd on fyzlzd.JGID = sfx.JGID and fyzlzd.JGZDLB_BH = 'Z00004' and fyzlzd.BH = sfx.FYZL
-						left join HIS_YB_DJ dj on b.pkey=dj.ZDZBPKEY and b.JGID=dj.JGID 
-						left join HIS_YB_JSB js on dj.JGID=js.JGID and dj.IPT_NO=js.IPT_NO and dj.MDTRT_ID=js.MDTRT_ID
+						left join HIS_YB_DJ dj on b.pkey=dj.ZDZBPKEY and b.JGID=dj.JGID and dj.djcxzt='0' 
+						left join HIS_YB_JSB js on dj.JGID=js.JGID and dj.IPT_NO=js.IPT_NO and dj.MDTRT_ID=js.MDTRT_ID and js.cxzt='0'
 					WHERE
 						a.JGID =?
 						AND c.SFRQ >=?
@@ -242,8 +242,8 @@
 					left join MAIN_JGZDB fydlzd on fydlzd.JGID = sfx.JGID and fydlzd.JGZDLB_BH = 'Z00003' and fydlzd.BH = sfx.FYDL
 					left join MAIN_JGZDB fyzlzd on fyzlzd.JGID = sfx.JGID and fyzlzd.JGZDLB_BH = 'Z00004' and fyzlzd.BH = sfx.FYZL
 					LEFT JOIN HIS_JZ_BASEINFO d ON mxb.jzpkey = d.pkey AND mxb.JGID = d.JGID
-					left join HIS_YB_DJ dj on zb.pkey=dj.ZDZBPKEY and zb.JGID=dj.JGID 
-					left join HIS_YB_JSB js on dj.JGID=js.JGID and dj.IPT_NO=js.IPT_NO and dj.MDTRT_ID=js.MDTRT_ID
+					left join HIS_YB_DJ dj on zb.pkey=dj.ZDZBPKEY and zb.JGID=dj.JGID and dj.djcxzt='0' 
+					left join HIS_YB_JSB js on dj.JGID=js.JGID and dj.IPT_NO=js.IPT_NO and dj.MDTRT_ID=js.MDTRT_ID and js.cxzt='0'
 					where sfxmxb.JGID = ?
 						AND ( d.JZLX = 'Z' OR d.JZLX = 'J' ) 
 						AND ( d.JZZT = 'Z' OR d.JZZT = 'C' ) 
diff --git a/WEB-INF/src/com/his/mz/service/GzzNPCService.java b/WEB-INF/src/com/his/mz/service/GzzNPCService.java
index 381b54f..c18591a 100644
--- a/WEB-INF/src/com/his/mz/service/GzzNPCService.java
+++ b/WEB-INF/src/com/his/mz/service/GzzNPCService.java
@@ -168,6 +168,8 @@ public class GzzNPCService {
 	private GzzNPModel gzzNp0152;	
 	private GzzNPModel GZZNP0153;	
 	private GzzNPModel GZZNP0154;	
+	private GzzNPModel GZZNP0155;	
+	private GzzNPModel GZZNP0156;	
 	/**
 	 * 用于获取service的单例方法
 	 * @param companyid
@@ -3537,9 +3539,9 @@ public class GzzNPCService {
 	
 	/**
 	 * 	
-		医嘱单的频次显示为编码 GZZNP0154
+		医嘱单的频次去除.符号 GZZNP0154
 	 */
-	public boolean isYzdPcbmShow() {
+	public boolean yzdRmfhShow() {
 		boolean result = false;
 		if(GZZNP0154 == null) {
 			GZZNP0154 = new GzzNPModel();
@@ -3556,4 +3558,45 @@ public class GzzNPCService {
 		return result;
 	}
 	
+	/**
+	 * 	
+		医嘱单内容的频次显示为打印名称 GZZNP0155
+	 */
+	public boolean isYZNRPcbmShow() {
+		boolean result = false;
+		if(GZZNP0155 == null) {
+			GZZNP0155 = new GzzNPModel();
+			GZZNP0155.setCompanyId(jzModel.getCompanyId());
+			GZZNP0155.setBm("GZZNP0155");
+			GZZNP0155 = getGzzNormalParams(GZZNP0155);
+		}
+		String value = GZZNP0155.getValue();
+		if("1".equals(value)) {
+			result = true;
+		}else{
+			result = false;
+		}
+		return result;
+	}
+	
+	/**
+	 * 	
+		 GZZNP0156  医嘱单内容的频次显示为中文,与GZZNP0155同时存在时GZZNP0155规则优先    
+	 */
+	public boolean isYZNRPcByChinese() {
+		boolean result = false;
+		if(GZZNP0156 == null) {
+			GZZNP0156 = new GzzNPModel();
+			GZZNP0156.setCompanyId(jzModel.getCompanyId());
+			GZZNP0156.setBm("GZZNP0156");
+			GZZNP0156 = getGzzNormalParams(GZZNP0156);
+		}
+		String value = GZZNP0156.getValue();
+		if("1".equals(value)) {
+			result = true;
+		}else{
+			result = false;
+		}
+		return result;
+	}
 }
diff --git a/WEB-INF/src/com/his/xtgl/HisYpxxEditContainer.java b/WEB-INF/src/com/his/xtgl/HisYpxxEditContainer.java
index 5e999e5..a082045 100644
--- a/WEB-INF/src/com/his/xtgl/HisYpxxEditContainer.java
+++ b/WEB-INF/src/com/his/xtgl/HisYpxxEditContainer.java
@@ -3,7 +3,6 @@ package com.his.xtgl;
 import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.List;
-
 import com.his.util.HisYfykUtil;
 import com.his.yp.HisYpExDxdwForm;
 import com.his.yp.HisYpxxBaseInfoForm;
@@ -104,6 +103,7 @@ public class HisYpxxEditContainer extends WatSDIWindow {
 			form2.setWinParams("formtitle",this.getWinParams("formtitle"));
 			form2.setWinParams("bm",bm);
 			form2.setWinParams("isnew", getWinParams("isnew"));
+			form2.setWinParams("flag",this.getWinParams("flag"));
 				
 			container.addByNoCloseForm(form2.getTitle(), form2,false);
 			
@@ -162,6 +162,16 @@ public class HisYpxxEditContainer extends WatSDIWindow {
 	    	this.setTitle(this.getWinParams("formtitle")+"——查看");
 	    }
 		
+
+		String flag=""+getWinParams("flag");
+		if ("1".equals(flag)) {
+			container.setSelectedByFormId(HisYpxxSFXInfoForm.class.getName());
+			
+		}
+		
+		
+
+		
 		
 	}
 
diff --git a/WEB-INF/src/com/his/yb/form/Mzjs.java b/WEB-INF/src/com/his/yb/form/Mzjs.java
index 964c143..2cc170a 100644
--- a/WEB-INF/src/com/his/yb/form/Mzjs.java
+++ b/WEB-INF/src/com/his/yb/form/Mzjs.java
@@ -8,16 +8,13 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-
 import org.dom4j.Document;
 import org.dom4j.DocumentException;
 import org.dom4j.DocumentHelper;
 import org.dom4j.Element;
-
 import com.dzfp.model.DzfpModel;
 import com.dzfp.service.EIService;
 import com.google.gson.JsonObject;
-import com.his.mz.cardmanage.mapper.HzCardZhDaoMapper;
 import com.his.mz.ghmanage.model.MzKsjzModel;
 import com.his.mz.mzsfmanage.model.MzsfModel;
 import com.his.mz.mztfmanage.model.MztfModel;
@@ -4402,6 +4399,16 @@ public class Mzjs extends WatSDIWindow {
 		 ybjsbdao_gj.setColumnValue("CXZT", "1");
 		 String insutyey =ybjsbdao_gj.getColumnValueAsString("INSUTYPE");
 		 String med_type =ybjsbdao_gj.getColumnValueAsString("MED_TYPE");
+		 String PSN_NAME =ybjsbdao_gj.getColumnValueAsString("PSN_NAME");
+		 String PSN_CERT_TYPE =ybjsbdao_gj.getColumnValueAsString("PSN_CERT_TYPE");
+		 String CERTNO =ybjsbdao_gj.getColumnValueAsString("CERTNO");
+		 String GEND =ybjsbdao_gj.getColumnValueAsString("GEND");
+		 String NATY =ybjsbdao_gj.getColumnValueAsString("NATY");
+		 long BRDY =ybjsbdao_gj.getColumnValueAsLong("BRDY");
+		 String AGE =ybjsbdao_gj.getColumnValueAsString("AGE");
+		 String MDTRT_CERT_TYPE =ybjsbdao_gj.getColumnValueAsString("MDTRT_CERT_TYPE");
+		 String MED_TYPE =ybjsbdao_gj.getColumnValueAsString("MED_TYPE");
+		 String CVLSERV_FLAG =ybjsbdao_gj.getColumnValueAsString("CVLSERV_FLAG");
 		 JSONObject setlinfo;
 		 JSONArray setldetail;
 		 String tx="";  
@@ -4469,6 +4476,17 @@ public class Mzjs extends WatSDIWindow {
 			 ybjsbdao_gj.setColumnValue("OMSGID", omsgid);
 			 ybjsbdao_gj.setColumnValue("INSUTYPE", insutyey);
 			 ybjsbdao_gj.setColumnValue("MED_TYPE", med_type);
+			 ybjsbdao_gj.setColumnValue("PSN_NAME", PSN_NAME);
+			 ybjsbdao_gj.setColumnValue("PSN_CERT_TYPE", PSN_CERT_TYPE);
+			 ybjsbdao_gj.setColumnValue("PSN_CERT_TYPE", PSN_CERT_TYPE);
+			 ybjsbdao_gj.setColumnValue("CERTNO", CERTNO);
+			 ybjsbdao_gj.setColumnValue("GEND", GEND);
+			 ybjsbdao_gj.setColumnValue("NATY", NATY);
+			 ybjsbdao_gj.setColumnValue("BRDY", BRDY);
+			 ybjsbdao_gj.setColumnValue("AGE", AGE);
+			 ybjsbdao_gj.setColumnValue("MDTRT_CERT_TYPE", MDTRT_CERT_TYPE);
+			 ybjsbdao_gj.setColumnValue("MED_TYPE", MED_TYPE);
+			 ybjsbdao_gj.setColumnValue("CVLSERV_FLAG", CVLSERV_FLAG);
 			 try {  
 				 ybjsbdao_gj.setColumnValue("SETL_TIME", new Timestamp(sdf.parse(setlinfo.getString("setl_time")).getTime()));
 			 } catch (Exception e2) {
diff --git a/WEB-INF/src/com/his/yb/form/YbBasyExport.java b/WEB-INF/src/com/his/yb/form/YbBasyExport.java
index afc7ac1..dbbd9c1 100644
--- a/WEB-INF/src/com/his/yb/form/YbBasyExport.java
+++ b/WEB-INF/src/com/his/yb/form/YbBasyExport.java
@@ -4,9 +4,6 @@ import java.sql.Timestamp;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
-
-import org.apache.commons.beanutils.converters.StringArrayConverter;
-import com.his.yb.util.Util;
 import com.util.ExcelUtils;
 import com.util.MainUtil;
 import com.wat.component.DxComboBox;
@@ -17,7 +14,6 @@ import com.wat.component.coolcomponent.DxCoolButton;
 import com.wat.component.coolcomponent.DxCoolTab;
 import com.wat.component.coolcomponent.DxCoolTextField;
 import com.wat.component.datagrid.DxDataGrid;
-import com.wat.core.component.AppInstance;
 import com.wat.core.component.WatForm;
 import com.wat.core.component.WatSDIWindow;
 import com.wat.core.component.event.ActionEvent;
@@ -537,6 +533,9 @@ public class YbBasyExport extends WatSDIWindow {
 				dao.setColumnValue("DDHZCDYY",basydao.getColumnValueAsString(i,"DDHZCDYY"));
 				dao.setColumnValue("ZYQJSTYS",Delphi.isNullString(basydao.getColumnValueAsString(i,"ZYQJSTYS"))? "2":basydao.getColumnValueAsString(i,"ZYQJSTYS"));
 				dao.setColumnValue("LYSTSNSDZ",basydao.getColumnValueAsString(i,"LYSTSNSDZ"));
+				if ("-".equals(basydao.getColumnValueAsString(i,"LYSTSNSDZ"))) {
+					dao.setColumnValue("LYSTSNSDZ","");
+				}
 				
 				String dwfzrStr=(String) jgrydicdao.getDicValue(basydao.getColumnValueAsString(i,"DWFZR"),"NAME");
 				String tjfzrStr=(String) jgrydicdao.getDicValue(basydao.getColumnValueAsString(i,"TJFZR"),"NAME");
diff --git a/WEB-INF/src/com/his/yb/form/Zyjs.java b/WEB-INF/src/com/his/yb/form/Zyjs.java
index 45d1bc6..bdaf859 100644
--- a/WEB-INF/src/com/his/yb/form/Zyjs.java
+++ b/WEB-INF/src/com/his/yb/form/Zyjs.java
@@ -9,12 +9,10 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-
 import org.dom4j.Document;
 import org.dom4j.DocumentException;
 import org.dom4j.DocumentHelper;
 import org.dom4j.Element;
-
 import com.google.gson.JsonObject;
 import com.his.yb.model.YbModel;
 import com.his.yb.service.YbService;
@@ -4728,6 +4726,18 @@ public class Zyjs extends WatSDIWindow {
 		 ybdjdao.setColumnValue("GJ_FLAG", "0");
 		 DxNormalDataManager ybjsbdao_gj=DaoCreator.getNormalDao(this,"ybjsbdao_gj");//共济
 		 ybjsbdao_gj.setColumnValue("CXZT", "1");
+		 String insutyey =ybjsbdao_gj.getColumnValueAsString("INSUTYPE");
+		 String med_type =ybjsbdao_gj.getColumnValueAsString("MED_TYPE");
+		 String PSN_NAME =ybjsbdao_gj.getColumnValueAsString("PSN_NAME");
+		 String PSN_CERT_TYPE =ybjsbdao_gj.getColumnValueAsString("PSN_CERT_TYPE");
+		 String CERTNO =ybjsbdao_gj.getColumnValueAsString("CERTNO");
+		 String GEND =ybjsbdao_gj.getColumnValueAsString("GEND");
+		 String NATY =ybjsbdao_gj.getColumnValueAsString("NATY");
+		 long BRDY =ybjsbdao_gj.getColumnValueAsLong("BRDY");
+		 String AGE =ybjsbdao_gj.getColumnValueAsString("AGE");
+		 String MDTRT_CERT_TYPE =ybjsbdao_gj.getColumnValueAsString("MDTRT_CERT_TYPE");
+		 String MED_TYPE =ybjsbdao_gj.getColumnValueAsString("MED_TYPE");
+		 String CVLSERV_FLAG =ybjsbdao_gj.getColumnValueAsString("CVLSERV_FLAG");
 		 JSONObject setlinfo;
 		 JSONArray setldetail;
 		 String tx="";  
@@ -4747,6 +4757,7 @@ public class Zyjs extends WatSDIWindow {
 			 ybjsbdao_gj.setColumnValue("CZY",MainUtil.getCurUserAccount());
 			 ybjsbdao_gj.setColumnValue("CZSJ", new Timestamp(System.currentTimeMillis()));
 			 ybjsbdao_gj.setColumnValue("CXZT", "1");
+			 ybjsbdao_gj.setColumnValue("GJ_FLAG", "1");
 			 ybjsbdao_gj.setColumnValue("balc", setlinfo.getString("balc"));
 			 ybjsbdao_gj.setColumnValue("MDTRT_ID", setlinfo.getString("mdtrt_id"));
 			 ybjsbdao_gj.setColumnValue("SETL_ID", setlinfo.getString("setl_id"));
@@ -4757,6 +4768,28 @@ public class Zyjs extends WatSDIWindow {
 			 ybjsbdao_gj.setColumnValue("psn_type", setlinfo.getString("psn_type"));
 			 ybjsbdao_gj.setColumnValue("MEDINS_SETL_ID", JSONUtils.getString(setlinfo, "medins_setl_id", ""));
 			 ybjsbdao_gj.setColumnValue("PSN_NO",setlinfo.getString("psn_no")); 
+			 ybjsbdao_gj.setColumnValue("ACCT_PAY",  JSONUtils.getString(setlinfo, "acct_pay","0"));
+			 ybjsbdao_gj.setColumnValue("PSN_CASH_PAY", JSONUtils.getString(setlinfo, "psn_cash_pay","0")); 
+			 
+			 ybjsbdao_gj.setColumnValue("CLR_WAY", JSONUtils.getString(setlinfo, "clr_way", ""));
+			 ybjsbdao_gj.setColumnValue("CLR_TYPE", JSONUtils.getString(setlinfo, "clr_type", ""));
+			 ybjsbdao_gj.setColumnValue("KLS", ybdjdao.getColumnValueAsString("KLS"));
+			 ybjsbdao_gj.setColumnValue("ZDZBPKEY", ybdjdao.getColumnValueAsString("ZDZBPKEY"));
+			 ybjsbdao_gj.setColumnValue("HZPKEY", ybdjdao.getColumnValueAsString("HZPKEY"));
+			 ybjsbdao_gj.setColumnValue("OMSGID", omsgid);
+			 ybjsbdao_gj.setColumnValue("INSUTYPE", insutyey);
+			 ybjsbdao_gj.setColumnValue("MED_TYPE", med_type);		 
+			 ybjsbdao_gj.setColumnValue("PSN_NAME", PSN_NAME);
+			 ybjsbdao_gj.setColumnValue("PSN_CERT_TYPE", PSN_CERT_TYPE);
+			 ybjsbdao_gj.setColumnValue("PSN_CERT_TYPE", PSN_CERT_TYPE);
+			 ybjsbdao_gj.setColumnValue("CERTNO", CERTNO);
+			 ybjsbdao_gj.setColumnValue("GEND", GEND);
+			 ybjsbdao_gj.setColumnValue("NATY", NATY);
+			 ybjsbdao_gj.setColumnValue("BRDY", BRDY);
+			 ybjsbdao_gj.setColumnValue("AGE", AGE);
+			 ybjsbdao_gj.setColumnValue("MDTRT_CERT_TYPE", MDTRT_CERT_TYPE);
+			 ybjsbdao_gj.setColumnValue("MED_TYPE", MED_TYPE);
+			 ybjsbdao_gj.setColumnValue("CVLSERV_FLAG", CVLSERV_FLAG);
 			 try {  
 				 ybjsbdao_gj.setColumnValue("SETL_TIME", new Timestamp(sdf.parse(setlinfo.getString("setl_time")).getTime()));
 			 } catch (Exception e2) {
diff --git a/WEB-INF/src/com/his/yb/service/YbService.java b/WEB-INF/src/com/his/yb/service/YbService.java
index 7470895..edf8587 100644
--- a/WEB-INF/src/com/his/yb/service/YbService.java
+++ b/WEB-INF/src/com/his/yb/service/YbService.java
@@ -15,9 +15,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Random;
-
-import org.apache.commons.lang.StringEscapeUtils;
-
 import com.his.util.HisYfykUtil;
 import com.his.yb.model.YbModel;
 import com.his.yb.util.ScYbRequest;
@@ -3974,6 +3971,13 @@ public class YbService {
 			action+="ZYQJSTYS,";
 		}
 		
+		String LYSTSNSDZ=emrbasyBaseforpkeydao.getColumnValueAsString("LYSTSNSDZ");//离院时透析血透腹透尿素氮值
+		if (!Delphi.isNullString(LYSTSNSDZ)&&!Delphi.isDouble(LYSTSNSDZ)){
+			msg+="离院时透析血透腹透尿素氮值为空或为数值！";
+			action+="LYSTSNSDZ,";
+		}
+		
+		
 		
 		if(msg.length()>0){
 			rtn[0]="-1";
diff --git a/WEB-INF/src/com/his/yfyk/HisRkdEdit.java b/WEB-INF/src/com/his/yfyk/HisRkdEdit.java
index 4e60cdc..2a4e94c 100644
--- a/WEB-INF/src/com/his/yfyk/HisRkdEdit.java
+++ b/WEB-INF/src/com/his/yfyk/HisRkdEdit.java
@@ -731,7 +731,7 @@ public class HisRkdEdit extends WatWebForm {
     		}else{
     			key = "%" + key.toUpperCase() + "%";
     		}
-			cell.setListSourceParameters(new Object[] {dptid,this.getWinParams("companyid"),lz,key,key,key });
+			cell.setListSourceParameters(new Object[] {dptid,this.getWinParams("companyid"),this.getWinParams("companyid"),lz,key,key,key });
 			cell.loadListSource();
 		}else{
 			String bm=cell.getListSource().getColumnValueAsString("BM");
diff --git a/WEB-INF/src/com/his/yp/HisJgYpxx.java b/WEB-INF/src/com/his/yp/HisJgYpxx.java
index 4ffe9ee..b8f1576 100644
--- a/WEB-INF/src/com/his/yp/HisJgYpxx.java
+++ b/WEB-INF/src/com/his/yp/HisJgYpxx.java
@@ -3,7 +3,6 @@ package com.his.yp;
 import java.sql.Types;
 import java.util.ArrayList;
 import java.util.List;
-
 import com.his.xtgl.HisYpxxEditContainer;
 import com.util.MainUtil;
 import com.util.SnowIdUtils;
@@ -371,7 +370,9 @@ public class HisJgYpxx extends WatWebForm {
         }else if("refresh".equals(command)) {
         }else if("export".equals(command)) {
         	dbgrid1.exportExcelByXls("机构药品信息");
-        }
+        }else if("match".equals(command)) {
+			panelBar1matchAction();
+		}
     }
     private void button1Action(){
     	String companyid=MainUtil.getCurCompanyID();
@@ -448,6 +449,27 @@ public class HisJgYpxx extends WatWebForm {
 			dbgrid1.setCalcFieldValue(i,"yxfl", toTxt());
 		}
 	}
+	
+	
+
+	private void panelBar1matchAction() {
+    	if(dbgrid1.getSelectedRow()>=0){
+    		HisYpxxEditContainer form = HisYpxxEditContainer.newWindow();
+    		form.setWindow(this);
+    		form.setWinParams("formstate", "editflag");
+    		form.setWinParams("dbgridmaster", dbgrid1);
+    		form.setWinParams("companyid", dbgrid1.getColumnValue("JGID"));
+    		form.setWinParams("formid",this.getWinParams("formid"));
+    		form.setWinParams("formtitle",this.getWinParams("formtitle"));
+			form.setWinParams("tymcbm", "");
+			form.setWinParams("isnew", "3");
+			form.setWinParams("flag", "1");
+    		form.setFlag(4);
+    		form.showAsModal();
+    	}
+    
+	}
+	
     protected void initEvent() {
        super.initEvent();
        panelBar1.addActionListener(new ActionListener(){
diff --git a/WEB-INF/src/com/his/yp/HisJgYpxx.xml b/WEB-INF/src/com/his/yp/HisJgYpxx.xml
index da6319f..0eeb34d 100644
--- a/WEB-INF/src/com/his/yp/HisJgYpxx.xml
+++ b/WEB-INF/src/com/his/yp/HisJgYpxx.xml
@@ -14,6 +14,8 @@
 <!--						title="刷新" type="button" />-->
 					<item align="left" command="export" image="/resources/normal/export.png"
 						title="导出" type="button" />
+						
+                  <item align="left" command="match" image="/resources/normal/edit.png" title="快速医保匹配" type="button"/>
 				</DxPanelBar>
 			</col>
 		</row>
diff --git a/WEB-INF/src/com/his/yp/HisSfx.java b/WEB-INF/src/com/his/yp/HisSfx.java
index 300ea9a..9beeb8c 100644
--- a/WEB-INF/src/com/his/yp/HisSfx.java
+++ b/WEB-INF/src/com/his/yp/HisSfx.java
@@ -4,7 +4,6 @@ import java.sql.Types;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import com.util.FileUpNewWindow;
 import com.util.GetCh2SpellBusi;
 import com.util.GetWubiBusi;
@@ -372,6 +371,8 @@ public class HisSfx extends WatWebForm {
 			panelBar3selectAction();
 		}else if("reset".equals(command)) {
 			panelBar3resetAction();
+		}else if("match".equals(command)) {
+			panelBar1matchAction();
 		}
 	}
 	private void panelBar3selectAction() {
@@ -452,6 +453,34 @@ public class HisSfx extends WatWebForm {
 		}
 		combobox3.setSelectedIndex(0);
 	}
+	
+	private void panelBar1matchAction() {
+		if(MainUtil.getFunctionValue((String)this.getWinParams("formid"), "Edit").equals("0")){
+			setLabelShow("提示:当前模块未开通该功能项,不允许操作!");
+			return;
+		}
+		if(MainUtil.getUserAuthorityValues((String)this.getWinParams("formid"), "Edit")==0){
+			setLabelShow("提示:你没有该功能项权限,不允许操作!");
+			return;
+		}
+		if(dbgrid1.getSelectedRow() < 0) {
+			setLabelShow("请选择需要编辑的机构");
+			return;
+		}
+
+		HisSfxEditNew form = HisSfxEditNew.newWindow();
+		form.setWindow(this);
+		form.setWinParams("formstate", "editflag");
+		form.setWinParams("dbgridmaster", dbgrid1);
+		form.setWinParams("companyid", MainUtil.getCurCompanyID());
+		form.setWinParams("formid",this.getWinParams("formid"));
+		form.setWinParams("formtitle",this.getWinParams("formtitle"));
+		form.setWinParams("flag", "1");
+		form.setFlag(100);
+		form.showAsModal();
+	}
+	
+	
 	protected void initEvent() {
 		super.initEvent();
 		panelBar1.addActionListener(new ActionListener(){
diff --git a/WEB-INF/src/com/his/yp/HisSfx.xml b/WEB-INF/src/com/his/yp/HisSfx.xml
index 9f5225f..8e00cb4 100644
--- a/WEB-INF/src/com/his/yp/HisSfx.xml
+++ b/WEB-INF/src/com/his/yp/HisSfx.xml
@@ -64,6 +64,7 @@
                   </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="match" image="/resources/normal/edit.png" title="快速医保匹配" type="button"/>
                 </DxPanelBar>
             </col>
         </row>
diff --git a/WEB-INF/src/com/his/yp/HisSfxEditNew.java b/WEB-INF/src/com/his/yp/HisSfxEditNew.java
index 10316f0..d9835df 100644
--- a/WEB-INF/src/com/his/yp/HisSfxEditNew.java
+++ b/WEB-INF/src/com/his/yp/HisSfxEditNew.java
@@ -1,7 +1,6 @@
 package com.his.yp;
 
 import java.sql.Types;
-
 import com.his.util.HisYfykUtil;
 import com.his.yfyk.service.YpBaseService;
 import com.util.GetCh2SpellBusi;
@@ -242,6 +241,18 @@ public class HisSfxEditNew extends WatSDIWindow {
 	    	setWindowEnable(false);
 	    }
 		
+		String flag=""+getWinParams("flag");
+		String mc=dbedit2.getText();
+		String bm=popgridyb.getValue();
+		if ("1".equals(flag)&&Delphi.isNullString(bm)) {
+			popgridyb.setText(mc);
+			String txt=popgridyb.getText();
+			if(!Delphi.isNullString(txt)) txt="%"+txt.toUpperCase()+"%";
+			popgridyb.setListSourceParameters(new Object[]{txt,txt,txt,txt});
+			popgridyb.loadListSource();		
+		}
+		
+		
 	}
 
 	public void modalFunction(int flag, Object para) {
diff --git a/WEB-INF/src/com/his/yp/HisYpxxSFXInfoForm.java b/WEB-INF/src/com/his/yp/HisYpxxSFXInfoForm.java
index 30ba977..30f3796 100644
--- a/WEB-INF/src/com/his/yp/HisYpxxSFXInfoForm.java
+++ b/WEB-INF/src/com/his/yp/HisYpxxSFXInfoForm.java
@@ -193,6 +193,18 @@ public class HisYpxxSFXInfoForm extends WatWebForm {
 	    	setWindowEnable(false);
 	    }
 
+
+		String flag=""+getWinParams("flag");
+		String mc=dbedit2.getText();
+		String ybbm=popgridyb.getValue();
+		if ("1".equals(flag)&&Delphi.isNullString(ybbm)) {
+			popgridyb.setText(mc);
+			String txt=popgridyb.getText();
+			if(!Delphi.isNullString(txt)) txt="%"+txt.toUpperCase()+"%";
+			popgridyb.setListSourceParameters(new Object[]{txt,txt,txt,txt});
+			popgridyb.loadListSource();		
+		}
+		
 	}
 
 	public void modalFunction(int flag, Object para) {
diff --git a/WEB-INF/src/com/his/zy/doctorworkstation/PatientOrderInputForm.xml b/WEB-INF/src/com/his/zy/doctorworkstation/PatientOrderInputForm.xml
index 747165b..7b69242 100644
--- a/WEB-INF/src/com/his/zy/doctorworkstation/PatientOrderInputForm.xml
+++ b/WEB-INF/src/com/his/zy/doctorworkstation/PatientOrderInputForm.xml
@@ -71,7 +71,7 @@
 					                <column   sort="false" fieldname="YZJL" type="TEXTEDIT_CELL"  cellenabled="true"  align="center"    width="53">单次剂量</column>
 					                <column   sort="false" fieldname="YZJLDW" type="POPGRIDTEXT_CELL" cellenabled="true" beginpop="false" popbutton="true" onlyoneautoset="false" inputautoinvalue="false" chinese="true" typewriting="true" showdetail="false" instantsearch="true"  names="编码,等效数量,等效单位" values="BH,DXSL,MC"   lds="MC:BH@dwyppopdao" dic="MC:BH@dwdicdao" width="90">剂量单位</column>
 					                <column   sort="false" fieldname="YZYF" type="POPGRIDTEXT_CELL" cellenabled="true" beginpop="false" popbutton="true" onlyoneautoset="false" inputautoinvalue="false" chinese="true" typewriting="true" showdetail="false" instantsearch="true" frontcache="true" frontquery="true" frontquerystr="ZJM like '%@%' or BM like '%@%' or MC like '%@%'"  names="编码,名称" values="BM,MC"     lds="MC:BM@yyyfPopDao" dic="MC:BM@yyyfDic" width="110">用法</column>
-					                <column   sort="false" fieldname="YZPC" type="POPGRIDTEXT_CELL" cellenabled="true" beginpop="false" popbutton="true" onlyoneautoset="false" inputautoinvalue="false" chinese="true" typewriting="true" showdetail="false" instantsearch="true" frontcache1="false" frontquery="true" frontquerystr="ZJM like '%@%' or BM LIKE '%@%' OR MC LIKE '%@%'"  names="编码,名称,周频次,分发时间" values="BM,MC,SFZPC,ZYFFSJ"      lds="MC:BM@yypcPopDao" dic="MC:BM@yypcDic" width="90">频次</column>
+					                <column   sort="false" fieldname="YZPC" type="POPGRIDTEXT_CELL" cellenabled="true" beginpop="false" popbutton="true" onlyoneautoset="false" inputautoinvalue="false" chinese="true" typewriting="true" showdetail="false" instantsearch="true" frontcache1="false" frontquery="true" frontquerystr="ZJM like '%@%' or BM LIKE '%@%' OR MC LIKE '%@%'"  names="打印名称,名称,周频次,分发时间,编码" values="PRINTNAME,MC,SFZPC,ZYFFSJ,BM"      lds="MC:BM@yypcPopDao" dic="MC:BM@yypcDic" width="90">频次</column>
 					                <column   sort="false" fieldname="YZSCZXCS" type="TEXTEDIT_CELL" cellenabled="true"  align="center"     width="50">首日</column>
 					                <column   sort="false" fieldname="YZLC" type="POPGRIDTEXT_CELL" cellenabled="true" beginpop="false" popbutton="true" onlyoneautoset="false" inputautoinvalue="false" chinese="true" typewriting="true" showdetail="false" instantsearch="true" names="编码,名称" values="BM,MC"  frontcache="true" frontquery="true" frontquerystr="zjm LIKE '%@%' OR BM LIKE '%@%' OR MC LIKE '%@%'"    lds="MC:BM@yylcPopDao" dic="MC:BM@yylcDic" width="90">疗程</column>
 					                <column   sort="false" fieldname="YZBZ" chinese="true" lds="mc:mc@yzbzinfoPopDao" names="备注信息" values="mc" frontcache="true" frontquery="true" frontquerystr="mc like '%@%' or pym like '%@%'"   cellenabled="true"  type="TEXTEDIT_CELL"  popbutton="true"  width="120">备注</column>					                
diff --git a/WEB-INF/src/com/his/zy/service/ZyYzService.java b/WEB-INF/src/com/his/zy/service/ZyYzService.java
index 3558bec..645bce8 100644
--- a/WEB-INF/src/com/his/zy/service/ZyYzService.java
+++ b/WEB-INF/src/com/his/zy/service/ZyYzService.java
@@ -7085,7 +7085,14 @@ public class ZyYzService {
 		String mc = zyyzOrderMapper.getDataManager().getColumnValueAsString(currrow,"mc");
 		
 		GzzNPCService service = GzzNPCService.getInstance(MainUtil.getCurCompanyID());
-		boolean zyyzdwzyzshow = service.isZygzzYzdshow();
+		boolean isprintpc = service.isYZNRPcbmShow();
+		Boolean pcbyzw = service.isYZNRPcByChinese();
+		if(isprintpc && !pcbyzw) {
+			int in = yypcDic.find("BM", yzpc);
+			if(in >= 0) {
+				yzpc = yypcDic.getColumnValueAsString(in,"PRINTNAME");
+			}
+		}
 		if(service.isNoShowGGInYzd()) {
 			if(!Delphi.isNullString(mc)) {
 				yzmc = mc;
@@ -7106,6 +7113,8 @@ public class ZyYzService {
 		
 		if(!Delphi.isNullString(yzbz) && !"3".equals(yzlx) && !"8".equals(yzlx) && !"9".equals(yzlx)) {
 			yzbz = yzbz.replaceAll("null", "");
+			yzbz = yzbz.replaceAll("nullnull", "");
+			yzbz = yzbz.replaceAll("nullnullnull", "");
 			if(!Delphi.isNullString(yzbz)) {
 				yzbz = " 嘱托:"+yzbz;
 			}
@@ -7113,7 +7122,7 @@ public class ZyYzService {
 		}
 		
 		String content = "";
-		Boolean pcbmshow = service.isYzdPcbmShow();
+		
 		if("1".equals(yzlx)) {//草药
 			DxNormalDataManager zycfbzdic = DaoCreator.getNormalDao("zycfbzdic");
 			zycfbzdic.reloadByDictionary("MC", "BH");
@@ -7148,9 +7157,12 @@ public class ZyYzService {
 			}
 
 			
-			if(!pcbmshow) {
+			if(pcbyzw) {
 				yzpc = yypcDic.getDicValue(yzpc);
 			}
+			if(!pcbyzw && service.yzdRmfhShow()) {
+				yzpc = yzpc.replace(".","");
+			}
 			content = yzmcstr+" "+yzyf+" "+yzpc;
 			if("1".equals(yzcl)) {
 				if(!Delphi.isNullString(yzpc)) {
@@ -7178,30 +7190,34 @@ public class ZyYzService {
 			if("3".equals(yzcl)) {
 				content = "(出院带药)";
 			}
-			if(!pcbmshow) {
+			if(pcbyzw) {
 				yzpc = yypcDic.getDicValue(yzpc);
 			}
+			if(!pcbyzw && service.yzdRmfhShow()) {
+				yzpc = yzpc.replace(".","");
+			}
 			content += yzmc +" "+yzjl+yzjldw+" "+yzyf+" "+yzpc;
-			if("1".equals(yzcl)) {
-				if(!Delphi.isNullString(yzpc)) {
-					content += " 首日:"+srzx;
-				}
-				content += " 一天:"+yzsl+yzdw;
-				if(!iszyz) {
-					zyyzOrderMapper.getDataManager().setCalcFieldValue(currrow,"xzsj", Delphi.getDateTimeStr(zyyzOrderMapper.getYZXZSJ(currrow)));
-				}
-			}else if("2".equals(yzcl)) {
-				content += " "+yzlc+" 共:"+yzsl+yzdw;
-				if(!iszyz) {
-					zyyzOrderMapper.getDataManager().setCalcFieldValue(currrow,"xzsj", Delphi.getDateTimeStr(zyyzOrderMapper.getYZXZSJ(currrow)));
-				}
-			}else if("3".equals(yzcl)) {
-				content += " "+yzlc+" 共:"+yzsl+yzdw;
-				if(!iszyz) {
-					zyyzOrderMapper.getDataManager().setCalcFieldValue(currrow,"xzsj", Delphi.getDateTimeStr(zyyzOrderMapper.getYZXZSJ(currrow)));
+			if(!service.isZygzzYzdshow()) {
+				if("1".equals(yzcl)) {
+					if(!Delphi.isNullString(yzpc)) {
+						content += " 首日:"+srzx;
+					}
+					content += " 一天:"+yzsl+yzdw;
+					if(!iszyz) {
+						zyyzOrderMapper.getDataManager().setCalcFieldValue(currrow,"xzsj", Delphi.getDateTimeStr(zyyzOrderMapper.getYZXZSJ(currrow)));
+					}
+				}else if("2".equals(yzcl)) {
+					content += " "+yzlc+" 共:"+yzsl+yzdw;
+					if(!iszyz) {
+						zyyzOrderMapper.getDataManager().setCalcFieldValue(currrow,"xzsj", Delphi.getDateTimeStr(zyyzOrderMapper.getYZXZSJ(currrow)));
+					}
+				}else if("3".equals(yzcl)) {
+					content += " "+yzlc+" 共:"+yzsl+yzdw;
+					if(!iszyz) {
+						zyyzOrderMapper.getDataManager().setCalcFieldValue(currrow,"xzsj", Delphi.getDateTimeStr(zyyzOrderMapper.getYZXZSJ(currrow)));
+					}
 				}
 			}
-			
 			content += yzbz;
 		}
 
diff --git a/WEB-INF/src/com/his/zy/zyyzdmanage/ZyDoctorOrderNewWindow.java b/WEB-INF/src/com/his/zy/zyyzdmanage/ZyDoctorOrderNewWindow.java
index b806f73..99c5bfa 100644
--- a/WEB-INF/src/com/his/zy/zyyzdmanage/ZyDoctorOrderNewWindow.java
+++ b/WEB-INF/src/com/his/zy/zyyzdmanage/ZyDoctorOrderNewWindow.java
@@ -137,6 +137,10 @@ public class ZyDoctorOrderNewWindow extends WatWebForm {
 		}else{
 			dbgrid1.setHeadPageButtonVisible("save", false);
 		}
+		
+		panelBar2.setPanelButtonVisible("open",true);
+		panelBar2.setPanelButtonVisible("close",false);
+		setWinParams("xdbkflag", 0);
 	}
 	
 	private void initData(boolean isClear,boolean isTime) {
@@ -217,7 +221,7 @@ public class ZyDoctorOrderNewWindow extends WatWebForm {
 				String yzfjsm = zyyzViewOrderDaoMapper.getYZFJSM(i);
 				String yzlb = zyyzViewOrderDaoMapper.getYZLB(i);
 				String yzxpkey = zyyzViewOrderDaoMapper.getYZXPKEY(i);
-				
+				String yzbz = zyyzViewOrderDaoMapper.getYZBZ(i);
 				if("006".equals(yzfjsm)) {
 					continue;//补录药品不显示在医嘱单里面
 				}
@@ -241,16 +245,8 @@ public class ZyDoctorOrderNewWindow extends WatWebForm {
 				zyDoctorOrderDao.setColumnValue("YZXH", zyDoctorOrderDao.getRowCount()+1);
 				zyDoctorOrderDao.setColumnValue("YZCL", zyyzViewOrderDaoMapper.getYZCL(i));
 				zyDoctorOrderDao.setColumnValue("YZKS", zyyzViewOrderDaoMapper.getHZSZKS(i));
-				if(("01".equals(yzlb) || "02".equals(yzlb) || "03".equals(yzlb)) || !service.isZygzzYzdshow()) {
-					zyDoctorOrderDao.setColumnValue("YZNR", zyyzViewOrderDaoMapper.getDataManager().getCalcFieldValue(i,"yzxshow"));//""+zyyzViewOrderDaoMapper.getDataManager().getCalcFieldValue(i,"zbs")+
-				}else {
-					hisyzxdao.setNormalParameters(new Object[]{model.getCompanyId(),yzxpkey});
-					hisyzxdao.reload();
-					if(hisyzxdao.getRowCount() > 0) {
-						zyDoctorOrderDao.setColumnValue("YZNR", hisyzxdao.getColumnValueAsString(0,"MC"));
-					}
-					
-				}
+				
+				zyDoctorOrderDao.setColumnValue("YZNR", zyyzViewOrderDaoMapper.getDataManager().getCalcFieldValue(i,"yzxshow"));//""+zyyzViewOrderDaoMapper.getDataManager().getCalcFieldValue(i,"zbs")+
 				
 				zyDoctorOrderDao.setColumnValue("XZYS", jgrydicdao.getDicValue(zyyzViewOrderDaoMapper.getYZXZYS(i)));
 				zyDoctorOrderDao.setColumnValue("XZRQ", Delphi.getDateStr(zyyzViewOrderDaoMapper.getYZXZSJ(i)));
@@ -807,6 +803,8 @@ public class ZyDoctorOrderNewWindow extends WatWebForm {
 		model.setCompanyid(MainUtil.getCurCompanyID());
 		model.setCompanyname(MainUtil.getCurCompanyName());
 		model.setPageno(page+1);
+		
+		model.setXdbkflag(""+getWinParams("xdbkflag"));
 //		model.setQdbqkb(yzdparamsService.isQDBQKB());
 //		model.setDyqmys(yzdparamsService.isDYQMYS());
 //		model.setDyqmrq(yzdparamsService.isDYQMRQ());
@@ -1018,8 +1016,15 @@ public class ZyDoctorOrderNewWindow extends WatWebForm {
 			}
 	    }else if("init".equals(command)) {
 	    	initData(false,false);
+	    }else if("open".equals(command)) {
+	    	setWinParams("xdbkflag", "1");
+	    	panelBar2.setPanelButtonVisible("open", false);
+	    	panelBar2.setPanelButtonVisible("close", true);
+	    }else if("close".equals(command)) {
+	    	setWinParams("xdbkflag", "0");
+	    	panelBar2.setPanelButtonVisible("open", true);
+	    	panelBar2.setPanelButtonVisible("close", false);
 	    }
-	    
 	}
 
 	private void closeAction() {
diff --git a/WEB-INF/src/com/his/zy/zyyzdmanage/ZyDoctorOrderNewWindow.xml b/WEB-INF/src/com/his/zy/zyyzdmanage/ZyDoctorOrderNewWindow.xml
index 028af4e..eb4d825 100644
--- a/WEB-INF/src/com/his/zy/zyyzdmanage/ZyDoctorOrderNewWindow.xml
+++ b/WEB-INF/src/com/his/zy/zyyzdmanage/ZyDoctorOrderNewWindow.xml
@@ -71,7 +71,9 @@
 		                            <item align="left" command="czyztime" image="/resources/normal/delete.png"  color="#ffffff" bkcolor="#FF5722"  title="按时间顺序重整医嘱" type="button"/>
 		                            <item align="left" command="print" image="/resources/normal/print.png"  color="#ffffff" bkcolor="#1E9FFF"  title="打印医嘱" type="button"/>
 		                            <item align="left" command="init" image="/resources/normal/refresh.png"  color="#ffffff" bkcolor="#009900"  title="刷新数据" type="button"/>
-		                        </DxPanelBar>				                 
+		                         	<item align="left" command="open" image="/resources/normal/refresh.png"  color="#ffffff" bkcolor="#009900"  title="开启续打边框" type="button"/>
+		                            <item align="left" command="close" image="/resources/normal/refresh.png"  color="#ffffff" bkcolor="#009900"  title="关闭续打边框" type="button"/>
+ 		                        </DxPanelBar>					                 
 				             </col>
 				         </row>
 
diff --git a/WEB-INF/src/com/his/zy/zyyzdmanage/model/YzdShowModel.java b/WEB-INF/src/com/his/zy/zyyzdmanage/model/YzdShowModel.java
index 6f700c0..c3dd2c8 100644
--- a/WEB-INF/src/com/his/zy/zyyzdmanage/model/YzdShowModel.java
+++ b/WEB-INF/src/com/his/zy/zyyzdmanage/model/YzdShowModel.java
@@ -27,6 +27,7 @@ public class YzdShowModel {
 //	private boolean dyqmys;//打印签名医生
 //	private boolean dyqmrq;//打印签名日期
 //	private int rownum;//打印总行数
+	private String xdbkflag;//续打边框标志开关
 	private List<YzdPageInfoModel> pageInfoList = new ArrayList<YzdPageInfoModel>();
 	
 	public DxDataManager getZyDoctorOrderPrintDao() {
@@ -41,6 +42,15 @@ public class YzdShowModel {
 	public void setPrintContent(String printContent) {
 		this.printContent = printContent;
 	}
+	
+	public void setXdbkflag(String xdbkflag) {
+		this.xdbkflag = xdbkflag;
+	}
+	
+	public String getXdbkflag() {
+		return xdbkflag;
+	}
+	
 	public boolean isIsxd() {
 		return isxd;
 	}
diff --git a/WEB-INF/src/com/his/zy/zyyzdmanage/service/YzdShowService.java b/WEB-INF/src/com/his/zy/zyyzdmanage/service/YzdShowService.java
index ce23078..44fc07e 100644
--- a/WEB-INF/src/com/his/zy/zyyzdmanage/service/YzdShowService.java
+++ b/WEB-INF/src/com/his/zy/zyyzdmanage/service/YzdShowService.java
@@ -283,19 +283,19 @@ public class YzdShowService {
 			String cfh = zyDoctorOrderPrintDao.getColumnValueAsString(i,"CFH");
 			//			if(!Delphi.isNullString(yztzh) && !Delphi.isNullString(cfh)) {
 			//				String key = cfh+yztzh;
-			if(!Delphi.isNullString(yztzh)) {
-				String key = yztzh;
-				if(!tzbzMap.containsKey(key)) {
-					tzbzMap.put(key,i);
-				}else{
-					String yznr = zyDoctorOrderPrintDao.getColumnValueAsString(i,"YZNR");
-
-					int fyzindex = tzbzMap.get(key);
-					zyDoctorOrderPrintDao.setColumnValue(fyzindex,"YZNR",zyDoctorOrderPrintDao.getColumnValueAsString(fyzindex,"YZNR")+"<BR>"+yznr);
-
-					zyDoctorOrderPrintDao.setCalcFieldValue(i,"select", "0");
-				}
-			}
+//			if(!Delphi.isNullString(yztzh)) {
+//				String key = yztzh;
+//				if(!tzbzMap.containsKey(key)) {
+//					tzbzMap.put(key,i);
+//				}else{
+//					String yznr = zyDoctorOrderPrintDao.getColumnValueAsString(i,"YZNR");
+//
+//					int fyzindex = tzbzMap.get(key);
+//					zyDoctorOrderPrintDao.setColumnValue(fyzindex,"YZNR",zyDoctorOrderPrintDao.getColumnValueAsString(fyzindex,"YZNR")+"<BR>"+yznr);
+//
+//					zyDoctorOrderPrintDao.setCalcFieldValue(i,"select", "0");
+//				}
+//			}
 		}
 
 		boolean isprinttzsj = model.isIsprinttzsj();//是否套打停嘱时间
@@ -312,6 +312,8 @@ public class YzdShowService {
 		}
 		int dyrownum = 0;
 		for(int i = 0;i < zyDoctorOrderPrintDao.getRowCount();i++) {
+			zyDoctorOrderPrintDao.setSort( "YZXH asc");
+			zyDoctorOrderPrintDao.sort();
 			if("0".equals(zyDoctorOrderPrintDao.getCalcFieldValue(i,"select"))) {
 				continue;
 			}
@@ -333,7 +335,15 @@ public class YzdShowService {
 
 			String tzys = zyDoctorOrderPrintDao.getColumnValueAsString(i,"TZYS");
 			String tzhs = zyDoctorOrderPrintDao.getColumnValueAsString(i,"TZHS");
-
+			String tzbzzd = zyDoctorOrderPrintDao.getColumnValueAsString(i,"TZBZ");
+			String tzbz = "";
+			if("001".equals(tzbzzd)) {
+				tzbz = "┓";
+			}else if("002".equals(tzbzzd)) {
+				tzbz = "┃";
+			}else if("003".equals(tzbzzd)) {
+				tzbz = "┛";
+			}
 			if(!zyDoctorOrderSetupDaoMapper.isCZTZYSQM()) {
 				tzys = "";
 			}
@@ -404,7 +414,7 @@ public class YzdShowService {
 				temp = temp.replaceAll("\\^TZHS\\^", tzhs);
 
 				temp = temp.replaceAll("\\^YZNR\\^", "");
-
+				temp = temp.replaceAll("\\^TZBZ\\^", "");
 				String yzdybz = zyDoctorOrderPrintDao.getColumnValueAsString(i,"YZDYBZ");
 				if("1".equals(yzdybz)) {//已经打印的才会进行补打停嘱时间，没有打印的，不用进行补打
 					String yztz = ystzrq+" "+ystzsj;
@@ -436,7 +446,7 @@ public class YzdShowService {
 
 
 				temp = temp.replaceAll("\\^YZNR\\^", yznr);
-
+				temp = temp.replaceAll("\\^TZBZ\\^", tzbz);
 
 				if(isxd) {
 					String yzdybz = zyDoctorOrderPrintDao.getColumnValueAsString(i,"YZDYBZ");
@@ -445,8 +455,12 @@ public class YzdShowService {
 						temp = temp.replaceAll("\\$border\\$","BORDER-TOP: transparent 1px solid; BORDER-RIGHT: transparent 1px solid; BORDER-BOTTOM: transparent 1px solid; BORDER-LEFT: transparent 1px solid");
 					}else{
 						temp = temp.replaceAll("\\$color\\$", "color:#0000FF");
-						temp = temp.replaceAll("\\$border\\$","BORDER-TOP: transparent 1px solid; BORDER-RIGHT: #0000ff 1px solid; BORDER-BOTTOM: #0000ff 1px solid; BORDER-LEFT: #0000ff 1px solid");
-
+						//temp = temp.replaceAll("\\$border\\$","BORDER-TOP: transparent 1px solid; BORDER-RIGHT: #0000ff 1px solid; BORDER-BOTTOM: #0000ff 1px solid; BORDER-LEFT: #0000ff 1px solid");
+						if("0".equals(model.getXdbkflag()) ) {
+							temp = temp.replaceAll("\\$border\\$","BORDER-TOP: transparent 1px solid; BORDER-RIGHT: #FFFFFF 1px solid; BORDER-BOTTOM: #FFFFFF 1px solid; BORDER-LEFT: #FFFFFF 1px solid");
+						}else {
+							temp = temp.replaceAll("\\$border\\$","BORDER-TOP: transparent 1px solid; BORDER-RIGHT: #0000ff 1px solid; BORDER-BOTTOM: #0000ff 1px solid; BORDER-LEFT: #0000ff 1px solid");
+						}
 					}
 				}else{
 					temp = temp.replaceAll("\\$color\\$", "color:#0000FF");
@@ -454,10 +468,6 @@ public class YzdShowService {
 				}
 			}
 
-
-
-
-
 			yzcontent += temp;
 		}
 
@@ -483,7 +493,7 @@ public class YzdShowService {
 
 
 				temp = temp.replaceAll("\\^YZNR\\^", "");
-
+				temp = temp.replaceAll("\\^TZBZ\\^", "");
 
 				temp = temp.replaceAll("\\$color\\$", "color:#0000FF");
 				temp = temp.replaceAll("\\$border\\$","BORDER-TOP: transparent 1px solid; BORDER-RIGHT: #0000ff 1px solid; BORDER-BOTTOM: #0000ff 1px solid; BORDER-LEFT: #0000ff 1px solid");
@@ -522,19 +532,19 @@ public class YzdShowService {
 			String cfh = zyDoctorOrderPrintDao.getColumnValueAsString(i,"CFH");
 			//			if(!Delphi.isNullString(yztzh) && !Delphi.isNullString(cfh)) {
 			//				String key = cfh+yztzh;
-			if(!Delphi.isNullString(yztzh)) {
-				String key = yztzh;
-				if(!tzbzMap.containsKey(key)) {
-					tzbzMap.put(key,i);
-				}else{
-					String yznr = zyDoctorOrderPrintDao.getColumnValueAsString(i,"YZNR");
-
-					int fyzindex = tzbzMap.get(key);
-					zyDoctorOrderPrintDao.setColumnValue(fyzindex,"YZNR",zyDoctorOrderPrintDao.getColumnValueAsString(fyzindex,"YZNR")+"<BR>"+yznr);
-
-					zyDoctorOrderPrintDao.setCalcFieldValue(i,"select", "0");
-				}
-			}
+//			if(!Delphi.isNullString(yztzh)) {
+//				String key = yztzh;
+//				if(!tzbzMap.containsKey(key)) {
+//					tzbzMap.put(key,i);
+//				}else{
+//					String yznr = zyDoctorOrderPrintDao.getColumnValueAsString(i,"YZNR");
+//
+//					int fyzindex = tzbzMap.get(key);
+//					zyDoctorOrderPrintDao.setColumnValue(fyzindex,"YZNR",zyDoctorOrderPrintDao.getColumnValueAsString(fyzindex,"YZNR")+"<BR>"+yznr);
+//
+//					zyDoctorOrderPrintDao.setCalcFieldValue(i,"select", "0");
+//				}
+//			}
 		}
 
 		ZyDoctorOrderSetupDaoMapper zyDoctorOrderSetupDaoMapper = new ZyDoctorOrderSetupDaoMapper(new Object[]{model.getCompanyid()});
@@ -556,7 +566,8 @@ public class YzdShowService {
 			if("0".equals(zyDoctorOrderPrintDao.getCalcFieldValue(i,"select"))) {
 				continue;
 			}
-
+			zyDoctorOrderPrintDao.setSort( "YZXH asc");
+			zyDoctorOrderPrintDao.sort();
 			String temp = body;
 			String xzrq = zyDoctorOrderPrintDao.getColumnValueAsString(i,"XZRQ");
 			String xzsj = zyDoctorOrderPrintDao.getColumnValueAsString(i,"XZSJ");
@@ -579,7 +590,15 @@ public class YzdShowService {
 			String zxhs = zyDoctorOrderPrintDao.getColumnValueAsString(i,"ZXHS");
 			String zxrq = zyDoctorOrderPrintDao.getColumnValueAsString(i,"ZXRQ");
 			String zxsj = zyDoctorOrderPrintDao.getColumnValueAsString(i,"ZXSJ");
-
+			String tzbzzd = zyDoctorOrderPrintDao.getColumnValueAsString(i,"TZBZ");
+			String tzbz = "";
+			if("001".equals(tzbzzd)) {
+				tzbz = "┓";
+			}else if("002".equals(tzbzzd)) {
+				tzbz = "┃";
+			}else if("003".equals(tzbzzd)) {
+				tzbz = "┛";
+			}
 			if(!zyDoctorOrderSetupDaoMapper.isLZHSQM()) {
 				jdhs = "";
 				zxhs = "";
@@ -643,7 +662,7 @@ public class YzdShowService {
 
 			temp = temp.replaceAll("\\^ZXHS\\^", zxhs);
 			temp = temp.replaceAll("\\^ZXSJ\\^", zxsj);
-
+			temp = temp.replaceAll("\\^TZBZ\\^", tzbz);
 			if(isxd) {
 				String yzdybz = zyDoctorOrderPrintDao.getColumnValueAsString(i,"YZDYBZ");
 				if("1".equals(yzdybz)) {
@@ -651,8 +670,12 @@ public class YzdShowService {
 					temp = temp.replaceAll("\\$border\\$","BORDER-TOP: transparent 1px solid; BORDER-RIGHT: transparent 1px solid; BORDER-BOTTOM: transparent 1px solid; BORDER-LEFT: transparent 1px solid");
 				}else{
 					temp = temp.replaceAll("\\$color\\$", "color:#0000FF");
-					temp = temp.replaceAll("\\$border\\$","BORDER-TOP: transparent 1px solid; BORDER-RIGHT: #0000ff 1px solid; BORDER-BOTTOM: #0000ff 1px solid; BORDER-LEFT: #0000ff 1px solid");
-
+					//temp = temp.replaceAll("\\$border\\$","BORDER-TOP: transparent 1px solid; BORDER-RIGHT: #0000ff 1px solid; BORDER-BOTTOM: #0000ff 1px solid; BORDER-LEFT: #0000ff 1px solid");
+					if("0".equals(model.getXdbkflag()) ) {
+						temp = temp.replaceAll("\\$border\\$","BORDER-TOP: transparent 1px solid; BORDER-RIGHT: #FFFFFF 1px solid; BORDER-BOTTOM: #FFFFFF 1px solid; BORDER-LEFT: #FFFFFF 1px solid");
+					}else {
+						temp = temp.replaceAll("\\$border\\$","BORDER-TOP: transparent 1px solid; BORDER-RIGHT: #0000ff 1px solid; BORDER-BOTTOM: #0000ff 1px solid; BORDER-LEFT: #0000ff 1px solid");
+					}
 				}
 			}else{
 				temp = temp.replaceAll("\\$color\\$", "color:#0000FF");
@@ -687,7 +710,7 @@ public class YzdShowService {
 
 				temp = temp.replaceAll("\\^ZXHS\\^", "");
 				temp = temp.replaceAll("\\^ZXSJ\\^", "");
-
+				temp = temp.replaceAll("\\^TZBZ\\^", "");
 
 				temp = temp.replaceAll("\\$color\\$", "color:#0000FF");
 				temp = temp.replaceAll("\\$border\\$","BORDER-TOP: transparent 1px solid; BORDER-RIGHT: #0000ff 1px solid; BORDER-BOTTOM: #0000ff 1px solid; BORDER-LEFT: #0000ff 1px solid");
diff --git a/release/20241023_1403.text b/release/20241023_1403.text
new file mode 100644
index 0000000..a03c088
--- /dev/null
+++ b/release/20241023_1403.text
@@ -0,0 +1,43 @@
+20241023_1403
+
+<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+develop/lyx_20241025_bbgj
+===================
+1.药品入库 增加医嘱项过滤、收费项停用过滤
+2.门诊住院共济撤销补充冲销信息 
+3.收入分类统计表 调整 
+4.病案附页调整，离院时透析血透腹透尿素氮值 增加数值判断
+>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+
+<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+develop/lyx_20241028_ybpp
+===================
+1.传染病上报调整，Mod修改无权限 暂时上报都默认为Add重新上传
+2.药品项、收费项增加 快速医保匹配
+>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+
+<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+develop/hrl_20241028_yzdtz
+===================
+1.医嘱单调整
+>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+
+<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+develop/hrl20241028_yzdtz2
+===================
+1.医嘱单调整
+>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+
+<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+develop/hrl_20241029_yzdshow
+===================
+医嘱单调整
+>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+
+<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+develop/hrl_20241030_zyyzshow_1
+===================
+医嘱单调整:1.增加去除'.'符号，2.增加医嘱单频次显示打印名称。3.医嘱单增加同组列。4.增加是否显示边框开关
+住院医嘱录入:频次pop增加打印名称
+医嘱单频次是否以中文显示开关
+>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
\ No newline at end of file
diff --git a/sql/202410/20241023_1357.sql b/sql/202410/20241023_1357.sql
new file mode 100644
index 0000000..1a1ac4b
--- /dev/null
+++ b/sql/202410/20241023_1357.sql
@@ -0,0 +1,2 @@
+--测试用
+--测试用1
\ No newline at end of file