Merge remote-tracking branch 'origin/release/20241225_1153' into develop/lyx_20250109_hcth

develop/lyx_20250109_hcth
lxx 2 weeks ago
commit fed89ea96c
  1. 2
      WEB-INF/conf/sysds_his_gzz.xml
  2. 5
      WEB-INF/src/com/his/cwgl/ksbb/fybb/SrfltjForm.xml
  3. 406
      WEB-INF/src/com/his/thread/HisAutoSyjgThread.java
  4. 404
      WEB-INF/src/com/his/yb/form/YbTest.java
  5. 8
      WEB-INF/src/com/his/zy/doctorworkstation/PatientOrderInputForm.java
  6. 16
      WEB-INF/src/com/his/zy/service/ZyYzService.java
  7. 3
      release/20241225_1153.text

@ -6592,7 +6592,7 @@ SELECT JGID,BM,MC,YZDL,YZZL,ISDDYZ,ISXSYZ,ISMZSY,ISJZSY,ISZYSY,DCZDJL,MTZDJL,ZDL
union all union all
( select distinct A.JGID,A.BM,A.MC||'['||F.WZGG||']' MC,A.YZDL,A.YZZL,A.ISDDYZ,A.ISXSYZ,A.ISMZSY,A.ISJZSY,A.ISZYSY,A.DCZDJL,A.MTZDJL,A.ZDL,A.SZSYTS,A.YF,A.LC,A.PC,A.ISMZPSYY,A.ISZYPSYY,A.ISMZSJL,A.ISZYSJL,C.JG JE,A.BZ,A.ZT,A.YZDW JBDW,A.YZDW RKDW,1 ZHXS,A.YZDW MZFYDW,A.YZDW ZYFYDW,A.JE JBJG,F.WZGG GG,A.YZDW,1 DXSL,A.YZDW DXDW,A.MC TYM,'0' ISKJY,'0' ISJK,'0' ISGJJBYW,'0' ISPS,nvl(E.SL,0) SL,nvl(E.DJSL,0) DJSL,nvl(E.KYSL,0) KYSL,'' GZFL,'' DDD,'' WHONET,'' JX,'' TYMPKEY,A.GLLX,A.LMT_USED_FLAG,A.XZSYFW,A.CHRGITM_LV,A.YBBM,A.YBMC from HIS_YZX A left join HIS_YZX_ZJM B on A.BM=B.YZX_BM and A.JGID=B.JGID LEFT JOIN HIS_SFX C ON A.JGID=C.JGID AND A.BM=C.BM LEFT JOIN HIS_KSKC E ON A.JGID=E.JGID AND A.BM=E.SFX_BM left join HIS_MMS_WZZD F on C.GLBM=F.WZBM AND C.JGID=F.JGID WHERE A.JGID=? AND A.ISDDYZ = '1' AND A.ISJZSY != '1' AND ISZYSY !='1' AND A.ZT='1' AND A.GLLX = 'W' and (A.YZDL !='01' and A.YZDL !='02' and A.YZDL !='03') AND (B.PYM LIKE ? OR A.BM LIKE ? OR A.BM LIKE ? OR A.MC LIKE ?) AND E.KYSL > 0) ( select distinct A.JGID,A.BM,A.MC||'['||F.WZGG||']' MC,A.YZDL,A.YZZL,A.ISDDYZ,A.ISXSYZ,A.ISMZSY,A.ISJZSY,A.ISZYSY,A.DCZDJL,A.MTZDJL,A.ZDL,A.SZSYTS,A.YF,A.LC,A.PC,A.ISMZPSYY,A.ISZYPSYY,A.ISMZSJL,A.ISZYSJL,C.JG JE,A.BZ,A.ZT,F.JBDW,F.RKDW,1 ZHXS,A.YZDW MZFYDW,A.YZDW ZYFYDW,C.JBJG,F.WZGG GG,A.YZDW,1 DXSL,A.YZDW DXDW,A.MC TYM,'0' ISKJY,'0' ISJK,'0' ISGJJBYW,'0' ISPS,nvl(E.SL,0) SL,nvl(E.DJSL,0) DJSL,nvl(E.KYSL,0) KYSL,'' GZFL,'' DDD,'' WHONET,'' JX,'' TYMPKEY,A.GLLX,A.LMT_USED_FLAG,A.XZSYFW,A.CHRGITM_LV,A.YBBM,A.YBMC from HIS_YZX A left join HIS_YZX_ZJM B on A.BM=B.YZX_BM and A.JGID=B.JGID LEFT JOIN HIS_SFX C ON A.JGID=C.JGID AND A.BM=C.BM LEFT JOIN HIS_KSKC E ON A.JGID=E.JGID AND A.BM=E.SFX_BM left join HIS_MMS_WZZD F on C.GLBM=F.WZBM AND C.JGID=F.JGID WHERE A.JGID=? AND A.ISDDYZ = '1' AND A.ISJZSY != '1' AND ISZYSY !='1' AND A.ZT='1' AND A.GLLX = 'W' and (A.YZDL !='01' and A.YZDL !='02' and A.YZDL !='03') AND (B.PYM LIKE ? OR A.BM LIKE ? OR A.BM LIKE ? OR A.MC LIKE ?) AND E.KYSL > 0)
) WHERE ROWNUM <= ? ORDER BY BM ) WHERE ROWNUM <= ? ORDER BY BM

@ -131,8 +131,9 @@
AND c.SFRQ >=? AND c.SFRQ >=?
AND c.SFRQ <=? AND c.SFRQ <=?
and #select# and #select#
AND c.SFZT = 1 and c.SFZT != 0
AND b.JSZT = 1 --AND c.SFZT = 1
--AND b.JSZT = 1
group by b.ZDJFLX ,sfx.FYDL,sfx.FYZL ,fydlzd.MC,fyzlzd.MC group by b.ZDJFLX ,sfx.FYDL,sfx.FYZL ,fydlzd.MC,fyzlzd.MC
order by b.ZDJFLX ,sfx.FYDL,sfx.FYZL ,fydlzd.MC,fyzlzd.MC order by b.ZDJFLX ,sfx.FYDL,sfx.FYZL ,fydlzd.MC,fyzlzd.MC
]]> ]]>

