diff --git a/WEB-INF/conf/sysds_Report_template.xml b/WEB-INF/conf/sysds_Report_template.xml index 82fa39c..e546c4c 100644 --- a/WEB-INF/conf/sysds_Report_template.xml +++ b/WEB-INF/conf/sysds_Report_template.xml @@ -2826,7 +2826,7 @@ select '' 费用类别1,'' 金额1,'' 费用类别2,'' 金额2,'' 费用类别3, - select '' mtbz,'' bzbm,'' ndje1,'' ndje2,'' ndje3,'' ndje4,'' jbr,'' mdtrt_id,'' setl_id,'' xm,'' xb,'' nl,'' sfzh,'' sbkh,'' cbd,'' xz,'' rylx,'' jyd,'' jgbm,'' jgmc,'' yydj,'' ryfs,'' zyh,'' cyks,'' zyzd,'' cyzd,'' ryrq,'' cyrq,'' zyts,'' jssj,'' zfy01,'' zf01,'' xx01,'' cxj01,'' zfy02,'' zf02,'' xx02,'' cxj02,'' zfy03,'' zf03,'' xx03,'' cxj03,'' zfy04,'' zf04,'' xx04,'' cxj04,'' zfy05,'' zf05,'' xx05,'' cxj05,'' zfy06,'' zf06,'' xx06,'' cxj06,'' zfy07,'' zf07,'' xx07,'' cxj07,'' zfy08,'' zf08,'' xx08,'' cxj08,'' zfy09,'' zf09,'' xx09,'' cxj09,'' zfy10,'' zf10,'' xx10,'' cxj10,'' zfy11,'' zf11,'' xx11,'' cxj11,'' zfy12,'' zf12,'' xx12,'' cxj12,'' zfy13,'' zf13,'' xx13,'' cxj13,'' zfy14,'' zf14,'' xx14,'' cxj14,'' zfy,'' tcjj,'' xxzf,'' cxj,'' zf,'' jjzf,'' xjzf,'' qfx,'' jj1,'' jj2,'' jj3,'' jj4,'' jj5,'' jj6,'' jj7,'' jjje1,'' jjje2,'' jjje3,'' jjje4,'' jjje5,'' jjje6,'' jjje7,'' jjje8,'' jjje9,'' jjje10,'' dysj from dual where 1=2 + select '' mtbz,'' bzbm,'' ndje1,'' ndje2,'' ndje3,'' ndje4,'' jbr,'' mdtrt_id,'' setl_id,'' xm,'' xb,'' nl,'' sfzh,'' sbkh,'' cbd,'' xz,'' rylx,'' jyd,'' jgbm,'' jgmc,'' yydj,'' ryfs,'' zyh,'' cyks,'' zyzd,'' cyzd,'' ryrq,'' cyrq,'' zyts,'' jssj,'' zfy01,'' zf01,'' xx01,'' cxj01,'' zfy02,'' zf02,'' xx02,'' cxj02,'' zfy03,'' zf03,'' xx03,'' cxj03,'' zfy04,'' zf04,'' xx04,'' cxj04,'' zfy05,'' zf05,'' xx05,'' cxj05,'' zfy06,'' zf06,'' xx06,'' cxj06,'' zfy07,'' zf07,'' xx07,'' cxj07,'' zfy08,'' zf08,'' xx08,'' cxj08,'' zfy09,'' zf09,'' xx09,'' cxj09,'' zfy10,'' zf10,'' xx10,'' cxj10,'' zfy11,'' zf11,'' xx11,'' cxj11,'' zfy12,'' zf12,'' xx12,'' cxj12,'' zfy13,'' zf13,'' xx13,'' cxj13,'' zfy14,'' zf14,'' xx14,'' cxj14,'' zfy,'' tcjj,'' xxzf,'' cxj,'' zf,'' jjzf,'' xjzf,'' qfx,'' jj1,'' jj2,'' jj3,'' jj4,'' jj5,'' jj6,'' jj7,'' jjje1,'' jjje2,'' jjje3,'' jjje4,'' jjje5,'' jjje6,'' jjje7,'' jjje8,'' jjje9,'' jjje10,'' dysj,'' brlx from dual where 1=2 @@ -2941,6 +2941,7 @@ select '' 费用类别1,'' 金额1,'' 费用类别2,'' 金额2,'' 费用类别3, + diff --git a/WEB-INF/src/com/his/yb/util/GdYbRequest.java b/WEB-INF/src/com/his/yb/util/GdYbRequest.java index 74d44e6..2982b5d 100644 --- a/WEB-INF/src/com/his/yb/util/GdYbRequest.java +++ b/WEB-INF/src/com/his/yb/util/GdYbRequest.java @@ -26,10 +26,8 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipFile; import java.util.zip.ZipInputStream; import java.util.zip.ZipOutputStream; - import javax.crypto.Mac; import javax.crypto.spec.SecretKeySpec; - import org.apache.commons.httpclient.HttpClient; import org.apache.commons.httpclient.HttpStatus; import org.apache.commons.httpclient.NameValuePair; @@ -43,7 +41,6 @@ import org.apache.http.client.methods.HttpRequestBase; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClients; import org.apache.http.util.EntityUtils; - import com.cloud.apigateway.sdk.utils.Client; import com.cloud.apigateway.sdk.utils.Request; import com.his.util.SSLProtocolSocketFactory; @@ -68,7 +65,6 @@ import com.wat.core.util.MathUtil; import com.wat.delphi.util.Delphi; import com.wat.delphi.util.MoneyUtil; import com.wat.delphi.util.WatHttpClientUtil; - import sun.misc.BASE64Encoder; public class GdYbRequest { @@ -5652,6 +5648,7 @@ public class GdYbRequest { DesktopPageTaskbarForm pform = (DesktopPageTaskbarForm)AppInstance.getInstance().getWatDesktopTaskBar(); String type="四川结算单"; + if(mdtrt_id.startsWith("ZF")) type="四川自费结算单"; DxNormalDataManager reportTemplateDao = DaoCreator.getNormalDao("reportTemplateDao"); reportTemplateDao.setNormalParameters(new Object[] {companyid,type}); reportTemplateDao.reload();