@ -1,5 +1,8 @@
package com.his.thread; package com.his.thread;
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
@ -24,7 +27,12 @@ import com.wat.delphi.util.Delphi;
public class HisAutoSyjgThread implements DxThreadOperate{ public class HisAutoSyjgThread implements DxThreadOperate{
public void start() { public void start() {
syjgAction(); try {
syjgAction();
} catch (IOException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
} }
public static DxNormalDataManager setYwdzSource(DxNormalDataManager dao){ public static DxNormalDataManager setYwdzSource(DxNormalDataManager dao){
@ -33,7 +41,7 @@ public class HisAutoSyjgThread implements DxThreadOperate{
return dao; return dao;
} }
public void syjgAction() { public void syjgAction() throws IOException {
DxNormalDataManager yljgusedao = new DxNormalDataManager("select PKEY,JGMC from MAIN_YLJG where ZT='1' "); DxNormalDataManager yljgusedao = new DxNormalDataManager("select PKEY,JGMC from MAIN_YLJG where ZT='1' ");
yljgusedao.reload(); yljgusedao.reload();
Calendar begin = Calendar.getInstance(); Calendar begin = Calendar.getInstance();
@ -41,45 +49,99 @@ public class HisAutoSyjgThread implements DxThreadOperate{
begin.set(Calendar.MINUTE, 0); begin.set(Calendar.MINUTE, 0);
begin.set(Calendar.SECOND, 0); begin.set(Calendar.SECOND, 0);
begin.add(Calendar.DATE, -1); begin.add(Calendar.DATE, -1);
Timestamp biginTimestamp = new Timestamp(begin.getTimeInMillis()); // Timestamp biginTimestamp = new Timestamp(begin.getTimeInMillis());
// Timestamp biginTimestamp = new Timestamp(Long.valueOf("1734451200000")); Timestamp biginTimestamp = new Timestamp(Long.valueOf("1735487999000"));
Calendar end = Calendar.getInstance(); Calendar end = Calendar.getInstance();
end.set(Calendar.HOUR_OF_DAY, 23); end.set(Calendar.HOUR_OF_DAY, 23);
end.set(Calendar.MINUTE, 59); end.set(Calendar.MINUTE, 59);
end.set(Calendar.SECOND, 59); end.set(Calendar.SECOND, 59);
end.add(Calendar.DATE, -1); end.add(Calendar.DATE, -1);
Timestamp enTimestamp = new Timestamp(end.getTimeInMillis()); // Timestamp enTimestamp = new Timestamp(end.getTimeInMillis());
//Timestamp enTimestamp = new Timestamp(Long.valueOf("1734883199000")); Timestamp enTimestamp = new Timestamp(Long.valueOf("1735747199000"));
List<DxDataManager> dataList = new ArrayList<DxDataManager>(); List<DxDataManager> dataList = new ArrayList<DxDataManager>();
String message = ""; String message = "";
SimpleDateFormat sdft = new SimpleDateFormat("yyyy-MM-dd");
String companyid = "C903C18E-27EB-A242-6306-E301CB3E6AC9"; String companyid = "C903C18E-27EB-A242-6306-E301CB3E6AC9";
syjgHzxxAction(companyid,biginTimestamp,enTimestamp); String datetime = sdft.format(enTimestamp);
sdgghmxbAction(companyid,biginTimestamp,enTimestamp);
sdgmhzjzmxAction(companyid,biginTimestamp,enTimestamp); String filePath = "D:/三医监管定时任务日志";
sdgMjzcfzbAction(companyid,biginTimestamp,enTimestamp); try {
sdgMjzcfmxbAction(companyid,biginTimestamp,enTimestamp); message = syjgHzxxAction(companyid,biginTimestamp,enTimestamp,message,dataList);
sdgMjzQtcfmxbAction(companyid,biginTimestamp,enTimestamp); message = sdgghmxbAction(companyid,biginTimestamp,enTimestamp,message,dataList);
sdgMjzFymxbAction(companyid,biginTimestamp,enTimestamp); message = sdgmhzjzmxAction(companyid,biginTimestamp,enTimestamp,message,dataList);
sdgMjzJsmxbAction(companyid,biginTimestamp,enTimestamp); message = sdgMjzcfzbAction(companyid,biginTimestamp,enTimestamp,message,dataList);
sdgMjzJsZffsmxbAction(companyid,biginTimestamp,enTimestamp); message = sdgMjzcfmxbAction(companyid,biginTimestamp,enTimestamp,message,dataList);
sdgMjzZdmxbAction(companyid,biginTimestamp,enTimestamp); message = sdgMjzQtcfmxbAction(companyid,biginTimestamp,enTimestamp,message,dataList);
sjgRydjmxbAction(companyid,biginTimestamp,enTimestamp); message = sdgMjzFymxbAction(companyid,biginTimestamp,enTimestamp,message,dataList);
sdgZycfzbAction(companyid,biginTimestamp,enTimestamp); message = sdgMjzJsmxbAction(companyid,biginTimestamp,enTimestamp,message,dataList);
sdgZycfmxbAction(companyid,biginTimestamp,enTimestamp); message = sdgMjzJsZffsmxbAction(companyid,biginTimestamp,enTimestamp,message,dataList);
sdgZyQtcfmxbAction(companyid,biginTimestamp,enTimestamp); message = sdgMjzZdmxbAction(companyid,biginTimestamp,enTimestamp,message,dataList);
sdgZyFymxbAction(companyid,biginTimestamp,enTimestamp); message = sjgRydjmxbAction(companyid,biginTimestamp,enTimestamp,message,dataList);
sdgZyCydjmxbAction(companyid,biginTimestamp,enTimestamp); message = sdgZycfzbAction(companyid,biginTimestamp,enTimestamp,message,dataList);
sdgZyJsmxbAction(companyid,biginTimestamp,enTimestamp); message = sdgZycfmxbAction(companyid,biginTimestamp,enTimestamp,message,dataList);
sdgZyJsZffsmxbAction(companyid,biginTimestamp,enTimestamp); message = sdgZyQtcfmxbAction(companyid,biginTimestamp,enTimestamp,message,dataList);
sdgZyZdmxbAction(companyid,biginTimestamp,enTimestamp); message = sdgZyFymxbAction(companyid,biginTimestamp,enTimestamp,message,dataList);
message = sdgZyCydjmxbAction(companyid,biginTimestamp,enTimestamp,message,dataList);
message = sdgZyJsmxbAction(companyid,biginTimestamp,enTimestamp,message,dataList);
message = sdgZyJsZffsmxbAction(companyid,biginTimestamp,enTimestamp,message,dataList);
message = sdgZyZdmxbAction(companyid,biginTimestamp,enTimestamp,message,dataList);
} catch (Exception e) {
// TODO: handle exception
File dir = new File(filePath);
// 一、检查放置文件的文件夹路径是否存在,不存在则创建
if (!dir.exists()) {
dir.mkdirs();// mkdirs创建多级目录
}
File checkFile = new File(filePath + datetime+".txt");
FileWriter writer = null;
try {
// 二、检查目标文件是否存在,不存在则创建
if (!checkFile.exists()) {
checkFile.createNewFile();// 创建目标文件
}
// 三、向目标文件中写入内容
// FileWriter(File file, boolean append),append为true时为追加模式,false或缺省则为覆盖模式
writer = new FileWriter(checkFile, true);
writer.append("your content");
writer.flush();
} catch (IOException f) {
f.printStackTrace();
} finally {
if (null != writer)
writer.close();
}
}
if(!"".equals(message)) {
File dir = new File(filePath);
// 一、检查放置文件的文件夹路径是否存在,不存在则创建
if (!dir.exists()) {
dir.mkdirs();// mkdirs创建多级目录
}
File checkFile = new File(filePath +"/"+ datetime+".txt");
FileWriter writer = null;
try {
// 二、检查目标文件是否存在,不存在则创建
if (!checkFile.exists()) {
checkFile.createNewFile();// 创建目标文件
}
// 三、向目标文件中写入内容
// FileWriter(File file, boolean append),append为true时为追加模式,false或缺省则为覆盖模式
writer = new FileWriter(checkFile, true);
writer.append("\n");
writer.append(message);
writer.flush();
} catch (IOException f) {
f.printStackTrace();
} finally {
if (null != writer)
writer.close();
}
}
} }
public void syjgHzxxAction(String companyid,Timestamp biginTimestamp,Timestamp enTimestamp) { public String syjgHzxxAction(String companyid,Timestamp biginTimestamp,Timestamp enTimestamp,String message,List<DxDataManager> dataList) {
//his_患者信息 //his_患者信息
DxNormalDataManager hzinfoTestDao=DaoCreator.getNormalDao("Sjg_hzinfoTestDao"); DxNormalDataManager hzinfoTestDao=DaoCreator.getNormalDao("Sjg_hzinfoTestDao");
hzinfoTestDao.reload(new Object[] {companyid, biginTimestamp, enTimestamp}); hzinfoTestDao.reload(new Object[] {companyid, biginTimestamp, enTimestamp});
@ -161,9 +223,16 @@ public class HisAutoSyjgThread implements DxThreadOperate{
sjghzjbxxbdao.setColumnValue("CRT_TM_ZDSC",timestamp);//数据上传时间 sjghzjbxxbdao.setColumnValue("CRT_TM_ZDSC",timestamp);//数据上传时间
} }
if(sjghzjbxxbdao.commit()){ try {
System.out.println("====【患者信息TB_HZXX】更新成功=="); if(sjghzjbxxbdao.commit()){
System.out.println("====【患者信息TB_HZXX】更新成功==");
}else {
return message += "====【患者信息TB_HZXX】更新失败==";
}
} catch (Exception e) {
return message += "====【患者信息TB_HZXX】更新失败==";
} }
return message;
} }
@ -240,7 +309,7 @@ public class HisAutoSyjgThread implements DxThreadOperate{
} }
/* 4.3.1.1挂号明细表 */ /* 4.3.1.1挂号明细表 */
public void sdgghmxbAction(String companyid,Timestamp biginTimestamp,Timestamp enTimestamp) { public String sdgghmxbAction(String companyid,Timestamp biginTimestamp,Timestamp enTimestamp,String message,List<DxDataManager> dataList) {
//his_挂号明细表 //his_挂号明细表
DxNormalDataManager mzghJzGhbAllDao=DaoCreator.getNormalDao("sjg_mzghJzGhbAllDao"); DxNormalDataManager mzghJzGhbAllDao=DaoCreator.getNormalDao("sjg_mzghJzGhbAllDao");
mzghJzGhbAllDao.reload(new Object[] {companyid, biginTimestamp, enTimestamp}); mzghJzGhbAllDao.reload(new Object[] {companyid, biginTimestamp, enTimestamp});
@ -317,14 +386,22 @@ public class HisAutoSyjgThread implements DxThreadOperate{
sdgghmxbdao.setColumnValue("CRT_TM_ZDSC",timestamp);//数据上传时间 sdgghmxbdao.setColumnValue("CRT_TM_ZDSC",timestamp);//数据上传时间
} }
if(sdgghmxbdao.commit()){ try {
System.out.println("====【挂号明细表TB_MZ_GHMXB】更新成功=="); if(sdgghmxbdao.commit()){
} System.out.println("====【挂号明细表TB_MZ_GHMXB】更新成功==");
}else {
return message += "====【挂号明细表TB_MZ_GHMXB】更新失败==";
}
} catch (Exception e) {
// TODO: handle exception
return message += "====【挂号明细表TB_MZ_GHMXB】更新失败==";
}
return message;
} }
/*4.3.1.2门急诊就诊明细表*/ /*4.3.1.2门急诊就诊明细表*/
public void sdgmhzjzmxAction(String companyid,Timestamp biginTimestamp,Timestamp enTimestamp) { public String sdgmhzjzmxAction(String companyid,Timestamp biginTimestamp,Timestamp enTimestamp,String message,List<DxDataManager> dataList) {
//his_门急诊就诊明细表 //his_门急诊就诊明细表
DxNormalDataManager sjgmjzjzmxbdao_his=DaoCreator.getNormalDao("sjgmjzjzmxbdao_his"); DxNormalDataManager sjgmjzjzmxbdao_his=DaoCreator.getNormalDao("sjgmjzjzmxbdao_his");
sjgmjzjzmxbdao_his.reload(new Object[] {companyid, biginTimestamp, enTimestamp}); sjgmjzjzmxbdao_his.reload(new Object[] {companyid, biginTimestamp, enTimestamp});
@ -419,14 +496,21 @@ public class HisAutoSyjgThread implements DxThreadOperate{
timestamp.setNanos(0); timestamp.setNanos(0);
sjgmjzjzmxbdao.setColumnValue("crt_tm_zdsc",timestamp);//数据上传时间 sjgmjzjzmxbdao.setColumnValue("crt_tm_zdsc",timestamp);//数据上传时间
} }
try {
if(sjgmjzjzmxbdao.commit()){ if(sjgmjzjzmxbdao.commit()){
System.out.println("====【门急诊就诊明细表】更新成功=="); System.out.println("====【门急诊就诊明细表】更新成功==");
}else {
return message += "====【门急诊就诊明细表】更新失败==";
}
} catch (Exception e) {
// TODO: handle exception
return message += e.getMessage()+"====【门急诊就诊明细表】更新失败==";
} }
return message ;
} }
/*4.3.1.3门急诊处方主表*/ /*4.3.1.3门急诊处方主表*/
public void sdgMjzcfzbAction(String companyid,Timestamp biginTimestamp,Timestamp enTimestamp) { public String sdgMjzcfzbAction(String companyid,Timestamp biginTimestamp,Timestamp enTimestamp,String message,List<DxDataManager> dataList) {
//his_门急诊处方主表 //his_门急诊处方主表
DxNormalDataManager his_mzCfallDao=DaoCreator.getNormalDao("his_mzCfallDao"); DxNormalDataManager his_mzCfallDao=DaoCreator.getNormalDao("his_mzCfallDao");
his_mzCfallDao.reload(new Object[] {companyid, biginTimestamp, enTimestamp}); his_mzCfallDao.reload(new Object[] {companyid, biginTimestamp, enTimestamp});
@ -578,14 +662,23 @@ public class HisAutoSyjgThread implements DxThreadOperate{
timestamp.setNanos(0); timestamp.setNanos(0);
sjgmjzCfzbdao.setColumnValue("crt_tm_zdsc", timestamp);//数据上传时间 sjgmjzCfzbdao.setColumnValue("crt_tm_zdsc", timestamp);//数据上传时间
} }
if(sjgmjzCfzbdao.commit()){ try {
System.out.println("====【门急诊处方主表】更新成功=="); if(sjgmjzCfzbdao.commit()){
} System.out.println("====【门急诊处方主表】更新成功==");
}else {
return message += "====【门急诊处方主表】更新失败==";
}
} catch (Exception e) {
// TODO: handle exception
return message += e.getMessage()+"====【门急诊处方主表】更新失败==";
}
return message ;
} }
/*4.3.1.4门急诊药品处方明细表*/ /*4.3.1.4门急诊药品处方明细表*/
public void sdgMjzcfmxbAction(String companyid,Timestamp biginTimestamp,Timestamp enTimestamp) { public String sdgMjzcfmxbAction(String companyid,Timestamp biginTimestamp,Timestamp enTimestamp,String message,List<DxDataManager> dataList) {
//his_门急诊药品处方明细表 //his_门急诊药品处方明细表
DxNormalDataManager his_mzYpmxbDao=DaoCreator.getNormalDao("his_mzYpmxbDao"); DxNormalDataManager his_mzYpmxbDao=DaoCreator.getNormalDao("his_mzYpmxbDao");
his_mzYpmxbDao.reload(new Object[] {companyid, biginTimestamp, enTimestamp}); his_mzYpmxbDao.reload(new Object[] {companyid, biginTimestamp, enTimestamp});
@ -703,13 +796,21 @@ public class HisAutoSyjgThread implements DxThreadOperate{
timestamp.setNanos(0); timestamp.setNanos(0);
sjgmjzypcdmxbdao.setColumnValue("crt_tm_zdsc", timestamp);// sjgmjzypcdmxbdao.setColumnValue("crt_tm_zdsc", timestamp);//
} }
if(sjgmjzypcdmxbdao.commit()){ try {
System.out.println("====【门急诊药品处方明细表】更新成功=="); if(sjgmjzypcdmxbdao.commit()){
} System.out.println("====【门急诊药品处方明细表】更新成功==");
}else {
return message += "====【门急诊药品处方明细表】更新成功==";
}
} catch (Exception e) {
// TODO: handle exception
return message += e.getMessage() + "====【门急诊药品处方明细表】更新成功==";
}
return message ;
} }
/*4.3.1.5门急诊其他处方明细表*/ /*4.3.1.5门急诊其他处方明细表*/
public void sdgMjzQtcfmxbAction(String companyid,Timestamp biginTimestamp,Timestamp enTimestamp) { public String sdgMjzQtcfmxbAction(String companyid,Timestamp biginTimestamp,Timestamp enTimestamp,String message,List<DxDataManager> dataList) {
//his_门急诊其他处方明细 //his_门急诊其他处方明细
DxNormalDataManager his_mzQtmxbDao=DaoCreator.getNormalDao("his_mzQtmxbDao"); DxNormalDataManager his_mzQtmxbDao=DaoCreator.getNormalDao("his_mzQtmxbDao");
his_mzQtmxbDao.reload(new Object[] {companyid, biginTimestamp, enTimestamp}); his_mzQtmxbDao.reload(new Object[] {companyid, biginTimestamp, enTimestamp});
@ -826,13 +927,21 @@ public class HisAutoSyjgThread implements DxThreadOperate{
sjgmjzqtcfmxbdao.setColumnValue("crt_tm_zdsc", timestamp);// sjgmjzqtcfmxbdao.setColumnValue("crt_tm_zdsc", timestamp);//
} }
if(sjgmjzqtcfmxbdao.commit()){ try {
System.out.println("====【门急诊其他处方明细表】更新成功=="); if(sjgmjzqtcfmxbdao.commit()){
} System.out.println("====【门急诊其他处方明细表】更新成功==");
}else {
return message += "====【门急诊其他处方明细表】更新成功==";
}
} catch (Exception e) {
// TODO: handle exception
return message += e.getMessage() + "====【门急诊其他处方明细表】更新成功==;";
}
return message ;
} }
/*4.3.1.6门急诊费用明细表 */ /*4.3.1.6门急诊费用明细表 */
public void sdgMjzFymxbAction(String companyid,Timestamp biginTimestamp,Timestamp enTimestamp) { public String sdgMjzFymxbAction(String companyid,Timestamp biginTimestamp,Timestamp enTimestamp,String message,List<DxDataManager> dataList) {
//his_门急诊费用明细表 //his_门急诊费用明细表
DxNormalDataManager his_sjgmjzfymxbdao=DaoCreator.getNormalDao("his_sjgmjzfymxbdao"); DxNormalDataManager his_sjgmjzfymxbdao=DaoCreator.getNormalDao("his_sjgmjzfymxbdao");
his_sjgmjzfymxbdao.reload(new Object[] {companyid, biginTimestamp, enTimestamp}); his_sjgmjzfymxbdao.reload(new Object[] {companyid, biginTimestamp, enTimestamp});
@ -869,9 +978,6 @@ public class HisAutoSyjgThread implements DxThreadOperate{
for (int i = 0; i < his_sjgmjzfymxbdao.getRowCount(); i++) { for (int i = 0; i < his_sjgmjzfymxbdao.getRowCount(); i++) {
sjgmjzfymxbdao.absoluteInSert(); sjgmjzfymxbdao.absoluteInSert();
sjgmjzfymxbdao.setColumnValue("yljgdm", "452894746");//医疗机构代码 sjgmjzfymxbdao.setColumnValue("yljgdm", "452894746");//医疗机构代码
if("660928538879070208".equals(his_sjgmjzfymxbdao.getColumnValueAsString(i,"SFMXPKEY"))) {
System.err.println("===========");
}
sjgmjzfymxbdao.setColumnValue("sfmxid", his_sjgmjzfymxbdao.getColumnValueAsString(i,"SFMXPKEY"));//收费明细ID sjgmjzfymxbdao.setColumnValue("sfmxid", his_sjgmjzfymxbdao.getColumnValueAsString(i,"SFMXPKEY"));//收费明细ID
sjgmjzfymxbdao.setColumnValue("grbslx", "09");//个人标识类型 sjgmjzfymxbdao.setColumnValue("grbslx", "09");//个人标识类型
sjgmjzfymxbdao.setColumnValue("grbsh", his_sjgmjzfymxbdao.getColumnValueAsString(i,"HZPKEY"));//个人标识号 sjgmjzfymxbdao.setColumnValue("grbsh", his_sjgmjzfymxbdao.getColumnValueAsString(i,"HZPKEY"));//个人标识号
@ -1025,13 +1131,22 @@ public class HisAutoSyjgThread implements DxThreadOperate{
timestamp.setNanos(0); timestamp.setNanos(0);
sjgmjzfymxbdao.setColumnValue("crt_tm_zdsc", timestamp);//数据上传时间 sjgmjzfymxbdao.setColumnValue("crt_tm_zdsc", timestamp);//数据上传时间
} }
if(sjgmjzfymxbdao.commit()){
try {
if(sjgmjzfymxbdao.commit()){
System.out.println("====【门急诊费用明细表】更新成功=="); System.out.println("====【门急诊费用明细表】更新成功==");
}else {
return message += "【====【门急诊费用明细表】更新成功==";
}
} catch (Exception e) {
// TODO: handle exception
return message += e.getMessage() + "====【门急诊费用明细表】更新成功==";
} }
return message ;
} }
/*4.3.1.7门急诊结算明细表*/ /*4.3.1.7门急诊结算明细表*/
public void sdgMjzJsmxbAction(String companyid,Timestamp biginTimestamp,Timestamp enTimestamp) { public String sdgMjzJsmxbAction(String companyid,Timestamp biginTimestamp,Timestamp enTimestamp,String message,List<DxDataManager> dataList) {
//his_门急诊结算明细表 //his_门急诊结算明细表
DxNormalDataManager his_sjgmjzJsmxbdao=DaoCreator.getNormalDao("his_sjgmjzJsmxbdao"); DxNormalDataManager his_sjgmjzJsmxbdao=DaoCreator.getNormalDao("his_sjgmjzJsmxbdao");
his_sjgmjzJsmxbdao.reload(new Object[] {companyid, biginTimestamp, enTimestamp}); his_sjgmjzJsmxbdao.reload(new Object[] {companyid, biginTimestamp, enTimestamp});
@ -1122,13 +1237,21 @@ public class HisAutoSyjgThread implements DxThreadOperate{
timestamp.setNanos(0); timestamp.setNanos(0);
sjgmjzjsmxbdao.setColumnValue("crt_tm_zdsc", timestamp);//数据上传时间 sjgmjzjsmxbdao.setColumnValue("crt_tm_zdsc", timestamp);//数据上传时间
} }
if(sjgmjzjsmxbdao.commit()){ try {
if(sjgmjzjsmxbdao.commit()){
System.out.println("====【门急诊结算明细表】更新成功=="); System.out.println("====【门急诊结算明细表】更新成功==");
}else {
return message += "====【门急诊结算明细表】更新失败==;";
}
} catch (Exception e) {
// TODO: handle exception
return message += "====【门急诊结算明细表】更新失败==;";
} }
return message ;
} }
/*4.3.1.8门急诊结算支付方式明细表*/ /*4.3.1.8门急诊结算支付方式明细表*/
public void sdgMjzJsZffsmxbAction(String companyid,Timestamp biginTimestamp,Timestamp enTimestamp) { public String sdgMjzJsZffsmxbAction(String companyid,Timestamp biginTimestamp,Timestamp enTimestamp,String message,List<DxDataManager> dataList) {
//his_门急诊结算支付方式明细表 //his_门急诊结算支付方式明细表
DxNormalDataManager his_sjgmjzjszffsmxbdao=DaoCreator.getNormalDao("his_sjgmjzjszffsmxbdao"); DxNormalDataManager his_sjgmjzjszffsmxbdao=DaoCreator.getNormalDao("his_sjgmjzjszffsmxbdao");
his_sjgmjzjszffsmxbdao.reload(new Object[] {companyid, biginTimestamp, enTimestamp}); his_sjgmjzjszffsmxbdao.reload(new Object[] {companyid, biginTimestamp, enTimestamp});
@ -1203,13 +1326,21 @@ public class HisAutoSyjgThread implements DxThreadOperate{
timestamp.setNanos(0); timestamp.setNanos(0);
sjgmjzjszffsmxbdao.setColumnValue("crt_tm_zdsc", timestamp);//数据上传时间 sjgmjzjszffsmxbdao.setColumnValue("crt_tm_zdsc", timestamp);//数据上传时间
} }
if(sjgmjzjszffsmxbdao.commit()){ try {
System.out.println("====【门急诊结算支付方式明细表】更新成功=="); if(sjgmjzjszffsmxbdao.commit()){
System.out.println("====【门急诊结算支付方式明细表】更新成功==");
}else {
return message += "====【门急诊结算支付方式明细表】更新失败==;";
}
} catch (Exception e) {
// TODO: handle exception
return message += "====【门急诊结算支付方式明细表】更新失败==;";
} }
return message ;
} }
/*4.3.1.9门急诊诊断明细表*/ /*4.3.1.9门急诊诊断明细表*/
public void sdgMjzZdmxbAction(String companyid,Timestamp biginTimestamp,Timestamp enTimestamp) { public String sdgMjzZdmxbAction(String companyid,Timestamp biginTimestamp,Timestamp enTimestamp,String message,List<DxDataManager> dataList) {
//his_门急诊诊断明细表 //his_门急诊诊断明细表
DxNormalDataManager sjgmjzjzmxbdao_his=DaoCreator.getNormalDao("his_sjgmjzzdmxbdao"); DxNormalDataManager sjgmjzjzmxbdao_his=DaoCreator.getNormalDao("his_sjgmjzzdmxbdao");
sjgmjzjzmxbdao_his.reload(new Object[] {companyid, biginTimestamp, enTimestamp}); sjgmjzjzmxbdao_his.reload(new Object[] {companyid, biginTimestamp, enTimestamp});
@ -1276,15 +1407,22 @@ public class HisAutoSyjgThread implements DxThreadOperate{
timestamp.setNanos(0); timestamp.setNanos(0);
sjgmjzzdmxbdao.setColumnValue("crt_tm_zdsc", timestamp);//数据上传时间 sjgmjzzdmxbdao.setColumnValue("crt_tm_zdsc", timestamp);//数据上传时间
} }
try {
if(sjgmjzzdmxbdao.commit()){ if(sjgmjzzdmxbdao.commit()){
System.out.println("====【门急诊诊断明细表】更新成功=="); System.out.println("====【门急诊诊断明细表】更新成功==");
}else {
return message += "====【门急诊诊断明细表】更新失败==;";
}
} catch (Exception e) {
// TODO: handle exception
return message += e.getMessage()+"====【门急诊诊断明细表】更新失败==;";
} }
return message ;
} }
/*4.4.1.1入院登记明细表*/ /*4.4.1.1入院登记明细表*/
public void sjgRydjmxbAction(String companyid,Timestamp biginTimestamp,Timestamp enTimestamp) { public String sjgRydjmxbAction(String companyid,Timestamp biginTimestamp,Timestamp enTimestamp,String message,List<DxDataManager> dataList) {
//his_入院登记明细表 //his_入院登记明细表
DxNormalDataManager his_sjgrydjmxbdao=DaoCreator.getNormalDao("his_sjgrydjmxbdao"); DxNormalDataManager his_sjgrydjmxbdao=DaoCreator.getNormalDao("his_sjgrydjmxbdao");
his_sjgrydjmxbdao.reload(new Object[] {companyid, biginTimestamp, enTimestamp}); his_sjgrydjmxbdao.reload(new Object[] {companyid, biginTimestamp, enTimestamp});
@ -1369,14 +1507,21 @@ public class HisAutoSyjgThread implements DxThreadOperate{
timestamp.setNanos(0); timestamp.setNanos(0);
sjgrydjmxbdao.setColumnValue("crt_tm_zdsc", timestamp);//数据上传时间 sjgrydjmxbdao.setColumnValue("crt_tm_zdsc", timestamp);//数据上传时间
} }
try {
if(sjgrydjmxbdao.commit()){ dataList.add(sjgrydjmxbdao); if(sjgrydjmxbdao.commit()){
System.out.println("====【入院登记明细表】更新成功=="); System.out.println("====【入院登记明细表】更新成功==");
}else {
return message += "====【入院登记明细表】更新失败==";
}
} catch (Exception e) {
// TODO: handle exception
return message += e.getMessage()+"====【入院登记明细表】更新失败==";
} }
return message ;
} }
/*4.4.1.2住院医嘱主表*/ /*4.4.1.2住院医嘱主表*/
public void sdgZycfzbAction(String companyid,Timestamp biginTimestamp,Timestamp enTimestamp) { public String sdgZycfzbAction(String companyid,Timestamp biginTimestamp,Timestamp enTimestamp,String message,List<DxDataManager> dataList) {
//his_住院医嘱主表 //his_住院医嘱主表
DxNormalDataManager his_zyCfallDao=DaoCreator.getNormalDao("his_zyCfallDao"); DxNormalDataManager his_zyCfallDao=DaoCreator.getNormalDao("his_zyCfallDao");
his_zyCfallDao.reload(new Object[] {companyid, biginTimestamp, enTimestamp}); his_zyCfallDao.reload(new Object[] {companyid, biginTimestamp, enTimestamp});
@ -1467,14 +1612,22 @@ public class HisAutoSyjgThread implements DxThreadOperate{
timestamp.setNanos(0); timestamp.setNanos(0);
sjgzyyzzbdao.setColumnValue("crt_tm_zdsc", timestamp);//数据上传时间 sjgzyyzzbdao.setColumnValue("crt_tm_zdsc", timestamp);//数据上传时间
} }
if(sjgzyyzzbdao.commit()){ try {
System.out.println("====【住院医嘱主表】更新成功=="); if(sjgzyyzzbdao.commit()){
} System.out.println("====【住院医嘱主表】更新成功==");
}else {
return message += "====【住院医嘱主表】更新失败==;";
}
} catch (Exception e) {
// TODO: handle exception
return message += e.getMessage() + "====【住院医嘱主表】更新失败==;";
}
return message ;
} }
/*4.4.1.3住院药品医嘱明细表*/ /*4.4.1.3住院药品医嘱明细表*/
public void sdgZycfmxbAction(String companyid,Timestamp biginTimestamp,Timestamp enTimestamp) { public String sdgZycfmxbAction(String companyid,Timestamp biginTimestamp,Timestamp enTimestamp,String message,List<DxDataManager> dataList) {
//his_住院药品医嘱明细表 //his_住院药品医嘱明细表
DxNormalDataManager his_zyYpmxbDao=DaoCreator.getNormalDao("his_zyYpmxbDao"); DxNormalDataManager his_zyYpmxbDao=DaoCreator.getNormalDao("his_zyYpmxbDao");
his_zyYpmxbDao.reload(new Object[] {companyid, biginTimestamp, enTimestamp}); his_zyYpmxbDao.reload(new Object[] {companyid, biginTimestamp, enTimestamp});
@ -1499,6 +1652,8 @@ public class HisAutoSyjgThread implements DxThreadOperate{
jgrydicdao.reloadByDictionary("NAME", "USERACCOUNT"); jgrydicdao.reloadByDictionary("NAME", "USERACCOUNT");
DxNormalDataManager yyyfDic = DaoCreator.getNormalDao("yyyfDic"); DxNormalDataManager yyyfDic = DaoCreator.getNormalDao("yyyfDic");
yyyfDic.setNormalParameters(new Object[]{companyid});
yyyfDic.reloadByDictionary("MC", "BM");
DxNormalDataManager dwdicdao = DaoCreator.getNormalDao("dwdicdao"); DxNormalDataManager dwdicdao = DaoCreator.getNormalDao("dwdicdao");
dwdicdao.reloadByDictionary("MC", "BH"); dwdicdao.reloadByDictionary("MC", "BH");
@ -1625,13 +1780,22 @@ public class HisAutoSyjgThread implements DxThreadOperate{
timestamp.setNanos(0); timestamp.setNanos(0);
sjgzyyzzbdao.setColumnValue("crt_tm_zdsc", timestamp);// sjgzyyzzbdao.setColumnValue("crt_tm_zdsc", timestamp);//
} }
if(sjgzyyzzbdao.commit()){
System.out.println("====【住院药品医嘱明细表】更新成功=="); try {
} if(sjgzyyzzbdao.commit()){
System.out.println("====【住院药品医嘱明细表】更新成功==");
}else {
return message += "====【住院药品医嘱明细表】更新失败==;";
}
} catch (Exception e) {
// TODO: handle exception
return message += e.getMessage()+"====【住院药品医嘱明细表】更新失败==;";
}
return message ;
} }
/*4.4.1.4住院其他医嘱明细表*/ /*4.4.1.4住院其他医嘱明细表*/
public void sdgZyQtcfmxbAction(String companyid,Timestamp biginTimestamp,Timestamp enTimestamp) { public String sdgZyQtcfmxbAction(String companyid,Timestamp biginTimestamp,Timestamp enTimestamp,String message,List<DxDataManager> dataList) {
//his_住院其他医嘱明细表 //his_住院其他医嘱明细表
DxNormalDataManager his_zyQtmxbDao=DaoCreator.getNormalDao("his_zyQtmxbDao"); DxNormalDataManager his_zyQtmxbDao=DaoCreator.getNormalDao("his_zyQtmxbDao");
his_zyQtmxbDao.reload(new Object[] {companyid, biginTimestamp, enTimestamp}); his_zyQtmxbDao.reload(new Object[] {companyid, biginTimestamp, enTimestamp});
@ -1655,7 +1819,6 @@ public class HisAutoSyjgThread implements DxThreadOperate{
jgrydicdao.setNormalParameters(new Object[]{companyid}); jgrydicdao.setNormalParameters(new Object[]{companyid});
jgrydicdao.reloadByDictionary("NAME", "USERACCOUNT"); jgrydicdao.reloadByDictionary("NAME", "USERACCOUNT");
DxNormalDataManager yyyfDic = DaoCreator.getNormalDao("yyyfDic");
DxNormalDataManager dwdicdao = DaoCreator.getNormalDao("dwdicdao"); DxNormalDataManager dwdicdao = DaoCreator.getNormalDao("dwdicdao");
dwdicdao.reloadByDictionary("MC", "BH"); dwdicdao.reloadByDictionary("MC", "BH");
@ -1773,13 +1936,21 @@ public class HisAutoSyjgThread implements DxThreadOperate{
timestamp.setNanos(0); timestamp.setNanos(0);
zyQtmxbDao.setColumnValue("crt_tm_zdsc", timestamp);// zyQtmxbDao.setColumnValue("crt_tm_zdsc", timestamp);//
} }
if(!zyQtmxbDao.commit()){ try {
System.out.println("====【住院其他医嘱明细表】更新成功=="); if(zyQtmxbDao.commit()){
System.out.println("====【住院其他医嘱明细表】更新成功==");
}else {
return message += "====【住院其他医嘱明细表】更新失败==";
} }
} catch (Exception e) {
// TODO: handle exception
return message += e.getMessage()+"====【住院其他医嘱明细表】更新失败==";
}
return message ;
} }
/*4.4.1.5住院收费明细表 asd*/ /*4.4.1.5住院收费明细表 asd*/
public void sdgZyFymxbAction(String companyid,Timestamp biginTimestamp,Timestamp enTimestamp) { public String sdgZyFymxbAction(String companyid,Timestamp biginTimestamp,Timestamp enTimestamp,String message,List<DxDataManager> dataList) {
//his_住院收费明细表 //his_住院收费明细表
DxNormalDataManager his_sjgzyfymxbdao=DaoCreator.getNormalDao("his_sjgzyfymxbdao"); DxNormalDataManager his_sjgzyfymxbdao=DaoCreator.getNormalDao("his_sjgzyfymxbdao");
his_sjgzyfymxbdao.reload(new Object[] {companyid, biginTimestamp, enTimestamp}); his_sjgzyfymxbdao.reload(new Object[] {companyid, biginTimestamp, enTimestamp});
@ -1803,8 +1974,6 @@ public class HisAutoSyjgThread implements DxThreadOperate{
jgrydicdao.setNormalParameters(new Object[]{companyid}); jgrydicdao.setNormalParameters(new Object[]{companyid});
jgrydicdao.reloadByDictionary("NAME", "USERACCOUNT"); jgrydicdao.reloadByDictionary("NAME", "USERACCOUNT");
DxNormalDataManager yyyfDic = DaoCreator.getNormalDao("yyyfDic");
DxNormalDataManager dwdicdao = DaoCreator.getNormalDao("dwdicdao"); DxNormalDataManager dwdicdao = DaoCreator.getNormalDao("dwdicdao");
dwdicdao.reloadByDictionary("MC", "BH"); dwdicdao.reloadByDictionary("MC", "BH");
@ -1945,14 +2114,22 @@ public class HisAutoSyjgThread implements DxThreadOperate{
timestamp.setNanos(0); timestamp.setNanos(0);
sjgzysfmxbdao.setColumnValue("crt_tm_zdsc", timestamp);//数据上传时间 sjgzysfmxbdao.setColumnValue("crt_tm_zdsc", timestamp);//数据上传时间
} }
if(sjgzysfmxbdao.commit()){ try {
System.out.println("====【住院收费明细表】更新成功=="); if(sjgzysfmxbdao.commit()){
System.out.println("====【住院收费明细表】更新成功==");
}else {
return message += "====【住院收费明细表】更新失败==;";
}
} catch (Exception e) {
// TODO: handle exception
return message += e.getMessage()+"====【住院收费明细表】更新失败==;";
} }
return message ;
} }
/* 4.4.1.6出院登记明细表*/ /* 4.4.1.6出院登记明细表*/
public void sdgZyCydjmxbAction(String companyid,Timestamp biginTimestamp,Timestamp enTimestamp) { public String sdgZyCydjmxbAction(String companyid,Timestamp biginTimestamp,Timestamp enTimestamp,String message,List<DxDataManager> dataList) {
//出院登记明细表 //出院登记明细表
DxNormalDataManager his_sjgzycydjmxbdao=DaoCreator.getNormalDao("his_sjgzycydjmxbdao"); DxNormalDataManager his_sjgzycydjmxbdao=DaoCreator.getNormalDao("his_sjgzycydjmxbdao");
his_sjgzycydjmxbdao.reload(new Object[] {companyid, biginTimestamp, enTimestamp}); his_sjgzycydjmxbdao.reload(new Object[] {companyid, biginTimestamp, enTimestamp});
@ -1977,8 +2154,6 @@ public class HisAutoSyjgThread implements DxThreadOperate{
jgrydicdao.setNormalParameters(new Object[]{companyid}); jgrydicdao.setNormalParameters(new Object[]{companyid});
jgrydicdao.reloadByDictionary("NAME", "USERACCOUNT"); jgrydicdao.reloadByDictionary("NAME", "USERACCOUNT");
DxNormalDataManager yyyfDic = DaoCreator.getNormalDao("yyyfDic");
DxNormalDataManager dwdicdao = DaoCreator.getNormalDao("dwdicdao"); DxNormalDataManager dwdicdao = DaoCreator.getNormalDao("dwdicdao");
dwdicdao.reloadByDictionary("MC", "BH"); dwdicdao.reloadByDictionary("MC", "BH");
@ -2060,14 +2235,22 @@ public class HisAutoSyjgThread implements DxThreadOperate{
timestamp.setNanos(0); timestamp.setNanos(0);
sjgcydjmxbdao.setColumnValue("crt_tm_zdsc", timestamp);//数据上传时间 sjgcydjmxbdao.setColumnValue("crt_tm_zdsc", timestamp);//数据上传时间
} }
if(sjgcydjmxbdao.commit()){ try {
System.out.println("====【出院登记明细表】更新成功=="); if(sjgcydjmxbdao.commit()){
System.out.println("====【出院登记明细表】更新成功==");
}else {
return message += "====【出院登记明细表】更新失败==";
}
} catch (Exception e) {
// TODO: handle exception
return message += e.getMessage()+"====【出院登记明细表】更新失败==";
} }
return message ;
} }
/*4.4.1.7住院结算明细表*/ /*4.4.1.7住院结算明细表*/
public void sdgZyJsmxbAction(String companyid,Timestamp biginTimestamp,Timestamp enTimestamp) { public String sdgZyJsmxbAction(String companyid,Timestamp biginTimestamp,Timestamp enTimestamp,String message,List<DxDataManager> dataList) {
//住院结算明细 //住院结算明细
DxNormalDataManager his_sjgzyJsmxbdao=DaoCreator.getNormalDao("his_sjgzyjsmxbdao"); DxNormalDataManager his_sjgzyJsmxbdao=DaoCreator.getNormalDao("his_sjgzyjsmxbdao");
his_sjgzyJsmxbdao.reload(new Object[] {companyid, biginTimestamp, enTimestamp}); his_sjgzyJsmxbdao.reload(new Object[] {companyid, biginTimestamp, enTimestamp});
@ -2151,13 +2334,21 @@ public class HisAutoSyjgThread implements DxThreadOperate{
timestamp.setNanos(0); timestamp.setNanos(0);
sjgzyjsmxbdao.setColumnValue("crt_tm_zdsc", timestamp);//数据上传时间 sjgzyjsmxbdao.setColumnValue("crt_tm_zdsc", timestamp);//数据上传时间
} }
try {
if(sjgzyjsmxbdao.commit()){ if(sjgzyjsmxbdao.commit()){
System.out.println("====【住院结算明细表】更新成功=="); System.out.println("====【住院结算明细表】更新成功==");
}else {
return message += "====【住院结算明细表】更新失败==;";
}
} catch (Exception e) {
// TODO: handle exception
return message += e.getMessage()+"====【住院结算明细表】更新失败==;";
} }
return message ;
} }
/*4.4.1.8住院结算支付方式明细表*/ /*4.4.1.8住院结算支付方式明细表*/
public void sdgZyJsZffsmxbAction(String companyid,Timestamp biginTimestamp,Timestamp enTimestamp) { public String sdgZyJsZffsmxbAction(String companyid,Timestamp biginTimestamp,Timestamp enTimestamp,String message,List<DxDataManager> dataList) {
//his_住院结算支付方式明细表 //his_住院结算支付方式明细表
DxNormalDataManager his_sjgzyjszffsmxbdao=DaoCreator.getNormalDao("his_sjgzyjszffsmxbdao"); DxNormalDataManager his_sjgzyjszffsmxbdao=DaoCreator.getNormalDao("his_sjgzyjszffsmxbdao");
his_sjgzyjszffsmxbdao.reload(new Object[] {companyid, biginTimestamp, enTimestamp}); his_sjgzyjszffsmxbdao.reload(new Object[] {companyid, biginTimestamp, enTimestamp});
@ -2181,8 +2372,6 @@ public class HisAutoSyjgThread implements DxThreadOperate{
jgrydicdao.setNormalParameters(new Object[]{companyid}); jgrydicdao.setNormalParameters(new Object[]{companyid});
jgrydicdao.reloadByDictionary("NAME", "USERACCOUNT"); jgrydicdao.reloadByDictionary("NAME", "USERACCOUNT");
DxNormalDataManager yyyfDic = DaoCreator.getNormalDao("yyyfDic");
DxNormalDataManager ksdic=DaoCreator.getNormalDao("ksdic"); DxNormalDataManager ksdic=DaoCreator.getNormalDao("ksdic");
ksdic.setNormalParameters(new Object[]{companyid}); ksdic.setNormalParameters(new Object[]{companyid});
ksdic.reloadByDictionary("DPTNAME", "DPTID"); ksdic.reloadByDictionary("DPTNAME", "DPTID");
@ -2232,14 +2421,22 @@ public class HisAutoSyjgThread implements DxThreadOperate{
timestamp.setNanos(0); timestamp.setNanos(0);
sjgzyjszffsmxbdao.setColumnValue("crt_tm_zdsc",timestamp);//数据上传时间 sjgzyjszffsmxbdao.setColumnValue("crt_tm_zdsc",timestamp);//数据上传时间
} }
if(sjgzyjszffsmxbdao.commit()){ try {
if(sjgzyjszffsmxbdao.commit()){
System.out.println("====【住院结算支付方式明细表】更新成功=="); System.out.println("====【住院结算支付方式明细表】更新成功==");
}else {
return message += "====【住院结算支付方式明细表】更新失败;==";
}
} catch (Exception e) {
// TODO: handle exception
return message += e.getMessage()+"====【住院结算支付方式明细表】更新失败;==";
} }
return message ;
} }
/* 4.4.1.9住院诊断明细表*/ /* 4.4.1.9住院诊断明细表*/
/*4.4.1.9住院诊断明细表*/ /*4.4.1.9住院诊断明细表*/
public void sdgZyZdmxbAction(String companyid,Timestamp biginTimestamp,Timestamp enTimestamp) { public String sdgZyZdmxbAction(String companyid,Timestamp biginTimestamp,Timestamp enTimestamp,String message,List<DxDataManager> dataList) {
//his_住院诊断明细表 //his_住院诊断明细表
DxNormalDataManager sjgzyjzmxbdao_his=DaoCreator.getNormalDao("sjgzyjzmxbdao_his"); DxNormalDataManager sjgzyjzmxbdao_his=DaoCreator.getNormalDao("sjgzyjzmxbdao_his");
sjgzyjzmxbdao_his.reload(new Object[] {companyid, biginTimestamp, enTimestamp}); sjgzyjzmxbdao_his.reload(new Object[] {companyid, biginTimestamp, enTimestamp});
@ -2263,8 +2460,6 @@ public class HisAutoSyjgThread implements DxThreadOperate{
jgrydicdao.setNormalParameters(new Object[]{companyid}); jgrydicdao.setNormalParameters(new Object[]{companyid});
jgrydicdao.reloadByDictionary("NAME", "USERACCOUNT"); jgrydicdao.reloadByDictionary("NAME", "USERACCOUNT");
DxNormalDataManager yyyfDic = DaoCreator.getNormalDao("yyyfDic");
DxNormalDataManager ksdic=DaoCreator.getNormalDao("ksdic"); DxNormalDataManager ksdic=DaoCreator.getNormalDao("ksdic");
ksdic.setNormalParameters(new Object[]{companyid}); ksdic.setNormalParameters(new Object[]{companyid});
ksdic.reloadByDictionary("DPTNAME", "DPTID"); ksdic.reloadByDictionary("DPTNAME", "DPTID");
@ -2307,8 +2502,17 @@ public class HisAutoSyjgThread implements DxThreadOperate{
timestamp.setNanos(0); timestamp.setNanos(0);
sjgzyzdmxbdao.setColumnValue("crt_tm_zdsc",timestamp);//数据上传时间 sjgzyzdmxbdao.setColumnValue("crt_tm_zdsc",timestamp);//数据上传时间
} }
if(sjgzyzdmxbdao.commit()){ try {
if(sjgzyzdmxbdao.commit()){
System.out.println("====【住院诊断明细表】更新成功=="); System.out.println("====【住院诊断明细表】更新成功==");
}else {
return message += "====【住院诊断明细表】更新失败==";
}
} catch (Exception e) {
// TODO: handle exception
return message += e.getMessage()+"====【住院诊断明细表】更新失败==";
} }
return message ;
} }
} }

@ -1063,26 +1063,6 @@ public class YbTest extends WatSDIWindow {
} }
public void syjgAction() { public void syjgAction() {
// syjgHzxxAction();
// sdgghmxbAction();
// sdgmhzjzmxAction();
// sdgMjzcfzbAction();
// sdgMjzcfmxbAction();
// sdgMjzQtcfmxbAction();
// sdgMjzFymxbAction();
// sdgMjzJsmxbAction();
// sdgMjzJsZffsmxbAction();
// sdgMjzZdmxbAction();
// sjgRydjmxbAction();
// sdgZycfzbAction();
// sdgZycfmxbAction();
// sdgZyQtcfmxbAction();
// sdgZyFymxbAction();
// sdgZyCydjmxbAction();
// sdgZyJsmxbAction();
// sdgZyJsZffsmxbAction();
// sdgZyZdmxbAction();
DxNormalDataManager yljgusedao = new DxNormalDataManager("select PKEY,JGMC from MAIN_YLJG where ZT='1' "); DxNormalDataManager yljgusedao = new DxNormalDataManager("select PKEY,JGMC from MAIN_YLJG where ZT='1' ");
yljgusedao.reload(); yljgusedao.reload();
Calendar begin = Calendar.getInstance(); Calendar begin = Calendar.getInstance();
@ -1090,63 +1070,46 @@ public class YbTest extends WatSDIWindow {
begin.set(Calendar.MINUTE, 0); begin.set(Calendar.MINUTE, 0);
begin.set(Calendar.SECOND, 0); begin.set(Calendar.SECOND, 0);
begin.add(Calendar.DATE, -1); begin.add(Calendar.DATE, -1);
//Timestamp biginTimestamp = new Timestamp(begin.getTimeInMillis()); // Timestamp biginTimestamp = new Timestamp(begin.getTimeInMillis());
Timestamp biginTimestamp = new Timestamp(Long.valueOf("1734278399000")); Timestamp biginTimestamp = new Timestamp(Long.valueOf("1735487999000"));
Calendar end = Calendar.getInstance(); Calendar end = Calendar.getInstance();
end.set(Calendar.HOUR_OF_DAY, 23); end.set(Calendar.HOUR_OF_DAY, 23);
end.set(Calendar.MINUTE, 59); end.set(Calendar.MINUTE, 59);
end.set(Calendar.SECOND, 59); end.set(Calendar.SECOND, 59);
end.add(Calendar.DATE, -1); end.add(Calendar.DATE, -1);
//Timestamp enTimestamp = new Timestamp(end.getTimeInMillis()); // Timestamp enTimestamp = new Timestamp(end.getTimeInMillis());
Timestamp enTimestamp = new Timestamp(Long.valueOf("1734451199000")); Timestamp enTimestamp = new Timestamp(Long.valueOf("1735747199000"));
// for(int i=0;i<yljgusedao.getRowCount();i++){ List<DxDataManager> dataList = new ArrayList<DxDataManager>();
//String companyid=MainUtil.getCurCompanyID(); String message = "";
// String companyid="C903C18E-27EB-A242-6306-E301CB3E6AC9";
// syjgHzxxAction(companyid,biginTimestamp,enTimestamp);
// sdgghmxbAction(companyid, biginTimestamp, enTimestamp);
// sdgmhzjzmxAction(companyid, biginTimestamp, enTimestamp);
// sdgMjzcfzbAction(companyid, biginTimestamp, enTimestamp);
// sdgMjzcfmxbAction(companyid, biginTimestamp, enTimestamp);
// sdgMjzQtcfmxbAction(companyid, biginTimestamp, enTimestamp);
// sdgMjzFymxbAction(companyid, biginTimestamp, enTimestamp);
// sdgMjzJsmxbAction(companyid, biginTimestamp, enTimestamp);
// sdgMjzJsZffsmxbAction(companyid, biginTimestamp, enTimestamp);
// sdgMjzZdmxbAction(companyid, biginTimestamp, enTimestamp);
// sjgRydjmxbAction(companyid, biginTimestamp, enTimestamp);
// sdgZycfzbAction(companyid, biginTimestamp, enTimestamp);
// sdgZycfmxbAction(companyid, biginTimestamp, enTimestamp);
// sdgZyQtcfmxbAction(companyid, biginTimestamp, enTimestamp);
// sdgZyFymxbAction(companyid, biginTimestamp, enTimestamp);1
// sdgZyCydjmxbAction(companyid, biginTimestamp, enTimestamp);
// sdgZyJsmxbAction(companyid, biginTimestamp, enTimestamp);
// sdgZyJsZffsmxbAction(companyid, biginTimestamp, enTimestamp);
// sdgZyZdmxbAction(companyid, biginTimestamp, enTimestamp);
// }
String companyid = "C903C18E-27EB-A242-6306-E301CB3E6AC9"; String companyid = "C903C18E-27EB-A242-6306-E301CB3E6AC9";
// syjgHzxxAction(companyid,biginTimestamp,enTimestamp); syjgHzxxAction(companyid,biginTimestamp,enTimestamp);
// sdgghmxbAction(companyid, biginTimestamp, enTimestamp); sdgghmxbAction(companyid,biginTimestamp,enTimestamp);
// sdgmhzjzmxAction(companyid, biginTimestamp, enTimestamp); sdgmhzjzmxAction(companyid,biginTimestamp,enTimestamp);
// sdgMjzcfzbAction(companyid, biginTimestamp, enTimestamp); sdgMjzcfzbAction(companyid,biginTimestamp,enTimestamp);
// sdgMjzcfmxbAction(companyid, biginTimestamp, enTimestamp); sdgMjzcfmxbAction(companyid,biginTimestamp,enTimestamp);
// sdgMjzQtcfmxbAction(companyid, biginTimestamp, enTimestamp); sdgMjzQtcfmxbAction(companyid,biginTimestamp,enTimestamp);
sdgMjzFymxbAction(companyid, biginTimestamp, enTimestamp); sdgMjzFymxbAction(companyid,biginTimestamp,enTimestamp);
// sdgMjzJsmxbAction(companyid, biginTimestamp, enTimestamp); sdgMjzJsmxbAction(companyid,biginTimestamp,enTimestamp);
// sdgMjzJsZffsmxbAction(companyid, biginTimestamp, enTimestamp); sdgMjzJsZffsmxbAction(companyid,biginTimestamp,enTimestamp);
// sdgMjzZdmxbAction(companyid, biginTimestamp, enTimestamp); sdgMjzZdmxbAction(companyid,biginTimestamp,enTimestamp);
// sjgRydjmxbAction(companyid, biginTimestamp, enTimestamp); sjgRydjmxbAction(companyid,biginTimestamp,enTimestamp);
// sdgZycfzbAction(companyid, biginTimestamp, enTimestamp); sdgZycfzbAction(companyid,biginTimestamp,enTimestamp);
// sdgZycfmxbAction(companyid, biginTimestamp, enTimestamp); sdgZycfmxbAction(companyid,biginTimestamp,enTimestamp);
// sdgZyQtcfmxbAction(companyid, biginTimestamp, enTimestamp); sdgZyQtcfmxbAction(companyid,biginTimestamp,enTimestamp);
sdgZyFymxbAction(companyid, biginTimestamp, enTimestamp); sdgZyFymxbAction(companyid,biginTimestamp,enTimestamp);
// sdgZyCydjmxbAction(companyid, biginTimestamp, enTimestamp); sdgZyCydjmxbAction(companyid,biginTimestamp,enTimestamp);
// sdgZyJsmxbAction(companyid, biginTimestamp, enTimestamp); sdgZyJsmxbAction(companyid,biginTimestamp,enTimestamp);
// sdgZyJsZffsmxbAction(companyid, biginTimestamp, enTimestamp); sdgZyJsZffsmxbAction(companyid,biginTimestamp,enTimestamp);
// sdgZyZdmxbAction(companyid, biginTimestamp, enTimestamp); sdgZyZdmxbAction(companyid,biginTimestamp,enTimestamp);
} }
public static DxNormalDataManager setYwdzSource(DxNormalDataManager dao){
DxProxoolDataSourceFactory ds = new DxProxoolDataSourceFactory("mysql_lei");
dao.setDataSourceFactory(ds);
return dao;
}
public void syjgHzxxAction(String companyid,Timestamp biginTimestamp,Timestamp enTimestamp) { public void syjgHzxxAction(String companyid,Timestamp biginTimestamp,Timestamp enTimestamp) {
//his_患者信息 //his_患者信息
@ -1159,7 +1122,7 @@ public class YbTest extends WatSDIWindow {
sjghzjbxxbdao.reload(); sjghzjbxxbdao.reload();
DxNormalDataManager ybjgcsdao=DaoCreator.getNormalDao("ybjgcsdao"); DxNormalDataManager ybjgcsdao=DaoCreator.getNormalDao("ybjgcsdao");
ybjgcsdao.reload(new Object[]{MainUtil.getCurCompanyID()}); ybjgcsdao.reload(new Object[]{companyid});
SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd");
SimpleDateFormat sdft = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); SimpleDateFormat sdft = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
@ -1218,7 +1181,7 @@ public class YbTest extends WatSDIWindow {
} }
sjghzjbxxbdao.setColumnValue("LXDH_LBDM", LXDH_LBDM);//联系电话-类别代码 sjghzjbxxbdao.setColumnValue("LXDH_LBDM", LXDH_LBDM);//联系电话-类别代码
sjghzjbxxbdao.setColumnValue("LXDH_LB", LXDH_LB);//联系电话-类别 sjghzjbxxbdao.setColumnValue("LXDH_LB", LXDH_LB);//联系电话-类别
int[] arr = MainUtil.getAgeIntArray(hzinfoTestDao.getColumnValueAsLong(i,"CSRQ")); int[] arr = getAgeIntArray(hzinfoTestDao.getColumnValueAsLong(i,"CSRQ"));
sjghzjbxxbdao.setColumnValue("NLS", arr[0]);//年龄(岁) sjghzjbxxbdao.setColumnValue("NLS", arr[0]);//年龄(岁)
sjghzjbxxbdao.setColumnValue("NLY", arr[1]);//年龄(月) sjghzjbxxbdao.setColumnValue("NLY", arr[1]);//年龄(月)
// sjghzjbxxbdao.setColumnValue("NLT", arr[2]);//年龄(天) // sjghzjbxxbdao.setColumnValue("NLT", arr[2]);//年龄(天)
@ -1232,17 +1195,89 @@ public class YbTest extends WatSDIWindow {
} }
if(sjghzjbxxbdao.commit()){ if(sjghzjbxxbdao.commit()){
System.out.println("====【患者信息TB_HZXX】更新成功=="); System.out.println("====【患者信息TB_HZXX】更新成功==");
} }
} }
/**
* 返回年龄数组
* @param lBirthday 出生日期Long值
* @return 年龄整数数组 {,,}
*/
public static int[] getAgeIntArray(Long lBirthday) {
try{
if(lBirthday==0L){
//输入lBirthday为0L时表示未输入
throw new Exception("输入日期错误");
}
Date dateBirthday=new Date(lBirthday);
return getAgeIntArray(dateBirthday, null);
}catch (Exception e) {
return new int[] { 0, 0, 0 };
}
}
/**
* 返回年龄数组
* @param dateBirthday 出生日期
* @param dateCalculate 计算日期 如传入值为NULL则表示当时
* @return 年龄整数数组 {,,}
*/
public static int[] getAgeIntArray(Date dateBirthday, Date dateCalculate) {
//年龄数组
int[] aIntAge = new int[] { 0, 0, 0 };
Calendar calAge = Calendar.getInstance();
if (dateCalculate != null) {
calAge.setTime(dateCalculate);
}
aIntAge[0] = calAge.get(Calendar.YEAR);
aIntAge[1] = calAge.get(Calendar.MONTH) + 1;
aIntAge[2] = calAge.get(Calendar.DAY_OF_MONTH);
//出生日期数组
int[] aIntBirth = new int[] { 0, 0, 0 };
Calendar calBirthday = Calendar.getInstance();
if (dateBirthday != null) {
calBirthday.setTime(dateBirthday);
}
aIntBirth[0] = calBirthday.get(Calendar.YEAR);
aIntBirth[1] = calBirthday.get(Calendar.MONTH) + 1;
aIntBirth[2] = calBirthday.get(Calendar.DAY_OF_MONTH);
//进行加减计算
aIntAge[0] -= aIntBirth[0];
aIntAge[1] -= aIntBirth[1];
aIntAge[2] -= aIntBirth[2];
//进行日补齐计算
if (aIntAge[2] < 0) {
Calendar calCal = Calendar.getInstance();
if (dateCalculate != null) {
calCal.setTime(dateCalculate);
}
calCal.set(Calendar.DAY_OF_MONTH, 1);
calCal.set(Calendar.DAY_OF_YEAR, calCal.get(Calendar.DAY_OF_YEAR) - 1);
aIntAge[2] += calCal.get(Calendar.DAY_OF_MONTH);
aIntAge[1]--;
}
//进行月补齐计算
if (aIntAge[1] < 0) {
aIntAge[1] += 12;
aIntAge[0]--;
}
//进行年补齐计算
if (aIntAge[0] < 0) {
aIntAge[0] = 0;
aIntAge[1] = 0;
aIntAge[2] = 0;
}
return aIntAge;
}
/* 4.3.1.1挂号明细表 */ /* 4.3.1.1挂号明细表 */
public void sdgghmxbAction(String companyid,Timestamp biginTimestamp,Timestamp enTimestamp) { public void sdgghmxbAction(String companyid,Timestamp biginTimestamp,Timestamp enTimestamp) {
//his_挂号明细表 //his_挂号明细表
DxNormalDataManager mzghJzGhbAllDao=DaoCreator.getNormalDao("sjg_mzghJzGhbAllDao"); DxNormalDataManager mzghJzGhbAllDao=DaoCreator.getNormalDao("sjg_mzghJzGhbAllDao");
mzghJzGhbAllDao.reload(new Object[] {companyid, biginTimestamp, enTimestamp}); mzghJzGhbAllDao.reload(new Object[] {companyid, biginTimestamp, enTimestamp});
DxNormalDataManager mzsffpzbAllDao=DaoCreator.getNormalDao("mzsffpzbAllDao"); DxNormalDataManager mzsffpzbAllDao=DaoCreator.getNormalDao("mzsffpzbAllDao");
mzsffpzbAllDao.reload(new Object[] {MainUtil.getCurCompanyID()}); mzsffpzbAllDao.reload(new Object[] {companyid});
//中心_挂号明细表 //中心_挂号明细表
DxNormalDataManager sdgghmxbdao=DaoCreator.getNormalDao("sdgghmxbdao"); DxNormalDataManager sdgghmxbdao=DaoCreator.getNormalDao("sdgghmxbdao");
@ -1250,15 +1285,17 @@ public class YbTest extends WatSDIWindow {
sdgghmxbdao.reload(); sdgghmxbdao.reload();
DxNormalDataManager ybjgcsdao=DaoCreator.getNormalDao("ybjgcsdao"); DxNormalDataManager ybjgcsdao=DaoCreator.getNormalDao("ybjgcsdao");
ybjgcsdao.reload(new Object[]{MainUtil.getCurCompanyID()}); ybjgcsdao.reload(new Object[]{companyid});
SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd");
SimpleDateFormat sdft = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); SimpleDateFormat sdft = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
DxNormalDataManager ksdic=DaoCreator.getNormalDao(this,"ksdic"); DxNormalDataManager ksdic=DaoCreator.getNormalDao("ksdic");
ksdic.setNormalParameters(new Object[]{companyid});
ksdic.reloadByDictionary("DPTNAME", "DPTID");
DxNormalDataManager jgrydicdao = DaoCreator.getNormalDao("jgrydicdao"); DxNormalDataManager jgrydicdao = DaoCreator.getNormalDao("jgrydicdao");
jgrydicdao.setNormalParameters(new Object[]{MainUtil.getCurCompanyID()}); jgrydicdao.setNormalParameters(new Object[]{companyid});
jgrydicdao.reloadByDictionary("NAME", "USERACCOUNT"); jgrydicdao.reloadByDictionary("NAME", "USERACCOUNT");
long datatime = System.currentTimeMillis(); long datatime = System.currentTimeMillis();
for (int i = 0; i < mzghJzGhbAllDao.getRowCount(); i++) { for (int i = 0; i < mzghJzGhbAllDao.getRowCount(); i++) {
@ -1315,6 +1352,7 @@ public class YbTest extends WatSDIWindow {
if(sdgghmxbdao.commit()){ if(sdgghmxbdao.commit()){
System.out.println("====【挂号明细表TB_MZ_GHMXB】更新成功=="); System.out.println("====【挂号明细表TB_MZ_GHMXB】更新成功==");
} }
} }
/*4.3.1.2门急诊就诊明细表*/ /*4.3.1.2门急诊就诊明细表*/
@ -1329,21 +1367,21 @@ public class YbTest extends WatSDIWindow {
sjgmjzjzmxbdao.reload(); sjgmjzjzmxbdao.reload();
DxNormalDataManager ybjgcsdao=DaoCreator.getNormalDao("ybjgcsdao"); DxNormalDataManager ybjgcsdao=DaoCreator.getNormalDao("ybjgcsdao");
ybjgcsdao.reload(new Object[]{MainUtil.getCurCompanyID()}); ybjgcsdao.reload(new Object[]{companyid});
SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd");
SimpleDateFormat sdft = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); SimpleDateFormat sdft = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
DxNormalDataManager dpdicdao = DaoCreator.getNormalDao("dpdicdao"); DxNormalDataManager dpdicdao = DaoCreator.getNormalDao("dpdicdao");
dpdicdao.setNormalParameters(new Object[]{MainUtil.getCurCompanyID()}); dpdicdao.setNormalParameters(new Object[]{companyid});
dpdicdao.reloadByDictionary("DPTNAME", "DPTID"); dpdicdao.reloadByDictionary("DPTNAME", "DPTID");
DxNormalDataManager jgrydicdao = DaoCreator.getNormalDao("jgrydicdao"); DxNormalDataManager jgrydicdao = DaoCreator.getNormalDao("jgrydicdao");
jgrydicdao.setNormalParameters(new Object[]{MainUtil.getCurCompanyID()}); jgrydicdao.setNormalParameters(new Object[]{companyid});
jgrydicdao.reloadByDictionary("NAME", "USERACCOUNT"); jgrydicdao.reloadByDictionary("NAME", "USERACCOUNT");
long datatime = System.currentTimeMillis(); long datatime = System.currentTimeMillis();
DxNormalDataManager gzzMzQtjbzdDao = DaoCreator.getNormalDao(this,"gzzMzQtjbzdDao"); DxNormalDataManager gzzMzQtjbzdDao = DaoCreator.getNormalDao("gzzMzQtjbzdDao");
gzzMzQtjbzdDao.reload(new Object[] {MainUtil.getCurCompanyID()}); gzzMzQtjbzdDao.reload(new Object[] {companyid});
for (int i = 0; i < sjgmjzjzmxbdao_his.getRowCount(); i++) { for (int i = 0; i < sjgmjzjzmxbdao_his.getRowCount(); i++) {
sjgmjzjzmxbdao.absoluteInSert(); sjgmjzjzmxbdao.absoluteInSert();
sjgmjzjzmxbdao.setColumnValue("yljgdm", "452894746");//医疗机构代码 sjgmjzjzmxbdao.setColumnValue("yljgdm", "452894746");//医疗机构代码
@ -1383,7 +1421,7 @@ public class YbTest extends WatSDIWindow {
String jbmc = ""; String jbmc = "";
String jbbm = ""; String jbbm = "";
gzzMzQtjbzdDao.setFilter(" JGID LIKE '"+MainUtil.getCurCompanyID()+"' AND HZPKEY LIKE '"+sjgmjzjzmxbdao_his.getColumnValueAsString(i,"HZPKEY")+"' AND JZPKEY LIKE '"+sjgmjzjzmxbdao_his.getColumnValueAsString(i,"JZPKEY")+"'" ); gzzMzQtjbzdDao.setFilter(" JGID LIKE '"+companyid+"' AND HZPKEY LIKE '"+sjgmjzjzmxbdao_his.getColumnValueAsString(i,"HZPKEY")+"' AND JZPKEY LIKE '"+sjgmjzjzmxbdao_his.getColumnValueAsString(i,"JZPKEY")+"'" );
gzzMzQtjbzdDao.filter(); gzzMzQtjbzdDao.filter();
if(gzzMzQtjbzdDao.getRowCount() > 0) { if(gzzMzQtjbzdDao.getRowCount() > 0) {
@ -1416,7 +1454,7 @@ public class YbTest extends WatSDIWindow {
if(sjgmjzjzmxbdao.commit()){ if(sjgmjzjzmxbdao.commit()){
System.out.println("====【门急诊就诊明细表】更新成功=="); System.out.println("====【门急诊就诊明细表】更新成功==");
} }
} }
/*4.3.1.3门急诊处方主表*/ /*4.3.1.3门急诊处方主表*/
@ -1431,20 +1469,20 @@ public class YbTest extends WatSDIWindow {
sjgmjzCfzbdao.reload(); sjgmjzCfzbdao.reload();
DxNormalDataManager ybjgcsdao=DaoCreator.getNormalDao("ybjgcsdao"); DxNormalDataManager ybjgcsdao=DaoCreator.getNormalDao("ybjgcsdao");
ybjgcsdao.reload(new Object[]{MainUtil.getCurCompanyID()}); ybjgcsdao.reload(new Object[]{companyid});
SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd");
SimpleDateFormat sdft = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); SimpleDateFormat sdft = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
DxNormalDataManager dpdicdao = DaoCreator.getNormalDao("dpdicdao"); DxNormalDataManager dpdicdao = DaoCreator.getNormalDao("dpdicdao");
dpdicdao.setNormalParameters(new Object[]{MainUtil.getCurCompanyID()}); dpdicdao.setNormalParameters(new Object[]{companyid});
dpdicdao.reloadByDictionary("DPTNAME", "DPTID"); dpdicdao.reloadByDictionary("DPTNAME", "DPTID");
DxNormalDataManager jgrydicdao = DaoCreator.getNormalDao("jgrydicdao"); DxNormalDataManager jgrydicdao = DaoCreator.getNormalDao("jgrydicdao");
jgrydicdao.setNormalParameters(new Object[]{MainUtil.getCurCompanyID()}); jgrydicdao.setNormalParameters(new Object[]{companyid});
jgrydicdao.reloadByDictionary("NAME", "USERACCOUNT"); jgrydicdao.reloadByDictionary("NAME", "USERACCOUNT");
DxDataManager xbdao = DaoCreator.getNormalDao(this,"xbdao"); DxDataManager xbdao = DaoCreator.getNormalDao("xbdao");
xbdao.reloadByDictionary("MC", "BH"); xbdao.reloadByDictionary("MC", "BH");
long datatime = System.currentTimeMillis(); long datatime = System.currentTimeMillis();
Timestamp timestamp = new Timestamp(datatime); Timestamp timestamp = new Timestamp(datatime);
@ -1590,22 +1628,22 @@ public class YbTest extends WatSDIWindow {
sjgmjzypcdmxbdao.reload(); sjgmjzypcdmxbdao.reload();
DxNormalDataManager ybjgcsdao=DaoCreator.getNormalDao("ybjgcsdao"); DxNormalDataManager ybjgcsdao=DaoCreator.getNormalDao("ybjgcsdao");
ybjgcsdao.reload(new Object[]{MainUtil.getCurCompanyID()}); ybjgcsdao.reload(new Object[]{companyid});
SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd");
SimpleDateFormat sdft = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); SimpleDateFormat sdft = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
DxNormalDataManager dpdicdao = DaoCreator.getNormalDao("dpdicdao"); DxNormalDataManager dpdicdao = DaoCreator.getNormalDao("dpdicdao");
dpdicdao.setNormalParameters(new Object[]{MainUtil.getCurCompanyID()}); dpdicdao.setNormalParameters(new Object[]{companyid});
dpdicdao.reloadByDictionary("DPTNAME", "DPTID"); dpdicdao.reloadByDictionary("DPTNAME", "DPTID");
DxNormalDataManager jgrydicdao = DaoCreator.getNormalDao("jgrydicdao"); DxNormalDataManager jgrydicdao = DaoCreator.getNormalDao("jgrydicdao");
jgrydicdao.setNormalParameters(new Object[]{MainUtil.getCurCompanyID()}); jgrydicdao.setNormalParameters(new Object[]{companyid});
jgrydicdao.reloadByDictionary("NAME", "USERACCOUNT"); jgrydicdao.reloadByDictionary("NAME", "USERACCOUNT");
DxNormalDataManager yyyfDic = DaoCreator.getNormalDao(this,"yyyfDic"); DxNormalDataManager yyyfDic = DaoCreator.getNormalDao("yyyfDic");
DxNormalDataManager dwdicdao = DaoCreator.getNormalDao(this,"dwdicdao"); DxNormalDataManager dwdicdao = DaoCreator.getNormalDao("dwdicdao");
dwdicdao.reloadByDictionary("MC", "BH"); dwdicdao.reloadByDictionary("MC", "BH");
long datatime = System.currentTimeMillis(); long datatime = System.currentTimeMillis();
@ -1714,22 +1752,22 @@ public class YbTest extends WatSDIWindow {
sjgmjzqtcfmxbdao.reload(); sjgmjzqtcfmxbdao.reload();
DxNormalDataManager ybjgcsdao=DaoCreator.getNormalDao("ybjgcsdao"); DxNormalDataManager ybjgcsdao=DaoCreator.getNormalDao("ybjgcsdao");
ybjgcsdao.reload(new Object[]{MainUtil.getCurCompanyID()}); ybjgcsdao.reload(new Object[]{companyid});
SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd");
SimpleDateFormat sdft = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); SimpleDateFormat sdft = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
DxNormalDataManager dpdicdao = DaoCreator.getNormalDao("dpdicdao"); DxNormalDataManager dpdicdao = DaoCreator.getNormalDao("dpdicdao");
dpdicdao.setNormalParameters(new Object[]{MainUtil.getCurCompanyID()}); dpdicdao.setNormalParameters(new Object[]{companyid});
dpdicdao.reloadByDictionary("DPTNAME", "DPTID"); dpdicdao.reloadByDictionary("DPTNAME", "DPTID");
DxNormalDataManager jgrydicdao = DaoCreator.getNormalDao("jgrydicdao"); DxNormalDataManager jgrydicdao = DaoCreator.getNormalDao("jgrydicdao");
jgrydicdao.setNormalParameters(new Object[]{MainUtil.getCurCompanyID()}); jgrydicdao.setNormalParameters(new Object[]{companyid});
jgrydicdao.reloadByDictionary("NAME", "USERACCOUNT"); jgrydicdao.reloadByDictionary("NAME", "USERACCOUNT");
DxNormalDataManager yyyfDic = DaoCreator.getNormalDao(this,"yyyfDic"); DxNormalDataManager yyyfDic = DaoCreator.getNormalDao("yyyfDic");
DxNormalDataManager dwdicdao = DaoCreator.getNormalDao(this,"dwdicdao"); DxNormalDataManager dwdicdao = DaoCreator.getNormalDao("dwdicdao");
dwdicdao.reloadByDictionary("MC", "BH"); dwdicdao.reloadByDictionary("MC", "BH");
long datatime = System.currentTimeMillis(); long datatime = System.currentTimeMillis();
Timestamp timestamp = new Timestamp(datatime); Timestamp timestamp = new Timestamp(datatime);
@ -1792,7 +1830,7 @@ public class YbTest extends WatSDIWindow {
} }
sjgmjzqtcfmxbdao.setColumnValue("zxksbm", his_mzQtmxbDao.getColumnValueAsString(i,"YZXZKS"));//执行科室编码 sjgmjzqtcfmxbdao.setColumnValue("zxksbm", his_mzQtmxbDao.getColumnValueAsString(i,"YZXZKS"));//执行科室编码
sjgmjzqtcfmxbdao.setColumnValue("zxksmc", dpdicdao.getDicValue(his_mzQtmxbDao.getColumnValueAsString(i,"YZXZKS")));//执行科室名称 sjgmjzqtcfmxbdao.setColumnValue("zxksmc", dpdicdao.getDicValue(his_mzQtmxbDao.getColumnValueAsString(i,"YZXZKS")));//执行科室名称
sjgmjzqtcfmxbdao.setColumnValue("jzjgmc", MainUtil.getCurCompanyName());//执行科室名称 sjgmjzqtcfmxbdao.setColumnValue("jzjgmc", "越西县妇幼保健院");//执行科室名称
sjgmjzqtcfmxbdao.setColumnValue("cfzxsj", new Timestamp(his_mzQtmxbDao.getColumnValueAsLong(i,"CJRQ")));//处方执行时间 sjgmjzqtcfmxbdao.setColumnValue("cfzxsj", new Timestamp(his_mzQtmxbDao.getColumnValueAsLong(i,"CJRQ")));//处方执行时间
sjgmjzqtcfmxbdao.setColumnValue("wsfwyq", "");//卫生服务要求 sjgmjzqtcfmxbdao.setColumnValue("wsfwyq", "");//卫生服务要求
sjgmjzqtcfmxbdao.setColumnValue("qtyxcz", "");//其它医学处置 sjgmjzqtcfmxbdao.setColumnValue("qtyxcz", "");//其它医学处置
@ -1837,26 +1875,26 @@ public class YbTest extends WatSDIWindow {
sjgmjzfymxbdao.reload(); sjgmjzfymxbdao.reload();
DxNormalDataManager ybjgcsdao=DaoCreator.getNormalDao("ybjgcsdao"); DxNormalDataManager ybjgcsdao=DaoCreator.getNormalDao("ybjgcsdao");
ybjgcsdao.reload(new Object[]{MainUtil.getCurCompanyID()}); ybjgcsdao.reload(new Object[]{companyid});
SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd");
SimpleDateFormat sdft = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); SimpleDateFormat sdft = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
DxNormalDataManager dpdicdao = DaoCreator.getNormalDao("dpdicdao"); DxNormalDataManager dpdicdao = DaoCreator.getNormalDao("dpdicdao");
dpdicdao.setNormalParameters(new Object[]{MainUtil.getCurCompanyID()}); dpdicdao.setNormalParameters(new Object[]{companyid});
dpdicdao.reloadByDictionary("DPTNAME", "DPTID"); dpdicdao.reloadByDictionary("DPTNAME", "DPTID");
DxNormalDataManager jgrydicdao = DaoCreator.getNormalDao("jgrydicdao"); DxNormalDataManager jgrydicdao = DaoCreator.getNormalDao("jgrydicdao");
jgrydicdao.setNormalParameters(new Object[]{MainUtil.getCurCompanyID()}); jgrydicdao.setNormalParameters(new Object[]{companyid});
jgrydicdao.reloadByDictionary("NAME", "USERACCOUNT"); jgrydicdao.reloadByDictionary("NAME", "USERACCOUNT");
DxNormalDataManager yyyfDic = DaoCreator.getNormalDao(this,"yyyfDic"); DxNormalDataManager yyyfDic = DaoCreator.getNormalDao("yyyfDic");
DxNormalDataManager ksdic=DaoCreator.getNormalDao(this,"ksdic"); DxNormalDataManager ksdic=DaoCreator.getNormalDao("ksdic");
ksdic.setNormalParameters(new Object[]{MainUtil.getCurCompanyID()}); ksdic.setNormalParameters(new Object[]{companyid});
ksdic.reloadByDictionary("DPTNAME", "DPTID"); ksdic.reloadByDictionary("DPTNAME", "DPTID");
DxNormalDataManager dwdicdao = DaoCreator.getNormalDao(this,"dwdicdao"); DxNormalDataManager dwdicdao = DaoCreator.getNormalDao("dwdicdao");
dwdicdao.reloadByDictionary("MC", "BH"); dwdicdao.reloadByDictionary("MC", "BH");
long datatime = System.currentTimeMillis(); long datatime = System.currentTimeMillis();
Timestamp timestamp = new Timestamp(datatime); Timestamp timestamp = new Timestamp(datatime);
@ -2036,26 +2074,26 @@ public class YbTest extends WatSDIWindow {
sjgmjzjsmxbdao.reload(); sjgmjzjsmxbdao.reload();
DxNormalDataManager ybjgcsdao=DaoCreator.getNormalDao("ybjgcsdao"); DxNormalDataManager ybjgcsdao=DaoCreator.getNormalDao("ybjgcsdao");
ybjgcsdao.reload(new Object[]{MainUtil.getCurCompanyID()}); ybjgcsdao.reload(new Object[]{companyid});
SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd");
SimpleDateFormat sdft = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); SimpleDateFormat sdft = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
DxNormalDataManager dpdicdao = DaoCreator.getNormalDao("dpdicdao"); DxNormalDataManager dpdicdao = DaoCreator.getNormalDao("dpdicdao");
dpdicdao.setNormalParameters(new Object[]{MainUtil.getCurCompanyID()}); dpdicdao.setNormalParameters(new Object[]{companyid});
dpdicdao.reloadByDictionary("DPTNAME", "DPTID"); dpdicdao.reloadByDictionary("DPTNAME", "DPTID");
DxNormalDataManager jgrydicdao = DaoCreator.getNormalDao("jgrydicdao"); DxNormalDataManager jgrydicdao = DaoCreator.getNormalDao("jgrydicdao");
jgrydicdao.setNormalParameters(new Object[]{MainUtil.getCurCompanyID()}); jgrydicdao.setNormalParameters(new Object[]{companyid});
jgrydicdao.reloadByDictionary("NAME", "USERACCOUNT"); jgrydicdao.reloadByDictionary("NAME", "USERACCOUNT");
DxNormalDataManager yyyfDic = DaoCreator.getNormalDao(this,"yyyfDic"); DxNormalDataManager yyyfDic = DaoCreator.getNormalDao("yyyfDic");
DxNormalDataManager ksdic=DaoCreator.getNormalDao(this,"ksdic"); DxNormalDataManager ksdic=DaoCreator.getNormalDao("ksdic");
ksdic.setNormalParameters(new Object[]{MainUtil.getCurCompanyID()}); ksdic.setNormalParameters(new Object[]{companyid});
ksdic.reloadByDictionary("DPTNAME", "DPTID"); ksdic.reloadByDictionary("DPTNAME", "DPTID");
DxNormalDataManager dwdicdao = DaoCreator.getNormalDao(this,"dwdicdao"); DxNormalDataManager dwdicdao = DaoCreator.getNormalDao("dwdicdao");
dwdicdao.reloadByDictionary("MC", "BH"); dwdicdao.reloadByDictionary("MC", "BH");
long datatime = System.currentTimeMillis(); long datatime = System.currentTimeMillis();
Timestamp timestamp = new Timestamp(datatime); Timestamp timestamp = new Timestamp(datatime);
@ -2133,26 +2171,26 @@ public class YbTest extends WatSDIWindow {
sjgmjzjszffsmxbdao.reload(); sjgmjzjszffsmxbdao.reload();
DxNormalDataManager ybjgcsdao=DaoCreator.getNormalDao("ybjgcsdao"); DxNormalDataManager ybjgcsdao=DaoCreator.getNormalDao("ybjgcsdao");
ybjgcsdao.reload(new Object[]{MainUtil.getCurCompanyID()}); ybjgcsdao.reload(new Object[]{companyid});
SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd");
SimpleDateFormat sdft = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); SimpleDateFormat sdft = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
DxNormalDataManager dpdicdao = DaoCreator.getNormalDao("dpdicdao"); DxNormalDataManager dpdicdao = DaoCreator.getNormalDao("dpdicdao");
dpdicdao.setNormalParameters(new Object[]{MainUtil.getCurCompanyID()}); dpdicdao.setNormalParameters(new Object[]{companyid});
dpdicdao.reloadByDictionary("DPTNAME", "DPTID"); dpdicdao.reloadByDictionary("DPTNAME", "DPTID");
DxNormalDataManager jgrydicdao = DaoCreator.getNormalDao("jgrydicdao"); DxNormalDataManager jgrydicdao = DaoCreator.getNormalDao("jgrydicdao");
jgrydicdao.setNormalParameters(new Object[]{MainUtil.getCurCompanyID()}); jgrydicdao.setNormalParameters(new Object[]{companyid});
jgrydicdao.reloadByDictionary("NAME", "USERACCOUNT"); jgrydicdao.reloadByDictionary("NAME", "USERACCOUNT");
DxNormalDataManager yyyfDic = DaoCreator.getNormalDao(this,"yyyfDic"); DxNormalDataManager yyyfDic = DaoCreator.getNormalDao("yyyfDic");
DxNormalDataManager ksdic=DaoCreator.getNormalDao(this,"ksdic"); DxNormalDataManager ksdic=DaoCreator.getNormalDao("ksdic");
ksdic.setNormalParameters(new Object[]{MainUtil.getCurCompanyID()}); ksdic.setNormalParameters(new Object[]{companyid});
ksdic.reloadByDictionary("DPTNAME", "DPTID"); ksdic.reloadByDictionary("DPTNAME", "DPTID");
DxNormalDataManager dwdicdao = DaoCreator.getNormalDao(this,"dwdicdao"); DxNormalDataManager dwdicdao = DaoCreator.getNormalDao("dwdicdao");
dwdicdao.reloadByDictionary("MC", "BH"); dwdicdao.reloadByDictionary("MC", "BH");
long datatime = System.currentTimeMillis(); long datatime = System.currentTimeMillis();
Timestamp timestamp = new Timestamp(datatime); Timestamp timestamp = new Timestamp(datatime);
@ -2214,26 +2252,26 @@ public class YbTest extends WatSDIWindow {
sjgmjzzdmxbdao.reload(); sjgmjzzdmxbdao.reload();
DxNormalDataManager ybjgcsdao=DaoCreator.getNormalDao("ybjgcsdao"); DxNormalDataManager ybjgcsdao=DaoCreator.getNormalDao("ybjgcsdao");
ybjgcsdao.reload(new Object[]{MainUtil.getCurCompanyID()}); ybjgcsdao.reload(new Object[]{companyid});
SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd");
SimpleDateFormat sdft = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); SimpleDateFormat sdft = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
DxNormalDataManager dpdicdao = DaoCreator.getNormalDao("dpdicdao"); DxNormalDataManager dpdicdao = DaoCreator.getNormalDao("dpdicdao");
dpdicdao.setNormalParameters(new Object[]{MainUtil.getCurCompanyID()}); dpdicdao.setNormalParameters(new Object[]{companyid});
dpdicdao.reloadByDictionary("DPTNAME", "DPTID"); dpdicdao.reloadByDictionary("DPTNAME", "DPTID");
DxNormalDataManager jgrydicdao = DaoCreator.getNormalDao("jgrydicdao"); DxNormalDataManager jgrydicdao = DaoCreator.getNormalDao("jgrydicdao");
jgrydicdao.setNormalParameters(new Object[]{MainUtil.getCurCompanyID()}); jgrydicdao.setNormalParameters(new Object[]{companyid});
jgrydicdao.reloadByDictionary("NAME", "USERACCOUNT"); jgrydicdao.reloadByDictionary("NAME", "USERACCOUNT");
DxNormalDataManager yyyfDic = DaoCreator.getNormalDao(this,"yyyfDic"); DxNormalDataManager yyyfDic = DaoCreator.getNormalDao("yyyfDic");
DxNormalDataManager ksdic=DaoCreator.getNormalDao(this,"ksdic"); DxNormalDataManager ksdic=DaoCreator.getNormalDao("ksdic");
ksdic.setNormalParameters(new Object[]{MainUtil.getCurCompanyID()}); ksdic.setNormalParameters(new Object[]{companyid});
ksdic.reloadByDictionary("DPTNAME", "DPTID"); ksdic.reloadByDictionary("DPTNAME", "DPTID");
DxNormalDataManager dwdicdao = DaoCreator.getNormalDao(this,"dwdicdao"); DxNormalDataManager dwdicdao = DaoCreator.getNormalDao("dwdicdao");
dwdicdao.reloadByDictionary("MC", "BH"); dwdicdao.reloadByDictionary("MC", "BH");
long datatime = System.currentTimeMillis(); long datatime = System.currentTimeMillis();
Timestamp timestamp = new Timestamp(datatime); Timestamp timestamp = new Timestamp(datatime);
@ -2289,26 +2327,26 @@ public class YbTest extends WatSDIWindow {
sjgrydjmxbdao.reload(); sjgrydjmxbdao.reload();
DxNormalDataManager ybjgcsdao=DaoCreator.getNormalDao("ybjgcsdao"); DxNormalDataManager ybjgcsdao=DaoCreator.getNormalDao("ybjgcsdao");
ybjgcsdao.reload(new Object[]{MainUtil.getCurCompanyID()}); ybjgcsdao.reload(new Object[]{companyid});
SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd");
SimpleDateFormat sdft = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); SimpleDateFormat sdft = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
DxNormalDataManager dpdicdao = DaoCreator.getNormalDao("dpdicdao"); DxNormalDataManager dpdicdao = DaoCreator.getNormalDao("dpdicdao");
dpdicdao.setNormalParameters(new Object[]{MainUtil.getCurCompanyID()}); dpdicdao.setNormalParameters(new Object[]{companyid});
dpdicdao.reloadByDictionary("DPTNAME", "DPTID"); dpdicdao.reloadByDictionary("DPTNAME", "DPTID");
DxNormalDataManager jgrydicdao = DaoCreator.getNormalDao("jgrydicdao"); DxNormalDataManager jgrydicdao = DaoCreator.getNormalDao("jgrydicdao");
jgrydicdao.setNormalParameters(new Object[]{MainUtil.getCurCompanyID()}); jgrydicdao.setNormalParameters(new Object[]{companyid});
jgrydicdao.reloadByDictionary("NAME", "USERACCOUNT"); jgrydicdao.reloadByDictionary("NAME", "USERACCOUNT");
DxNormalDataManager yyyfDic = DaoCreator.getNormalDao(this,"yyyfDic"); DxNormalDataManager yyyfDic = DaoCreator.getNormalDao("yyyfDic");
DxNormalDataManager ksdic=DaoCreator.getNormalDao(this,"ksdic"); DxNormalDataManager ksdic=DaoCreator.getNormalDao("ksdic");
ksdic.setNormalParameters(new Object[]{MainUtil.getCurCompanyID()}); ksdic.setNormalParameters(new Object[]{companyid});
ksdic.reloadByDictionary("DPTNAME", "DPTID"); ksdic.reloadByDictionary("DPTNAME", "DPTID");
DxNormalDataManager dwdicdao = DaoCreator.getNormalDao(this,"dwdicdao"); DxNormalDataManager dwdicdao = DaoCreator.getNormalDao("dwdicdao");
dwdicdao.reloadByDictionary("MC", "BH"); dwdicdao.reloadByDictionary("MC", "BH");
long datatime = System.currentTimeMillis(); long datatime = System.currentTimeMillis();
Timestamp timestamp = new Timestamp(datatime); Timestamp timestamp = new Timestamp(datatime);
@ -2381,20 +2419,20 @@ public class YbTest extends WatSDIWindow {
sjgzyyzzbdao.reload(); sjgzyyzzbdao.reload();
DxNormalDataManager ybjgcsdao=DaoCreator.getNormalDao("ybjgcsdao"); DxNormalDataManager ybjgcsdao=DaoCreator.getNormalDao("ybjgcsdao");
ybjgcsdao.reload(new Object[]{MainUtil.getCurCompanyID()}); ybjgcsdao.reload(new Object[]{companyid});
SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd");
SimpleDateFormat sdft = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); SimpleDateFormat sdft = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
DxNormalDataManager dpdicdao = DaoCreator.getNormalDao("dpdicdao"); DxNormalDataManager dpdicdao = DaoCreator.getNormalDao("dpdicdao");
dpdicdao.setNormalParameters(new Object[]{MainUtil.getCurCompanyID()}); dpdicdao.setNormalParameters(new Object[]{companyid});
dpdicdao.reloadByDictionary("DPTNAME", "DPTID"); dpdicdao.reloadByDictionary("DPTNAME", "DPTID");
DxNormalDataManager jgrydicdao = DaoCreator.getNormalDao("jgrydicdao"); DxNormalDataManager jgrydicdao = DaoCreator.getNormalDao("jgrydicdao");
jgrydicdao.setNormalParameters(new Object[]{MainUtil.getCurCompanyID()}); jgrydicdao.setNormalParameters(new Object[]{companyid});
jgrydicdao.reloadByDictionary("NAME", "USERACCOUNT"); jgrydicdao.reloadByDictionary("NAME", "USERACCOUNT");
DxDataManager xbdao = DaoCreator.getNormalDao(this,"xbdao"); DxDataManager xbdao = DaoCreator.getNormalDao("xbdao");
xbdao.reloadByDictionary("MC", "BH"); xbdao.reloadByDictionary("MC", "BH");
long datatime = System.currentTimeMillis(); long datatime = System.currentTimeMillis();
Timestamp timestamp = new Timestamp(datatime); Timestamp timestamp = new Timestamp(datatime);
@ -2479,22 +2517,22 @@ public class YbTest extends WatSDIWindow {
sjgzyyzzbdao.reload(); sjgzyyzzbdao.reload();
DxNormalDataManager ybjgcsdao=DaoCreator.getNormalDao("ybjgcsdao"); DxNormalDataManager ybjgcsdao=DaoCreator.getNormalDao("ybjgcsdao");
ybjgcsdao.reload(new Object[]{MainUtil.getCurCompanyID()}); ybjgcsdao.reload(new Object[]{companyid});
SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd");
SimpleDateFormat sdft = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); SimpleDateFormat sdft = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
DxNormalDataManager dpdicdao = DaoCreator.getNormalDao("dpdicdao"); DxNormalDataManager dpdicdao = DaoCreator.getNormalDao("dpdicdao");
dpdicdao.setNormalParameters(new Object[]{MainUtil.getCurCompanyID()}); dpdicdao.setNormalParameters(new Object[]{companyid});
dpdicdao.reloadByDictionary("DPTNAME", "DPTID"); dpdicdao.reloadByDictionary("DPTNAME", "DPTID");
DxNormalDataManager jgrydicdao = DaoCreator.getNormalDao("jgrydicdao"); DxNormalDataManager jgrydicdao = DaoCreator.getNormalDao("jgrydicdao");
jgrydicdao.setNormalParameters(new Object[]{MainUtil.getCurCompanyID()}); jgrydicdao.setNormalParameters(new Object[]{companyid});
jgrydicdao.reloadByDictionary("NAME", "USERACCOUNT"); jgrydicdao.reloadByDictionary("NAME", "USERACCOUNT");
DxNormalDataManager yyyfDic = DaoCreator.getNormalDao(this,"yyyfDic"); DxNormalDataManager yyyfDic = DaoCreator.getNormalDao("yyyfDic");
DxNormalDataManager dwdicdao = DaoCreator.getNormalDao(this,"dwdicdao"); DxNormalDataManager dwdicdao = DaoCreator.getNormalDao("dwdicdao");
dwdicdao.reloadByDictionary("MC", "BH"); dwdicdao.reloadByDictionary("MC", "BH");
long datatime = System.currentTimeMillis(); long datatime = System.currentTimeMillis();
@ -2636,22 +2674,22 @@ public class YbTest extends WatSDIWindow {
zyQtmxbDao.reload(); zyQtmxbDao.reload();
DxNormalDataManager ybjgcsdao=DaoCreator.getNormalDao("ybjgcsdao"); DxNormalDataManager ybjgcsdao=DaoCreator.getNormalDao("ybjgcsdao");
ybjgcsdao.reload(new Object[]{MainUtil.getCurCompanyID()}); ybjgcsdao.reload(new Object[]{companyid});
SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd");
SimpleDateFormat sdft = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); SimpleDateFormat sdft = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
DxNormalDataManager dpdicdao = DaoCreator.getNormalDao("dpdicdao"); DxNormalDataManager dpdicdao = DaoCreator.getNormalDao("dpdicdao");
dpdicdao.setNormalParameters(new Object[]{MainUtil.getCurCompanyID()}); dpdicdao.setNormalParameters(new Object[]{companyid});
dpdicdao.reloadByDictionary("DPTNAME", "DPTID"); dpdicdao.reloadByDictionary("DPTNAME", "DPTID");
DxNormalDataManager jgrydicdao = DaoCreator.getNormalDao("jgrydicdao"); DxNormalDataManager jgrydicdao = DaoCreator.getNormalDao("jgrydicdao");
jgrydicdao.setNormalParameters(new Object[]{MainUtil.getCurCompanyID()}); jgrydicdao.setNormalParameters(new Object[]{companyid});
jgrydicdao.reloadByDictionary("NAME", "USERACCOUNT"); jgrydicdao.reloadByDictionary("NAME", "USERACCOUNT");
DxNormalDataManager yyyfDic = DaoCreator.getNormalDao(this,"yyyfDic"); DxNormalDataManager yyyfDic = DaoCreator.getNormalDao("yyyfDic");
DxNormalDataManager dwdicdao = DaoCreator.getNormalDao(this,"dwdicdao"); DxNormalDataManager dwdicdao = DaoCreator.getNormalDao("dwdicdao");
dwdicdao.reloadByDictionary("MC", "BH"); dwdicdao.reloadByDictionary("MC", "BH");
long datatime = System.currentTimeMillis(); long datatime = System.currentTimeMillis();
Timestamp timestamp = new Timestamp(datatime); Timestamp timestamp = new Timestamp(datatime);
@ -2784,26 +2822,26 @@ public class YbTest extends WatSDIWindow {
sjgzysfmxbdao.reload(); sjgzysfmxbdao.reload();
DxNormalDataManager ybjgcsdao=DaoCreator.getNormalDao("ybjgcsdao"); DxNormalDataManager ybjgcsdao=DaoCreator.getNormalDao("ybjgcsdao");
ybjgcsdao.reload(new Object[]{MainUtil.getCurCompanyID()}); ybjgcsdao.reload(new Object[]{companyid});
SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd");
SimpleDateFormat sdft = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); SimpleDateFormat sdft = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
DxNormalDataManager dpdicdao = DaoCreator.getNormalDao("dpdicdao"); DxNormalDataManager dpdicdao = DaoCreator.getNormalDao("dpdicdao");
dpdicdao.setNormalParameters(new Object[]{MainUtil.getCurCompanyID()}); dpdicdao.setNormalParameters(new Object[]{companyid});
dpdicdao.reloadByDictionary("DPTNAME", "DPTID"); dpdicdao.reloadByDictionary("DPTNAME", "DPTID");
DxNormalDataManager jgrydicdao = DaoCreator.getNormalDao("jgrydicdao"); DxNormalDataManager jgrydicdao = DaoCreator.getNormalDao("jgrydicdao");
jgrydicdao.setNormalParameters(new Object[]{MainUtil.getCurCompanyID()}); jgrydicdao.setNormalParameters(new Object[]{companyid});
jgrydicdao.reloadByDictionary("NAME", "USERACCOUNT"); jgrydicdao.reloadByDictionary("NAME", "USERACCOUNT");
DxNormalDataManager yyyfDic = DaoCreator.getNormalDao(this,"yyyfDic"); DxNormalDataManager yyyfDic = DaoCreator.getNormalDao("yyyfDic");
DxNormalDataManager dwdicdao = DaoCreator.getNormalDao(this,"dwdicdao"); DxNormalDataManager dwdicdao = DaoCreator.getNormalDao("dwdicdao");
dwdicdao.reloadByDictionary("MC", "BH"); dwdicdao.reloadByDictionary("MC", "BH");
DxNormalDataManager ksdic=DaoCreator.getNormalDao(this,"ksdic"); DxNormalDataManager ksdic=DaoCreator.getNormalDao("ksdic");
ksdic.setNormalParameters(new Object[]{MainUtil.getCurCompanyID()}); ksdic.setNormalParameters(new Object[]{companyid});
ksdic.reloadByDictionary("DPTNAME", "DPTID"); ksdic.reloadByDictionary("DPTNAME", "DPTID");
long datatime = System.currentTimeMillis(); long datatime = System.currentTimeMillis();
Timestamp timestamp = new Timestamp(datatime); Timestamp timestamp = new Timestamp(datatime);
@ -2958,26 +2996,26 @@ public class YbTest extends WatSDIWindow {
DxNormalDataManager ybjgcsdao=DaoCreator.getNormalDao("ybjgcsdao"); DxNormalDataManager ybjgcsdao=DaoCreator.getNormalDao("ybjgcsdao");
ybjgcsdao.reload(new Object[]{MainUtil.getCurCompanyID()}); ybjgcsdao.reload(new Object[]{companyid});
SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd");
SimpleDateFormat sdft = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); SimpleDateFormat sdft = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
DxNormalDataManager dpdicdao = DaoCreator.getNormalDao("dpdicdao"); DxNormalDataManager dpdicdao = DaoCreator.getNormalDao("dpdicdao");
dpdicdao.setNormalParameters(new Object[]{MainUtil.getCurCompanyID()}); dpdicdao.setNormalParameters(new Object[]{companyid});
dpdicdao.reloadByDictionary("DPTNAME", "DPTID"); dpdicdao.reloadByDictionary("DPTNAME", "DPTID");
DxNormalDataManager jgrydicdao = DaoCreator.getNormalDao("jgrydicdao"); DxNormalDataManager jgrydicdao = DaoCreator.getNormalDao("jgrydicdao");
jgrydicdao.setNormalParameters(new Object[]{MainUtil.getCurCompanyID()}); jgrydicdao.setNormalParameters(new Object[]{companyid});
jgrydicdao.reloadByDictionary("NAME", "USERACCOUNT"); jgrydicdao.reloadByDictionary("NAME", "USERACCOUNT");
DxNormalDataManager yyyfDic = DaoCreator.getNormalDao(this,"yyyfDic"); DxNormalDataManager yyyfDic = DaoCreator.getNormalDao("yyyfDic");
DxNormalDataManager dwdicdao = DaoCreator.getNormalDao(this,"dwdicdao"); DxNormalDataManager dwdicdao = DaoCreator.getNormalDao("dwdicdao");
dwdicdao.reloadByDictionary("MC", "BH"); dwdicdao.reloadByDictionary("MC", "BH");
DxNormalDataManager ksdic=DaoCreator.getNormalDao(this,"ksdic"); DxNormalDataManager ksdic=DaoCreator.getNormalDao("ksdic");
ksdic.setNormalParameters(new Object[]{MainUtil.getCurCompanyID()}); ksdic.setNormalParameters(new Object[]{companyid});
ksdic.reloadByDictionary("DPTNAME", "DPTID"); ksdic.reloadByDictionary("DPTNAME", "DPTID");
long datatime = System.currentTimeMillis(); long datatime = System.currentTimeMillis();
Timestamp timestamp = new Timestamp(datatime); Timestamp timestamp = new Timestamp(datatime);
@ -3060,12 +3098,6 @@ public class YbTest extends WatSDIWindow {
} }
public static DxNormalDataManager setYwdzSource(DxNormalDataManager dao){
DxProxoolDataSourceFactory ds = new DxProxoolDataSourceFactory("mysql_lei");
dao.setDataSourceFactory(ds);
return dao;
}
/*4.4.1.7住院结算明细表*/ /*4.4.1.7住院结算明细表*/
public void sdgZyJsmxbAction(String companyid,Timestamp biginTimestamp,Timestamp enTimestamp) { public void sdgZyJsmxbAction(String companyid,Timestamp biginTimestamp,Timestamp enTimestamp) {
//住院结算明细 //住院结算明细
@ -3078,26 +3110,26 @@ public class YbTest extends WatSDIWindow {
sjgzyjsmxbdao.reload(); sjgzyjsmxbdao.reload();
DxNormalDataManager ybjgcsdao=DaoCreator.getNormalDao("ybjgcsdao"); DxNormalDataManager ybjgcsdao=DaoCreator.getNormalDao("ybjgcsdao");
ybjgcsdao.reload(new Object[]{MainUtil.getCurCompanyID()}); ybjgcsdao.reload(new Object[]{companyid});
SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd");
SimpleDateFormat sdft = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); SimpleDateFormat sdft = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
DxNormalDataManager dpdicdao = DaoCreator.getNormalDao("dpdicdao"); DxNormalDataManager dpdicdao = DaoCreator.getNormalDao("dpdicdao");
dpdicdao.setNormalParameters(new Object[]{MainUtil.getCurCompanyID()}); dpdicdao.setNormalParameters(new Object[]{companyid});
dpdicdao.reloadByDictionary("DPTNAME", "DPTID"); dpdicdao.reloadByDictionary("DPTNAME", "DPTID");
DxNormalDataManager jgrydicdao = DaoCreator.getNormalDao("jgrydicdao"); DxNormalDataManager jgrydicdao = DaoCreator.getNormalDao("jgrydicdao");
jgrydicdao.setNormalParameters(new Object[]{MainUtil.getCurCompanyID()}); jgrydicdao.setNormalParameters(new Object[]{companyid});
jgrydicdao.reloadByDictionary("NAME", "USERACCOUNT"); jgrydicdao.reloadByDictionary("NAME", "USERACCOUNT");
DxNormalDataManager yyyfDic = DaoCreator.getNormalDao(this,"yyyfDic"); DxNormalDataManager yyyfDic = DaoCreator.getNormalDao("yyyfDic");
DxNormalDataManager dwdicdao = DaoCreator.getNormalDao(this,"dwdicdao"); DxNormalDataManager dwdicdao = DaoCreator.getNormalDao("dwdicdao");
dwdicdao.reloadByDictionary("MC", "BH"); dwdicdao.reloadByDictionary("MC", "BH");
DxNormalDataManager ksdic=DaoCreator.getNormalDao(this,"ksdic"); DxNormalDataManager ksdic=DaoCreator.getNormalDao("ksdic");
ksdic.setNormalParameters(new Object[]{MainUtil.getCurCompanyID()}); ksdic.setNormalParameters(new Object[]{companyid});
ksdic.reloadByDictionary("DPTNAME", "DPTID"); ksdic.reloadByDictionary("DPTNAME", "DPTID");
long datatime = System.currentTimeMillis(); long datatime = System.currentTimeMillis();
Timestamp timestamp = new Timestamp(datatime); Timestamp timestamp = new Timestamp(datatime);
@ -3168,26 +3200,26 @@ public class YbTest extends WatSDIWindow {
sjgzyjszffsmxbdao.reload(); sjgzyjszffsmxbdao.reload();
DxNormalDataManager ybjgcsdao=DaoCreator.getNormalDao("ybjgcsdao"); DxNormalDataManager ybjgcsdao=DaoCreator.getNormalDao("ybjgcsdao");
ybjgcsdao.reload(new Object[]{MainUtil.getCurCompanyID()}); ybjgcsdao.reload(new Object[]{companyid});
SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd");
SimpleDateFormat sdft = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); SimpleDateFormat sdft = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
DxNormalDataManager dpdicdao = DaoCreator.getNormalDao("dpdicdao"); DxNormalDataManager dpdicdao = DaoCreator.getNormalDao("dpdicdao");
dpdicdao.setNormalParameters(new Object[]{MainUtil.getCurCompanyID()}); dpdicdao.setNormalParameters(new Object[]{companyid});
dpdicdao.reloadByDictionary("DPTNAME", "DPTID"); dpdicdao.reloadByDictionary("DPTNAME", "DPTID");
DxNormalDataManager jgrydicdao = DaoCreator.getNormalDao("jgrydicdao"); DxNormalDataManager jgrydicdao = DaoCreator.getNormalDao("jgrydicdao");
jgrydicdao.setNormalParameters(new Object[]{MainUtil.getCurCompanyID()}); jgrydicdao.setNormalParameters(new Object[]{companyid});
jgrydicdao.reloadByDictionary("NAME", "USERACCOUNT"); jgrydicdao.reloadByDictionary("NAME", "USERACCOUNT");
DxNormalDataManager yyyfDic = DaoCreator.getNormalDao(this,"yyyfDic"); DxNormalDataManager yyyfDic = DaoCreator.getNormalDao("yyyfDic");
DxNormalDataManager ksdic=DaoCreator.getNormalDao(this,"ksdic"); DxNormalDataManager ksdic=DaoCreator.getNormalDao("ksdic");
ksdic.setNormalParameters(new Object[]{MainUtil.getCurCompanyID()}); ksdic.setNormalParameters(new Object[]{companyid});
ksdic.reloadByDictionary("DPTNAME", "DPTID"); ksdic.reloadByDictionary("DPTNAME", "DPTID");
DxNormalDataManager dwdicdao = DaoCreator.getNormalDao(this,"dwdicdao"); DxNormalDataManager dwdicdao = DaoCreator.getNormalDao("dwdicdao");
dwdicdao.reloadByDictionary("MC", "BH"); dwdicdao.reloadByDictionary("MC", "BH");
long datatime = System.currentTimeMillis(); long datatime = System.currentTimeMillis();
Timestamp timestamp = new Timestamp(datatime); Timestamp timestamp = new Timestamp(datatime);
@ -3250,26 +3282,26 @@ public class YbTest extends WatSDIWindow {
sjgzyzdmxbdao.reload(); sjgzyzdmxbdao.reload();
DxNormalDataManager ybjgcsdao=DaoCreator.getNormalDao("ybjgcsdao"); DxNormalDataManager ybjgcsdao=DaoCreator.getNormalDao("ybjgcsdao");
ybjgcsdao.reload(new Object[]{MainUtil.getCurCompanyID()}); ybjgcsdao.reload(new Object[]{companyid});
SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd");
SimpleDateFormat sdft = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); SimpleDateFormat sdft = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
DxNormalDataManager dpdicdao = DaoCreator.getNormalDao("dpdicdao"); DxNormalDataManager dpdicdao = DaoCreator.getNormalDao("dpdicdao");
dpdicdao.setNormalParameters(new Object[]{MainUtil.getCurCompanyID()}); dpdicdao.setNormalParameters(new Object[]{companyid});
dpdicdao.reloadByDictionary("DPTNAME", "DPTID"); dpdicdao.reloadByDictionary("DPTNAME", "DPTID");
DxNormalDataManager jgrydicdao = DaoCreator.getNormalDao("jgrydicdao"); DxNormalDataManager jgrydicdao = DaoCreator.getNormalDao("jgrydicdao");
jgrydicdao.setNormalParameters(new Object[]{MainUtil.getCurCompanyID()}); jgrydicdao.setNormalParameters(new Object[]{companyid});
jgrydicdao.reloadByDictionary("NAME", "USERACCOUNT"); jgrydicdao.reloadByDictionary("NAME", "USERACCOUNT");
DxNormalDataManager yyyfDic = DaoCreator.getNormalDao(this,"yyyfDic"); DxNormalDataManager yyyfDic = DaoCreator.getNormalDao("yyyfDic");
DxNormalDataManager ksdic=DaoCreator.getNormalDao(this,"ksdic"); DxNormalDataManager ksdic=DaoCreator.getNormalDao("ksdic");
ksdic.setNormalParameters(new Object[]{MainUtil.getCurCompanyID()}); ksdic.setNormalParameters(new Object[]{companyid});
ksdic.reloadByDictionary("DPTNAME", "DPTID"); ksdic.reloadByDictionary("DPTNAME", "DPTID");
DxNormalDataManager dwdicdao = DaoCreator.getNormalDao(this,"dwdicdao"); DxNormalDataManager dwdicdao = DaoCreator.getNormalDao("dwdicdao");
dwdicdao.reloadByDictionary("MC", "BH"); dwdicdao.reloadByDictionary("MC", "BH");
long datatime = System.currentTimeMillis(); long datatime = System.currentTimeMillis();
Timestamp timestamp = new Timestamp(datatime); Timestamp timestamp = new Timestamp(datatime);

@ -2040,7 +2040,13 @@ public class PatientOrderInputForm extends WatWebForm implements IYzMbContainer{
}else{ }else{
ZyYzModel zyyzModel = createZyYzModel(); ZyYzModel zyyzModel = createZyYzModel();
ZyYzService.setZyyzYpdw(zyyzModel); ZyYzService.setZyyzYpdw(zyyzModel);
ZyYzService.calcYpyzx(zyyzModel); //ZyYzService.calcYpyzx(zyyzModel);
String yzlb = dbgrid1.getColumnValueAsString("YZLB");//获取医嘱类别
if(!"01".equals(yzlb) && !"02".equals(yzlb) && !"03".equals(yzlb)) {//药品医嘱之外的项目医嘱
ZyYzService.calcYzxJeByYzfjsm(zyyzModel);
}else{
ZyYzService.calcYpyzx(zyyzModel);
}
} }
} }

@ -76,6 +76,7 @@ public class ZyYzService {
private static Set YzxXMHiddenColumnSet = new HashSet(); private static Set YzxXMHiddenColumnSet = new HashSet();
private static Set YzxLCPCColumnSet = new HashSet(); private static Set YzxLCPCColumnSet = new HashSet();
private static Set YzxYFColumnSet = new HashSet(); private static Set YzxYFColumnSet = new HashSet();
private static Set YzxDWColumnSet = new HashSet();
private static Set YzxLCColumnSet = new HashSet(); private static Set YzxLCColumnSet = new HashSet();
private static Set YzxSLDWColumnSet = new HashSet(); private static Set YzxSLDWColumnSet = new HashSet();
private static Set YzxPCColumnSet = new HashSet(); private static Set YzxPCColumnSet = new HashSet();
@ -106,6 +107,7 @@ public class ZyYzService {
YzxSLDWColumnSet.add("YZDW"); YzxSLDWColumnSet.add("YZDW");
YzxPCColumnSet.add("YZPC"); YzxPCColumnSet.add("YZPC");
YzxDWColumnSet.add("YZDW");
YzxSLColumnSet.add("YZSL"); YzxSLColumnSet.add("YZSL");
@ -1302,8 +1304,9 @@ public class ZyYzService {
// } // }
String yzlb = zyyzNoReviewOrderDaoMapper.getYZLB(rowNum);//获取医嘱类别 String yzlb = zyyzNoReviewOrderDaoMapper.getYZLB(rowNum);//获取医嘱类别
String gllx = zyyzNoReviewOrderDaoMapper.getGLLX(rowNum);//关联类型
if(!"01".equals(yzlb) && !"02".equals(yzlb) && !"03".equals(yzlb)) {//药品医嘱之外的项目医嘱 if(!"01".equals(yzlb) && !"02".equals(yzlb) && !"03".equals(yzlb)) {//药品医嘱之外的项目医嘱
if(YzxXMHiddenColumnSet.contains(columnName)) {/*非药品医嘱需要隐藏的选择项目*/ if(YzxXMHiddenColumnSet.contains(columnName) && !YzxDWColumnSet.contains(columnName)) {/*非药品医嘱需要隐藏的选择项目*/
cellEnabled=false; cellEnabled=false;
}else if(YzHourColumnSet.contains(columnName)) {/*小时医嘱列*/ }else if(YzHourColumnSet.contains(columnName)) {/*小时医嘱列*/
String yzcl = zyyzNoReviewOrderDaoMapper.getYZCL(rowNum); String yzcl = zyyzNoReviewOrderDaoMapper.getYZCL(rowNum);
@ -1348,6 +1351,16 @@ public class ZyYzService {
} }
} }
/*非药品医嘱允许输入用法end*/ /*非药品医嘱允许输入用法end*/
/*对物资耗材类医嘱的单位特殊处理begin*/
if(YzxDWColumnSet.contains(columnName)){
if("w".equalsIgnoreCase(gllx)){
cellEnabled=true;
}else {
cellEnabled=false;
}
}
/*对物资耗材类医嘱的单位特殊处理end*/
} }
}else{ }else{
@ -1952,6 +1965,7 @@ public class ZyYzService {
String jzzhxs = zyyzOrderMapper.getYZJZZHXS(); String jzzhxs = zyyzOrderMapper.getYZJZZHXS();
String yzjldw = zyyzOrderMapper.getYZJLDW(); String yzjldw = zyyzOrderMapper.getYZJLDW();
String yzjbdw = zyyzOrderMapper.getYPYZJBDW(); String yzjbdw = zyyzOrderMapper.getYPYZJBDW();
String gllx = zyyzOrderMapper.getGLLX();//关联类型
//判断天数输入值是否合法 //判断天数输入值是否合法
if(Delphi.isNullString(ts) || !Delphi.isInteger(ts) || Integer.parseInt(ts) <= 0 ) { if(Delphi.isNullString(ts) || !Delphi.isInteger(ts) || Integer.parseInt(ts) <= 0 ) {
return model; return model;

@ -79,6 +79,9 @@ develop/lyx_20241227_zyyz
........................................................................................................................................... ...........................................................................................................................................
<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
develop/xl_20250102_crgbg
调整收入分类统计业务逻辑,以符合其他报表。
........................................................................................................................................... ...........................................................................................................................................
<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<

Loading…
Cancel
Save