配置调整

src/main/java/com/diagbot/facade/BasDeptInfoFacade.java

@@ -2,13 +2,11 @@ package com.diagbot.facade;
 
 import java.util.List;
 
-import com.diagbot.util.TZDBConn;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import com.diagbot.entity.BasDeptInfo;
 import com.diagbot.service.impl.BasDeptInfoServiceImpl;
-import com.diagbot.util.DBConn;
 
 @Component
 public class BasDeptInfoFacade extends BasDeptInfoServiceImpl{
@@ -16,8 +14,11 @@ public class BasDeptInfoFacade extends BasDeptInfoServiceImpl{
 	@Autowired
 	private BasDeptInfoServiceImpl basDeptInfoServiceImpl;
 	
+	@Autowired
+	private DataFacade dataFacade;
+	
 	public void executeTZ() {
-		List<BasDeptInfo> basDeptInfoList=TZDBConn.getDeptInfo();
+		List<BasDeptInfo> basDeptInfoList=dataFacade.getDeptInfo();
 		basDeptInfoServiceImpl.saveBatch(basDeptInfoList);
 	}
 }

src/main/java/com/diagbot/facade/BasDoctorInfoFacade.java

@@ -2,13 +2,11 @@ package com.diagbot.facade;
 
 import java.util.List;
 
-import com.diagbot.util.TZDBConn;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import com.diagbot.entity.BasDoctorInfo;
 import com.diagbot.service.impl.BasDoctorInfoServiceImpl;
-import com.diagbot.util.DBConn;
 
 @Component
 public class BasDoctorInfoFacade extends BasDoctorInfoServiceImpl {
@@ -16,8 +14,11 @@ public class BasDoctorInfoFacade extends BasDoctorInfoServiceImpl {
 	@Autowired
 	private BasDoctorInfoServiceImpl basDoctorInfoServiceImpl;
 	
+	@Autowired
+	private DataFacade dataFacade;
+	
 	public void executeTZ() {
-		List<BasDoctorInfo> basDeptInfoList=TZDBConn.getBasDoctorInfo();
+		List<BasDoctorInfo> basDeptInfoList=dataFacade.getBasDoctorInfo();
 		basDoctorInfoServiceImpl.saveBatch(basDeptInfoList);
 	}
 }

src/main/java/com/diagbot/facade/BehospitalInfoFacade.java

@@ -29,14 +29,12 @@ import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.BehospitalInfoServiceImpl;
 import com.diagbot.util.BeanUtil;
-import com.diagbot.util.DBConn;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.EncrypDES;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.ListUtil;
 import com.diagbot.util.MapUtil;
 import com.diagbot.util.SysUserUtils;
-import com.diagbot.util.TZDBConn;
 import com.diagbot.vo.AlgorithmVO;
 import com.diagbot.vo.AnalyzeApiVO;
 import com.diagbot.vo.AnalyzeVO;
@@ -686,9 +684,14 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
 
     @Autowired
     private BehospitalInfoServiceImpl behospitalInfoServiceImpl;
+    
+    @Autowired
+	private DataFacade dataFacade;
 
     public void executeTZ() {
-        List<BehospitalInfo> behospitalInfoList=TZDBConn.getBehospitalInfo();
-        behospitalInfoServiceImpl.saveBatch(behospitalInfoList);
+        List<BehospitalInfo> behospitalInfoList=dataFacade.getBehospitalInfo();
+        if(behospitalInfoList!=null && behospitalInfoList.size()!=0) {
+        	behospitalInfoServiceImpl.saveBatch(behospitalInfoList);
+        }
     }
 }

src/main/java/com/diagbot/facade/DataFacade.java

@@ -1,11 +1,11 @@
 package com.diagbot.facade;
 
+import java.sql.ResultSet;
+import java.util.Date;
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 import com.diagbot.entity.BasDeptInfo;
@@ -28,7 +28,20 @@ import com.diagbot.service.impl.HomePageServiceImpl;
 import com.diagbot.service.impl.MedRecordTypeServiceImpl;
 import com.diagbot.service.impl.MedicalRecordContentServiceImpl;
 import com.diagbot.service.impl.MedicalRecordServiceImpl;
+import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DBConn;
+import com.diagbot.util.TZDBConn;
+import com.diagbot.vo.FBasDeptInfoVO;
+import com.diagbot.vo.FBasDoctorInfoVO;
+import com.diagbot.vo.FBehospitalInfoVO;
+import com.diagbot.vo.FDoctorAdviceVO;
+import com.diagbot.vo.FHomeDiagnoseVO;
+import com.diagbot.vo.FHomeOperationVO;
+import com.diagbot.vo.FHomePageVO;
+import com.diagbot.vo.FMedicalRecordContentVO;
+import com.diagbot.vo.FMedicalRecordTypeVO;
+import com.diagbot.vo.FMedicalRecordVO;
+import com.google.common.collect.Lists;
 
 @Component
 public class DataFacade{
@@ -73,141 +86,475 @@ public class DataFacade{
 	@Qualifier("basDoctorInfoServiceImpl")
 	private BasDoctorInfoServiceImpl basDoctorInfoServiceImpl;
 	
-	
-	public void initData() {
-		//初始化病案首页
-		//addHomePage(null);
-		//病案诊断
-		//addHomeDiagnose(null);
-		//病案手术
-		//addHomeOperation(null);
-		//初始化病历信息
-		//addBehospitalInfo(null);
-		//初始化医嘱信息
-		//addDoctorAdvice(null);
-		//初始化文书类型
-		//addMedicalRecordType(null);
-		//初始化文书基本信息
-		//addMedicalRecord(null);
-		//初始化文书内容
-		//addMedicalRecordContent(null);
-		
-		 // 6 秒一次：秒 分 时 日 月 周
-	    
-		addDeptInfo(null);
-		
-		//addDoctorInfo(null);
-		
-	}
+	private static ResultSet rs = null;
 	
 	/**
 	 * 医生信息
 	 * @return
 	 */
-	public Boolean addDoctorInfo(List<BasDoctorInfo> basDoctorInfoList) {
-		if(basDoctorInfoList==null || basDoctorInfoList.size()==0){
-			basDoctorInfoList=DBConn.getBasDoctorInfo();
+	public List<BasDoctorInfo> getBasDoctorInfo() {
+		List<BasDoctorInfo> basDoctorInfoList=Lists.newLinkedList();
+		TZDBConn dbconn=new TZDBConn();
+		try {
+			String sql="select * from gi_userinfo where CJCXRQ BETWEEN TO_DATE('2020-03-01', 'yyyy-MM-dd') and TO_DATE('2020-03-30', 'yyyy-MM-dd')";
+			rs =dbconn.Query(sql, null);
+			while(rs.next()){
+				FBasDoctorInfoVO basDoctorInfoVO=new FBasDoctorInfoVO();
+				basDoctorInfoVO.setDoctorId(rs.getString("YHRYBH"));//医生ID
+				basDoctorInfoVO.setHospitalId(Long.valueOf("3"));//医院ID
+				//basDoctorInfoVO.setDeptId(rs.getString("ZZKSID"));//科室ID
+				basDoctorInfoVO.setName(rs.getString("YHRYMC"));//医生姓名
+				basDoctorInfoVO.setProfessor(rs.getString("YHRYZC"));//职称
+				
+				BasDoctorInfo basDoctorInfo=new BasDoctorInfo();
+				BeanUtil.copyProperties(basDoctorInfoVO, basDoctorInfo);
+				
+				basDoctorInfoList.add(basDoctorInfo);
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
 		}
-		return basDoctorInfoServiceImpl.saveBatch(basDoctorInfoList);
+		
+		return basDoctorInfoList;
 	}
 	
 	/**
-	 * 科室信息
-	 * @returnDeptInfo
+	 * 从视图中获取医院科室数据，根据修改时间同步数据
+	 * @return
 	 */
-	public Boolean addDeptInfo(List<BasDeptInfo> basDeptInfoList) {
-		if(basDeptInfoList==null || basDeptInfoList.size()==0){
-			basDeptInfoList=DBConn.getDeptInfo();
+	public List<BasDeptInfo> getDeptInfo() {
+		List<BasDeptInfo> basDeptInfoList=Lists.newLinkedList();
+		try {
+			TZDBConn dbconn=new TZDBConn();
+			String sql="select * from hi_deptinfo where CJCXRQ BETWEEN TO_DATE('2020-03-01', 'yyyy-MM-dd') and TO_DATE('2020-03-30', 'yyyy-MM-dd')";
+			ResultSet rs =dbconn.Query(sql, null);
+			while(rs.next()){
+				FBasDeptInfoVO basDeptInfoVO=new FBasDeptInfoVO();
+				basDeptInfoVO.setDeptId(rs.getString("ZZKSDM"));//科室编码
+				basDeptInfoVO.setHospitalId(Long.valueOf("3"));//医院ID
+				basDeptInfoVO.setDeptName(rs.getString("ZZKSMC"));//科室名称
+				//basDeptInfoVO.setDeptType(rs.getString("ZZKSLB"));//科室类别
+				basDeptInfoVO.setSpell(rs.getString("HZSRM1"));//首字母拼音
+				//basDeptInfoVO.setStation(rs.getString("FLKSID"));//区域类别
+				
+				BasDeptInfo basDeptInfo=new BasDeptInfo();
+				BeanUtil.copyProperties(basDeptInfoVO, basDeptInfo);
+				
+				basDeptInfoList.add(basDeptInfo);
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
 		}
-		return basDeptInfoServiceImpl.saveBatch(basDeptInfoList);
+		return basDeptInfoList;
 	}
 	
 	/**
-	 * 病案手术
+	 * 病案诊断
 	 * @return
 	 */
-	public Boolean addHomeOperation(List<HomeOperationInfo> homeOperationList) {
-		if(homeOperationList==null || homeOperationList.size()==0){
-			homeOperationList=DBConn.getHomeOperation();
+	public List<HomeDiagnoseInfo> getHomeDiagnose(){
+		List<HomeDiagnoseInfo> homeDiagnoseVOList=Lists.newLinkedList();
+		try {
+			DBConn dbconn=new DBConn();
+			String sql="select * from br_recdiagnose where CJCXRQ BETWEEN TO_DATE('2020-02-01', 'yyyy-MM-dd') and TO_DATE('2020-04-30', 'yyyy-MM-dd')";
+			ResultSet rs =dbconn.Query(sql, null);
+			while(rs.next()){
+				FHomeDiagnoseVO homeDiagnoseVO=new FHomeDiagnoseVO();
+				homeDiagnoseVO.setHomePageId(rs.getString("BASYID"));//病案首页ID
+				homeDiagnoseVO.setHospitalId(Long.valueOf("3"));//医院ID
+				homeDiagnoseVO.setDiagnoseOrderNo(rs.getString("BAZDXH"));//诊断序号
+				homeDiagnoseVO.setDiagnoseName(rs.getString("JBDMMC"));//诊断名称
+				homeDiagnoseVO.setDiagnoseType(rs.getString("ZDLBDM"));//诊断类别
+				homeDiagnoseVO.setDiagnoseTypeShort(rs.getString("ZCZDPB"));//诊断判别
+				homeDiagnoseVO.setBehospitalType(rs.getString("RYQKBM"));//入院情况
+				//homeDiagnoseVO.setLeaveHospitalType(rs.getString("RYQKBM"));//出院情况
+				//homeDiagnoseVO.setPathologyDiagnose(rs.getString("BASYID"));//病理号
+				homeDiagnoseVO.setIcdCode(rs.getString("ICDM"));//诊断编码
+				
+				homeDiagnoseVO.setGmtCreate(new Date());
+				
+				HomeDiagnoseInfo homeDiagnoseInfo=new HomeDiagnoseInfo();
+				BeanUtil.copyProperties(homeDiagnoseVO, homeDiagnoseInfo);
+				homeDiagnoseVOList.add(homeDiagnoseInfo);
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
 		}
-		return homeOperationInfoServiceImpl.saveBatch(homeOperationList);
+		
+		return homeDiagnoseVOList;
 	}
 	
 	/**
-	 * 病案诊断
+	 * 病案手术
 	 * @return
 	 */
-	public Boolean addHomeDiagnose(List<HomeDiagnoseInfo> homeDiagnoseList) {
-		if(homeDiagnoseList==null || homeDiagnoseList.size()==0){
-			homeDiagnoseList=DBConn.getHomeDiagnose();
+	public List<HomeOperationInfo> getHomeOperation() {
+		List<FHomeOperationVO> homeOperationVOList=Lists.newLinkedList();
+		try {
+			DBConn dbconn=new DBConn();
+			String sql="select * from br_recoperation where CJCXRQ BETWEEN TO_DATE('2020-02-01', 'yyyy-MM-dd') and TO_DATE('2020-04-30', 'yyyy-MM-dd')";
+			ResultSet rs =dbconn.Query(sql, null);
+			while(rs.next()){
+				FHomeOperationVO homeOperationVO=new FHomeOperationVO();
+				homeOperationVO.setHomePageId(rs.getString("BASYID"));//病案首页ID
+				homeOperationVO.setHospitalId(Long.valueOf("3"));//医院ID
+				homeOperationVO.setOperationOrderNo(rs.getString("BRSSXH"));//手术序号
+				homeOperationVO.setOperationDate(rs.getDate("BRSSRQ"));//手术日期
+				homeOperationVO.setOperationCode(rs.getString("SSDMID"));//手术编码
+				homeOperationVO.setOperationDoctorId(rs.getString("SSYSID"));//手术医生
+				homeOperationVO.setFirstAssistantId(rs.getString("YZHSID"));//一助医生
+				homeOperationVO.setSecondAssistantId(rs.getString("EZHSID"));//二助医生
+				homeOperationVO.setCutLevel(rs.getString("QKDJDM"));//切口等级
+				homeOperationVO.setHealingLevel(rs.getString("QKDJDM"));//愈合等级
+				homeOperationVO.setOperationName(rs.getString("BRSSMC"));//手术名称
+				homeOperationVO.setOperationLevel(rs.getString("SSJBID"));//手术级别
+				homeOperationVO.setAnaesthesiaName(rs.getString("MZFFMC"));//麻醉方式
+				homeOperationVO.setShamOperationName(rs.getString("NSSMC"));//拟手术名称
+				homeOperationVO.setGmtCreate(new Date());
+				
+				homeOperationVOList.add(homeOperationVO);
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
 		}
-		return homeDiagnoseInfoServiceImpl.saveBatch(homeDiagnoseList);
+		List<HomeOperationInfo> homeOperationList=BeanUtil.listCopyTo(homeOperationVOList, HomeOperationInfo.class);
+		return homeOperationList;
 	}
 	
 	/**
-	 * 从视图中获取文书类型
-	 * @return
+	 * 从视图获取病案首页信息
 	 */
-	public Boolean addMedicalRecordType(List<MedRecordType> medicalRecordTypeList) {
-		if(medicalRecordTypeList==null || medicalRecordTypeList.size()==0){
-			medicalRecordTypeList=DBConn.getMedicalRecordType();
+	public List<HomePage> getHomePage() {
+		List<HomePage> homePageList=Lists.newLinkedList();
+		try {
+			DBConn dbconn=new DBConn();
+			String sql="select * from br_rechome where CJCXRQ BETWEEN TO_DATE('2020-01-01', 'yyyy-MM-dd') and TO_DATE('2020-01-01', 'yyyy-MM-dd')";
+			ResultSet rs =dbconn.Query(sql, null);
+			while(rs.next()){
+				FHomePageVO homePageVO=new FHomePageVO();
+				homePageVO.setHomePageId(rs.getString("BASYID"));//病案首页ID
+				homePageVO.setHospitalId(Long.valueOf("3"));//医院ID
+				homePageVO.setBehospitalCode(rs.getString("BRZYID"));//病人住院序号
+				homePageVO.setHospitalCode(rs.getString("ZZJGID"));//组织机构id
+				homePageVO.setHospitalName(rs.getString("ZZJGMC"));//医疗机构名称
+				homePageVO.setOrgCode(rs.getString("ZZJGBH"));//医疗机构代码
+				homePageVO.setPayType(rs.getString("YLFKLB"));//医疗付费方式
+				homePageVO.setHealthCard(rs.getString("BRJKKH"));//健康卡号
+				homePageVO.setBehospitalNum(rs.getString("BRZYCS"));//住院次数
+				homePageVO.setFileCode(rs.getString("BRBABH"));//病案号
+				homePageVO.setName(rs.getString("BRBAXM"));//姓名
+				homePageVO.setSex(rs.getString("BRBAXB"));//性别
+				homePageVO.setBirthday(rs.getDate("BRCSRQ"));//出生日期
+				homePageVO.setAge(rs.getString("BRDQNL"));//病人年龄
+				homePageVO.setAgeUnit(rs.getString("BRNLDW"));//年龄单位
+				homePageVO.setNationality(rs.getString("BRBAGJ"));//国籍
+				homePageVO.setNewbornMonth(rs.getString("YENLYS"));//新生儿出生月数
+				homePageVO.setNewbornDay(rs.getString("YENLTS"));//新生儿出生天数
+				homePageVO.setNewbornWeight(rs.getString("YECSTZ"));//新生儿出生体重
+				homePageVO.setNewbornBehospitalWeight(rs.getString("YERYTZ"));//新生儿入院体重
+				homePageVO.setBornAddress(rs.getString("BRCSDZ"));//出生地
+				homePageVO.setBornPlace(rs.getString("BRBAJG"));//籍贯
+				homePageVO.setNation(rs.getString("BRBAMZ"));//民族
+				homePageVO.setIdentityCardNo(rs.getString("BRSFZH"));//身份证号
+				homePageVO.setJobType(rs.getString("BRBASF"));//职业
+				homePageVO.setMarriage(rs.getString("BRHYZK"));//婚姻
+				homePageVO.setCurAddress(rs.getString("BRLXDZ"));//现住址
+				homePageVO.setCurPhone(rs.getString("BRLXDH"));//现住址电话
+				homePageVO.setCurPostCode(rs.getString("LXDZYB"));//现住址邮编
+				homePageVO.setResidenceAddress(rs.getString("BRHKDZ"));//户口地址
+				homePageVO.setResidencePostCode(rs.getString("HKDZYB"));//户口地址邮编
+				homePageVO.setWorkAddress(rs.getString("GZDWMC"));//工作单位
+				homePageVO.setWorkPhone(rs.getString("GZDWDH"));//工作单位电话
+				homePageVO.setWorkPostCode(rs.getString("GZDWYB"));//工作单位邮编
+				homePageVO.setContactName(rs.getString("LXRYXM"));//联系人姓名
+				homePageVO.setContactRelation(rs.getString("LXRYGX"));//联系人关系
+				homePageVO.setContactAddress(rs.getString("LXRYDZ"));//联系人地址
+				homePageVO.setContactPhone(rs.getString("LXRYDH"));//联系人电话
+				homePageVO.setBehospitalWay(rs.getString("RYLYDM"));//入院途径
+				homePageVO.setBehospitalDate(rs.getDate("BRRYRQ"));//入院时间
+				homePageVO.setBehospitalDept(rs.getString("RYKSID"));//入院科室
+				homePageVO.setBehospitalWard(rs.getString("RYBQID"));//入院病房
+				homePageVO.setBehospitalBedId(rs.getString("RYCWID"));//入院床位序号
+				homePageVO.setBehospitalBedCode(rs.getString("RYCWHM"));//入院床位号码
+				homePageVO.setChangeDept(rs.getString("BRZKKB"));//转科科别
+				homePageVO.setLeaveHospitalDate(rs.getDate("BRCYRQ"));//出院时间
+				homePageVO.setLeaveHospitalDept(rs.getString("CYKSID"));//出院科别
+				homePageVO.setLeaveHospitalWard(rs.getString("CYBQID"));//出院病房
+				homePageVO.setLeaveHospitalBedId(rs.getString("CYCWID"));//出院床位序号
+				homePageVO.setLeaveHospitalBedCode(rs.getString("CYCWHM"));//出院床位号码
+				homePageVO.setBehospitalDayNum(rs.getString("SJZYTS"));//实际住院天数
+				homePageVO.setOutpatientEmrDiagnose(rs.getString("BRMZZD"));//门急诊诊断
+				homePageVO.setOutpatientEmrDiagnoseCode(rs.getString("MZZDDM"));//门急诊诊断编码
+				homePageVO.setPoisonFactor(rs.getString("SSZDYSMC"));//损伤中毒因素
+				homePageVO.setPoisonFactorCode(rs.getString("SSZDYSBM"));//损伤中毒因素编码
+				homePageVO.setPathologyDiagnose(rs.getString("BLZDMC"));//病理诊断
+				homePageVO.setPathologyDiagnoseCode(rs.getString("BLZDBM"));//病理诊断编码
+				homePageVO.setPathologyDiagnoseId(rs.getString("BLZDBH"));//病理诊断编号
+				homePageVO.setIsMedAllergy(rs.getString("YWYWGM"));//药物过敏
+				homePageVO.setMedAllergyName(rs.getString("BRGMYW"));//过敏药物
+				homePageVO.setAutopsy(rs.getString("BRSFSJ"));//死亡患者尸检
+				homePageVO.setBloodType(rs.getString("BRBAXX"));//血型
+				homePageVO.setRh(rs.getString("BRBARH"));//Rh
+				homePageVO.setDeptDirector(rs.getString("KZR"));//科主任
+				homePageVO.setDirectorDoctor(rs.getString("ZRYS"));//主任医师
+				homePageVO.setAttendingDoctor(rs.getString("ZZYS"));//主治医师
+				homePageVO.setBehospitalDoctor(rs.getString("ZYYS"));//住院医师
+				homePageVO.setResponseNurse(rs.getString("ZRHS"));//责任护士
+				homePageVO.setStudyDoctor(rs.getString("JXYS"));//进修医师
+				homePageVO.setPracticeDoctor(rs.getString("SXYS"));//实习医师
+				homePageVO.setEncodeMan(rs.getString("BMY"));//编码员
+				homePageVO.setHomePageQuality(rs.getString("BRBAZL"));//病案质量
+				homePageVO.setQcDoctor(rs.getString("BAZKYS"));//质控医师
+				homePageVO.setQcNurse(rs.getString("BAZKHS"));//质控护士
+				homePageVO.setQcDate(rs.getDate("BAZKRQ"));//质控日期
+				homePageVO.setLeaveHospitalType(rs.getString("BRLYFS"));//离院方式
+				homePageVO.setAcceptOrgCode(rs.getString("ZYJGMC"));//接收机构名称
+				homePageVO.setAgainBehospitalPlan(rs.getString("SSYZZY"));//31天内再住院计划
+				homePageVO.setAgainBehospitalGoal(rs.getString("SSYZZYMD"));//再住院目的
+				homePageVO.setTbiBeforeDay(rs.getString("RYQHMTS"));//颅脑损伤患者昏迷前天数
+				homePageVO.setTbiBeforeHour(rs.getString("RYQHMXS"));//颅脑损伤患者昏迷前小时
+				homePageVO.setTbiBeforeMinute(rs.getString("RYQHMFZ"));//颅脑损伤患者昏迷前分钟
+				homePageVO.setTbiAfterDay(rs.getString("RYQHMFZ"));//颅脑损伤患者昏迷后天数
+				homePageVO.setTbiAfterHour(rs.getString("RYHHMXS"));//颅脑损伤患者昏迷后小时
+				homePageVO.setTbiAfterMinute(rs.getString("RYQHMFZ"));//颅脑损伤患者昏迷后分钟
+				homePageVO.setTotalFee(rs.getString("ZFY"));//总费用
+				homePageVO.setOwnFee(rs.getString("ZFJE"));//自付金额
+				homePageVO.setGeneralFee(rs.getString("YBYLFWF"));//一般医疗服务费
+				homePageVO.setServiceFee(rs.getString("YBZLCZF"));//一般治疗服务费
+				homePageVO.setNurseFee(rs.getString("HLF"));//护理费
+				homePageVO.setOtherFee(rs.getString("QTFY"));//其他费用
+				homePageVO.setPathologyFee(rs.getString("BLZDF"));//病理诊断费
+				homePageVO.setLabFee(rs.getString("SYSZDF"));//实验室诊断费
+				homePageVO.setPacsFee(rs.getString("YXXZDF"));//影像学诊断费
+				homePageVO.setClinicDiagnoseFee(rs.getString("LCZDXMF"));//临床诊断项目费
+				homePageVO.setNotOperationFee(rs.getString("FSSZLXMF"));//非手术治疗项目费
+				homePageVO.setClinicPhysicFee(rs.getString("LCWLZLF"));//临床物理治疗费
+				homePageVO.setOperationTreatFee(rs.getString("SSZLF"));//手术治疗费
+				homePageVO.setAnaesthesiaFee(rs.getString("MZF"));//麻醉费
+				homePageVO.setOperationFee(rs.getString("SSF"));//手术费
+				homePageVO.setHealthTypeFee(rs.getString("KFF"));//康复类
+				homePageVO.setChnTreatFee(rs.getString("ZYZLF"));//中医治疗费
+				homePageVO.setWesternMedFee(rs.getString("XYF"));//西药费
+				homePageVO.setAntibiosisFee(rs.getString("KJYWF"));//抗菌药物费用
+				homePageVO.setChnMedFee(rs.getString("ZCYF"));//中成药费
+				homePageVO.setChnHerbFee(rs.getString("CYF"));//中草药费
+				homePageVO.setBloodFee(rs.getString("XF"));//血费
+				homePageVO.setAlbumenFee(rs.getString("BDBLZPF"));//白蛋白类制品费
+				homePageVO.setGlobulinFee(rs.getString("QDBLZPF"));//球蛋白类制品费
+				homePageVO.setBloodFactorFee(rs.getString("NXYZLZPF"));//凝血因子类制品费
+				homePageVO.setCellFactorFee(rs.getString("XBYZLZPF"));//细胞因子类制品费
+				homePageVO.setCheckMaterialFee(rs.getString("JCYYCXYYCLF"));//检查用一次性医用材料费
+				homePageVO.setTreatMaterialFee(rs.getString("ZLYYCXYYCLF"));//治疗用一次性医用材料费
+				homePageVO.setOperationMaterialFee(rs.getString("SSYYCXYYCLF"));//手术用一次性医用材料费
+				homePageVO.setOtherTypeFee(rs.getString("QTF"));//其他类其他费
+				homePageVO.setSingleDiagManage(rs.getString("DBZGL"));//单病种管理
+				homePageVO.setClinicPathwayManage(rs.getString("SSLCLJGL"));//临床路径管理
+				homePageVO.setIsOutpatientBehospital(rs.getString("MZZYFH"));//门诊与住院
+				homePageVO.setIsLeaveBehospital(rs.getString("RYCYFH"));//入院与出院
+				homePageVO.setIsOperationBeforeAfter(rs.getString("SQSHFH"));//术前与术后
+				homePageVO.setIsClinicPathology(rs.getString("LCBLFH"));//临床与病理
+				homePageVO.setIsRadiatePathology(rs.getString("FSBLFH"));//放射与病理
+				homePageVO.setRescueSuccessNum(rs.getString("BRQJCS"));//病人抢救次数
+				homePageVO.setRescueSuccessNum(rs.getString("QJCGCS"));//病人抢救成功次数
+				homePageVO.setIsAutoLeavehospital(rs.getString("ZDCYPB"));//是否为自动出院
+				homePageVO.setReturnToType(rs.getString("CYQKDM"));//转归情况
+				
+				homePageVO.setGmtCreate(new Date());
+				
+				HomePage homePage=new HomePage();
+				BeanUtil.copyProperties(homePageVO, homePage);
+				homePageList.add(homePage);
+				
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
 		}
-		return medRecordTypeServiceImpl.saveBatch(medicalRecordTypeList);
+		return homePageList;
 	}
 	
 	/**
-	 * 从视图中获取文书内容
+	 * 获取病历信息
 	 * @return
 	 */
-	public Boolean addMedicalRecordContent(List<MedicalRecordContent> medicalRecordContentList){
-		if(medicalRecordContentList==null || medicalRecordContentList.size()==0){
-			medicalRecordContentList=DBConn.getMedicalRecordContent();
+	public List<BehospitalInfo> getBehospitalInfo() {
+		List<BehospitalInfo> behospitalInfoList=Lists.newLinkedList();
+		try {
+			DBConn dbconn=new DBConn();
+			String sql="select * from br_inpatientinfo where CJCXRQ BETWEEN TO_DATE('2020-01-01', 'yyyy-MM-dd') and TO_DATE('2020-01-20', 'yyyy-MM-dd')";
+			ResultSet rs =dbconn.Query(sql, null);
+			while(rs.next()){
+				FBehospitalInfoVO behospitalInfoVO=new FBehospitalInfoVO();
+				behospitalInfoVO.setBehospitalCode(rs.getString("BRZYID"));//病人住院ID
+				behospitalInfoVO.setHospitalId("3");//医院ID
+				behospitalInfoVO.setName(rs.getString("BRDAXM"));//姓名
+				behospitalInfoVO.setSex(rs.getString("BRDAXB"));//性别
+				behospitalInfoVO.setBirthday(rs.getDate("BRCSRQ"));//出生日期
+				behospitalInfoVO.setFileCode(rs.getString("BRDABH"));//档案号
+				behospitalInfoVO.setWardCode(rs.getString("ZYBQID"));//病区编码
+				behospitalInfoVO.setWardName(rs.getString("ZYBQMC"));//病区名称
+				behospitalInfoVO.setBehDeptId(rs.getString("ZYKSID"));//住院科室ID
+				behospitalInfoVO.setBehDeptName(rs.getString("ZYKSMC"));//住院科室名称
+				behospitalInfoVO.setBedCode(rs.getString("ZYCWID"));//床位号
+				behospitalInfoVO.setBedName(rs.getString("ZYCWHM"));//床位名称
+				behospitalInfoVO.setInsuranceName(rs.getString("BRLBID"));//医保类别
+				behospitalInfoVO.setJobType(rs.getString("BRXZID"));//职业
+				behospitalInfoVO.setBehospitalDate(rs.getDate("BRRYRQ"));//入院时间
+				behospitalInfoVO.setLeaveHospitalDate(rs.getDate("BRCYRQ"));//出院时间
+				behospitalInfoVO.setDiagnoseIcd(rs.getString("JBDMID"));//疾病ICD编码
+				behospitalInfoVO.setDiagnose(rs.getString("JBMSXX"));//疾病名称
+				behospitalInfoVO.setDoctorId(rs.getString("ZZYSID"));//医生ID
+				behospitalInfoVO.setDoctorName(rs.getString("ZZYSXM"));//医生姓名
+				
+				behospitalInfoVO.setGmtCreate(new Date());
+				
+				BehospitalInfo behospitalInfo=new BehospitalInfo();
+				BeanUtil.copyProperties(behospitalInfoVO, behospitalInfo);
+				behospitalInfoList.add(behospitalInfo);
+				
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
 		}
-		return medicalRecordContentServiceImpl.saveBatch(medicalRecordContentList);
+		
+		return behospitalInfoList;
 	}
 	
 	/**
-	 * 从视图中获取文书类型
+	 * 从视图中获取医嘱信息
 	 * @return
 	 */
-	public Boolean addMedicalRecord(List<MedicalRecord> medicalRecordList){
-		if(medicalRecordList==null || medicalRecordList.size()==0){
-			medicalRecordList=DBConn.getMedicalRecord();
+	public List<DoctorAdvice> getDoctorAdvice(){
+		List<DoctorAdvice> doctorAdviceList=Lists.newLinkedList();
+		
+		try {
+			DBConn dbconn=new DBConn();
+			String sql="select * from br_doctadvice where CJCXRQ BETWEEN TO_DATE('2020-03-01', 'yyyy-MM-dd') and TO_DATE('2020-03-30', 'yyyy-MM-dd')";
+			ResultSet rs =dbconn.Query(sql, null);
+			while(rs.next()){
+				FDoctorAdviceVO doctorAdviceVO=new FDoctorAdviceVO();
+				doctorAdviceVO.setDoctorAdviceId(rs.getString("BRYZID"));//病人医嘱ID
+				doctorAdviceVO.setHospitalId(Long.valueOf("3"));//医院ID
+				doctorAdviceVO.setBehospitalCode(rs.getString("BRZYID"));//病人ID
+				doctorAdviceVO.setOrderDoctorName(rs.getString("YSKDPB"));//医生开单判别
+				doctorAdviceVO.setFrequency(rs.getString("YZPLPB"));//医嘱频率判别
+				doctorAdviceVO.setParentTypeId(rs.getString("FLYZID"));//父类医嘱ID
+				doctorAdviceVO.setDoctorAdviceType(rs.getString("YZLXPB"));//医嘱类型判别
+				doctorAdviceVO.setUsageNum(rs.getString("YCSYSL"));//一次使用数量
+				doctorAdviceVO.setUsageUnit(rs.getString("YCYLDW"));//一次用量单位
+				doctorAdviceVO.setDose(rs.getString("YZDCJL"));//医嘱单次剂量
+				doctorAdviceVO.setDoseUnit(rs.getString("DCJLDW"));//单次剂量单位
+				doctorAdviceVO.setMedModeType(rs.getString("GYFSID"));//给药方式
+				doctorAdviceVO.setDaFrequency(rs.getString("YZPLID"));//医嘱频率
+				doctorAdviceVO.setDaDealType(rs.getString("YZCLLX"));//医嘱处理类型
+				doctorAdviceVO.setDaStartDate(rs.getDate("YZKSSJ"));//医嘱开始时间
+				doctorAdviceVO.setDaItemName(rs.getString("YZXMMC"));//医嘱项目名称
+				doctorAdviceVO.setDaStatus(rs.getString("YZZTPB"));//医嘱状态判别
+				doctorAdviceVO.setDaStopDate(rs.getDate("YZJSSJ"));//医嘱结束时间
+				doctorAdviceVO.setDaGroupNo(rs.getString("YZTZXH"));//医嘱同组序号
+				doctorAdviceVO.setDaPrescriptionType(rs.getString("YZCFLX"));//医嘱处方类型
+				doctorAdviceVO.setDaMedType(rs.getString("YZLYLX"));//医嘱领药类型
+				doctorAdviceVO.setDoctorNotice(rs.getString("YSZTSM"));//医生嘱托
+				doctorAdviceVO.setDoctorId(rs.getString("KDYSID"));//开单医生ID
+				doctorAdviceVO.setDoctorName(rs.getString("KDYSXM"));//开单医生姓名
+				
+				//doctorAdviceVO.set
+				
+				DoctorAdvice doctorAdvice=new DoctorAdvice();
+				BeanUtil.copyProperties(doctorAdviceVO, doctorAdvice);
+				
+				doctorAdviceList.add(doctorAdvice);
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
 		}
-		return medicalRecordServiceImpl.saveBatch(medicalRecordList);
+		return doctorAdviceList;
 	}
-	
-	
+
 	/**
-	 * 从视图获取病案首页信息
+	 * 从视图中获取文书类型
+	 * @return
 	 */
-	public Boolean addHomePage(List<HomePage> homePage) {
-		if(homePage==null || homePage.size()==0){
-			homePage=DBConn.getHomePage();
+	public List<MedicalRecord> getMedicalRecord(){
+		List<FMedicalRecordVO> medicalRecordVOList=Lists.newLinkedList();
+		try {
+			DBConn dbconn=new DBConn();
+			String sql="select * from ar_medirecclass where CJCXRQ BETWEEN TO_DATE('2020-02-01', 'yyyy-MM-dd') and TO_DATE('2020-04-30', 'yyyy-MM-dd')";
+			ResultSet rs =dbconn.Query(sql, null);
+			while(rs.next()){
+				FMedicalRecordVO medicalRecordVO=new FMedicalRecordVO();
+				medicalRecordVO.setRecId(rs.getString("BLCJID"));
+				medicalRecordVO.setHospitalId(Long.valueOf("3"));//医院ID
+				medicalRecordVO.setBehospitalCode(rs.getString("BRZYID"));//病人住院ID
+				medicalRecordVO.setOrgCode(rs.getString("ZZJGDM"));//组织机构代码
+				medicalRecordVO.setRecTypeId(rs.getString("BLLBID"));//病历类别编号
+				medicalRecordVO.setRecDate(rs.getString("BCJLSJ"));//病历日期
+				medicalRecordVO.setRecTitle(rs.getString("BLJLMC"));//病历标题
+				
+				medicalRecordVO.setGmtCreate(new Date());
+				
+				medicalRecordVOList.add(medicalRecordVO);
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
 		}
-		return homePageServiceImpl.saveBatch(homePage);
+		
+		List<MedicalRecord> medicalRecordList=BeanUtil.listCopyTo(medicalRecordVOList, MedicalRecord.class);
+		return medicalRecordList;
 	}
 	
 	/**
-	 * 从视图中获取医嘱信息
+	 * 从视图中获取文书内容
 	 * @return
 	 */
-	public Boolean addDoctorAdvice(List<DoctorAdvice> doctorAdviceList) {
-		if(doctorAdviceList==null || doctorAdviceList.size()==0){
-			doctorAdviceList=DBConn.getDoctorAdvice();
+	public List<MedicalRecordContent> getMedicalRecordContent(){
+		List<FMedicalRecordContentVO> mrContentVOList=Lists.newLinkedList();
+		try {
+			DBConn dbconn=new DBConn();
+			String sql="select * from mr_mrcontent where CJCXRQ BETWEEN TO_DATE('2020-02-01', 'yyyy-MM-dd') and TO_DATE('2020-02-20', 'yyyy-MM-dd')";
+			ResultSet rs =dbconn.Query(sql, null);
+			while(rs.next()){
+				FMedicalRecordContentVO mrContentVO=new FMedicalRecordContentVO();
+				//oracle.sql.BLOB blob = (oracle.sql.BLOB)rs.getBlob("BLJLNR");
+				//mrContentVO.setContentBlob(blob);
+				mrContentVO.setHospitalId(Long.valueOf("3"));
+				mrContentVO.setRecId(rs.getString("BLJLID"));
+				
+				mrContentVO.setGmtCreate(new Date());
+				mrContentVOList.add(mrContentVO);
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
 		}
-		return doctorAdviceServiceImpl.saveBatch(doctorAdviceList);
+		List<MedicalRecordContent> mrContentList=BeanUtil.listCopyTo(mrContentVOList, MedicalRecordContent.class);
+		return mrContentList;
 	}
 	
 	/**
-	 * 获取病历信息
+	 * 从视图中获取文书类型
 	 * @return
 	 */
-	public Boolean addBehospitalInfo(List<BehospitalInfo> behospitalInfoList) {
-		if(behospitalInfoList==null || behospitalInfoList.size()==0){
-			behospitalInfoList=DBConn.getBehospitalInfo();
+	public List<MedRecordType> getMedicalRecordType(){
+		List<FMedicalRecordTypeVO> mrTypeVOList=Lists.newLinkedList();
+		try {
+			DBConn dbconn=new DBConn();
+			String sql="select * from ar_medirecclass where CJCXRQ BETWEEN TO_DATE('2020-02-01', 'yyyy-MM-dd') and TO_DATE('2020-02-20', 'yyyy-MM-dd')";
+			ResultSet rs =dbconn.Query(sql, null);
+			while(rs.next()){
+				FMedicalRecordTypeVO mrTypeVO=new FMedicalRecordTypeVO();
+				mrTypeVO.setTypeId(rs.getString("BLLBID"));
+				mrTypeVO.setHospitalId(Long.valueOf("3"));
+				mrTypeVO.setTypeName(rs.getString("BLLBMC"));
+				mrTypeVO.setParentTypeId(rs.getString("SJLBID"));
+				mrTypeVO.setObjName(rs.getString("BLLBFW"));
+				mrTypeVO.setSpell(rs.getString("HZSRM1"));
+				mrTypeVOList.add(mrTypeVO);
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
 		}
-		return behospitalInfoServiceImpl.saveBatch(behospitalInfoList);
+		
+		List<MedRecordType> medicalRecordTypeList=BeanUtil.listCopyTo(mrTypeVOList, MedRecordType.class);
+		return medicalRecordTypeList;
 	}
 	
 }

src/main/java/com/diagbot/facade/DoctorAdviceFacade.java

@@ -2,11 +2,9 @@ package com.diagbot.facade;
 
 import com.diagbot.entity.DoctorAdvice;
 import com.diagbot.service.impl.DoctorAdviceServiceImpl;
-import com.diagbot.util.DBConn;
 
 import java.util.List;
 
-import com.diagbot.util.TZDBConn;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -21,8 +19,11 @@ public class DoctorAdviceFacade extends DoctorAdviceServiceImpl {
 	@Autowired
 	private DoctorAdviceServiceImpl doctorAdviceServiceImpl;
 	
+	@Autowired
+	private DataFacade dataFacade;
+	
 	public void executeTZ() {
-		List<DoctorAdvice> doctorAdviceList=TZDBConn.getDoctorAdvice();
+		List<DoctorAdvice> doctorAdviceList=dataFacade.getDoctorAdvice();
 		doctorAdviceServiceImpl.saveBatch(doctorAdviceList);
 	}
 }

src/main/java/com/diagbot/facade/HomeDiagnoseInfoFacade.java

@@ -2,11 +2,9 @@ package com.diagbot.facade;
 
 import com.diagbot.entity.HomeDiagnoseInfo;
 import com.diagbot.service.impl.HomeDiagnoseInfoServiceImpl;
-import com.diagbot.util.DBConn;
 
 import java.util.List;
 
-import com.diagbot.util.TZDBConn;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -21,8 +19,11 @@ public class HomeDiagnoseInfoFacade extends HomeDiagnoseInfoServiceImpl {
 	@Autowired
 	private HomeDiagnoseInfoServiceImpl homeDiagnoseInfoServiceImpl;
 	
+	@Autowired
+	private DataFacade dataFacade;
+	
 	public void executeTZ() {
-		List<HomeDiagnoseInfo> homeDiagnoseList=TZDBConn.getHomeDiagnose();
+		List<HomeDiagnoseInfo> homeDiagnoseList=dataFacade.getHomeDiagnose();
 		homeDiagnoseInfoServiceImpl.saveBatch(homeDiagnoseList);
 	}
 }

src/main/java/com/diagbot/facade/HomeOperationInfoFacade.java

@@ -20,8 +20,11 @@ public class HomeOperationInfoFacade extends HomeOperationInfoServiceImpl {
 	@Autowired
 	private HomeOperationInfoServiceImpl homeOperationInfoServiceImpl;
 	
+	@Autowired
+	private DataFacade dataFacade;
+	
 	public void executeTZ() {
-		List<HomeOperationInfo> homeOperationList=TZDBConn.getHomeOperation();
+		List<HomeOperationInfo> homeOperationList=dataFacade.getHomeOperation();
 		homeOperationInfoServiceImpl.saveBatch(homeOperationList);
 	}
 }

src/main/java/com/diagbot/facade/HomePageFacade.java

@@ -20,8 +20,11 @@ public class HomePageFacade extends HomePageServiceImpl {
 	@Autowired
 	private HomePageServiceImpl homePageServiceImpl;
 	
+	@Autowired
+	private DataFacade dataFacade;
+	
 	public void executeTZ() {
-		List<HomePage> homePageList=TZDBConn.getHomePage();
+		List<HomePage> homePageList=dataFacade.getHomePage();
 		homePageServiceImpl.saveBatch(homePageList);
 	}
 }

src/main/java/com/diagbot/facade/MedicalRecordContentFacade.java

@@ -2,21 +2,22 @@ package com.diagbot.facade;
 
 import java.util.List;
 
-import com.diagbot.util.TZDBConn;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import com.diagbot.entity.MedicalRecordContent;
 import com.diagbot.service.impl.MedicalRecordContentServiceImpl;
-import com.diagbot.util.DBConn;
 
 @Component
 public class MedicalRecordContentFacade extends MedicalRecordContentServiceImpl {
 	@Autowired
 	private MedicalRecordContentServiceImpl medicalRecordContentServiceImpl;
 	
+	@Autowired
+	private DataFacade dataFacade;
+	
 	public void executeTZ() {
-		List<MedicalRecordContent> mrContentList=TZDBConn.getMedicalRecordContent();
+		List<MedicalRecordContent> mrContentList=dataFacade.getMedicalRecordContent();
 		medicalRecordContentServiceImpl.saveBatch(mrContentList);
 	}
 }

src/main/java/com/diagbot/facade/MedicalRecordFacade.java

@@ -23,8 +23,11 @@ public class MedicalRecordFacade extends MedicalRecordServiceImpl {
 	@Autowired
 	private MedicalRecordServiceImpl medicalRecordServiceImpl;
 	
+	@Autowired
+	private DataFacade dataFacade;
+	
 	public void executeTZ() {
-		List<MedicalRecord> medicalRecordList=TZDBConn.getMedicalRecord();
+		List<MedicalRecord> medicalRecordList=dataFacade.getMedicalRecord();
 		medicalRecordServiceImpl.saveBatch(medicalRecordList);
 	}
 	

src/main/java/com/diagbot/facade/MedicalRecordTypeFacade.java

@@ -2,21 +2,22 @@ package com.diagbot.facade;
 
 import java.util.List;
 
-import com.diagbot.util.TZDBConn;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import com.diagbot.entity.MedRecordType;
 import com.diagbot.service.impl.MedRecordTypeServiceImpl;
-import com.diagbot.util.DBConn;
 
 @Component
 public class MedicalRecordTypeFacade extends MedRecordTypeServiceImpl{
 	@Autowired
 	private MedRecordTypeServiceImpl medRecordTypeServiceImpl;
 	
+	@Autowired
+	private DataFacade dataFacade;
+	
 	public void executeTZ() {
-		List<MedRecordType> medRecordTypeList=TZDBConn.getMedicalRecordType();
+		List<MedRecordType> medRecordTypeList=dataFacade.getMedicalRecordType();
 		medRecordTypeServiceImpl.saveBatch(medRecordTypeList);
 	}
 }

src/main/java/com/diagbot/util/TZDBConn.java

@@ -5,32 +5,8 @@ import java.sql.DriverManager;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.util.Date;
-import java.util.List;
 import java.util.ResourceBundle;
 
-import com.diagbot.entity.BasDeptInfo;
-import com.diagbot.entity.BasDoctorInfo;
-import com.diagbot.entity.BehospitalInfo;
-import com.diagbot.entity.DoctorAdvice;
-import com.diagbot.entity.HomeDiagnoseInfo;
-import com.diagbot.entity.HomeOperationInfo;
-import com.diagbot.entity.HomePage;
-import com.diagbot.entity.MedRecordType;
-import com.diagbot.entity.MedicalRecord;
-import com.diagbot.entity.MedicalRecordContent;
-import com.diagbot.vo.FBasDeptInfoVO;
-import com.diagbot.vo.FBasDoctorInfoVO;
-import com.diagbot.vo.FBehospitalInfoVO;
-import com.diagbot.vo.FDoctorAdviceVO;
-import com.diagbot.vo.FHomeDiagnoseVO;
-import com.diagbot.vo.FHomeOperationVO;
-import com.diagbot.vo.FHomePageVO;
-import com.diagbot.vo.FMedicalRecordContentVO;
-import com.diagbot.vo.FMedicalRecordTypeVO;
-import com.diagbot.vo.FMedicalRecordVO;
-import com.google.common.collect.Lists;
-
 public class TZDBConn {
 	private static final String DRIVER = getValue("jdbc.driverClassName");
     private static final String URL = getValue("jdbc.url");
@@ -41,6 +17,9 @@ public class TZDBConn {
     private static PreparedStatement sta = null;
 	private static ResultSet rs = null;
 	
+	public TZDBConn() {
+	}
+	
 	/**
      * 读取属性文件中的信息
      *
@@ -127,474 +106,10 @@ public class TZDBConn {
 		}
 	}
 	
-	/**
-	 * 医生信息
-	 * @return
-	 */
-	public static List<BasDoctorInfo> getBasDoctorInfo() {
-		List<BasDoctorInfo> basDoctorInfoList=Lists.newLinkedList();
-		
-		try {
-			TZDBConn dbconn=new TZDBConn();
-			String sql="select * from gi_userinfo where CJCXRQ BETWEEN TO_DATE('2020-03-01', 'yyyy-MM-dd') and TO_DATE('2020-03-30', 'yyyy-MM-dd')";
-			rs =dbconn.Query(sql, null);
-			while(rs.next()){
-				FBasDoctorInfoVO basDoctorInfoVO=new FBasDoctorInfoVO();
-				basDoctorInfoVO.setDoctorId(rs.getString("YHRYBH"));//医生ID
-				basDoctorInfoVO.setHospitalId(Long.valueOf("3"));//医院ID
-				//basDoctorInfoVO.setDeptId(rs.getString("ZZKSID"));//科室ID
-				basDoctorInfoVO.setName(rs.getString("YHRYMC"));//医生姓名
-				basDoctorInfoVO.setProfessor(rs.getString("YHRYZC"));//职称
-				
-				BasDoctorInfo basDoctorInfo=new BasDoctorInfo();
-				BeanUtil.copyProperties(basDoctorInfoVO, basDoctorInfo);
-				
-				basDoctorInfoList.add(basDoctorInfo);
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		
-		return basDoctorInfoList;
-	}
-	
-	/**
-	 * 从视图中获取医院科室数据，根据修改时间同步数据
-	 * @return
-	 */
-	public static List<BasDeptInfo> getDeptInfo() {
-		List<BasDeptInfo> basDeptInfoList=Lists.newLinkedList();
-		try {
-			DBConn dbconn=new DBConn();
-			String sql="select * from hi_deptinfo where CJCXRQ BETWEEN TO_DATE('2020-03-01', 'yyyy-MM-dd') and TO_DATE('2020-03-30', 'yyyy-MM-dd')";
-			ResultSet rs =dbconn.Query(sql, null);
-			while(rs.next()){
-				FBasDeptInfoVO basDeptInfoVO=new FBasDeptInfoVO();
-				basDeptInfoVO.setDeptId(rs.getString("ZZKSDM"));//科室编码
-				basDeptInfoVO.setHospitalId(Long.valueOf("3"));//医院ID
-				basDeptInfoVO.setDeptName(rs.getString("ZZKSMC"));//科室名称
-				//basDeptInfoVO.setDeptType(rs.getString("ZZKSLB"));//科室类别
-				basDeptInfoVO.setSpell(rs.getString("HZSRM1"));//首字母拼音
-				//basDeptInfoVO.setStation(rs.getString("FLKSID"));//区域类别
-				
-				BasDeptInfo basDeptInfo=new BasDeptInfo();
-				BeanUtil.copyProperties(basDeptInfoVO, basDeptInfo);
-				
-				basDeptInfoList.add(basDeptInfo);
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return basDeptInfoList;
-	}
-	
-	/**
-	 * 病案诊断
-	 * @return
-	 */
-	public static List<HomeDiagnoseInfo> getHomeDiagnose(){
-		List<HomeDiagnoseInfo> homeDiagnoseVOList=Lists.newLinkedList();
-		try {
-			DBConn dbconn=new DBConn();
-			String sql="select * from br_recdiagnose where CJCXRQ BETWEEN TO_DATE('2020-02-01', 'yyyy-MM-dd') and TO_DATE('2020-04-30', 'yyyy-MM-dd')";
-			ResultSet rs =dbconn.Query(sql, null);
-			while(rs.next()){
-				FHomeDiagnoseVO homeDiagnoseVO=new FHomeDiagnoseVO();
-				homeDiagnoseVO.setHomePageId(rs.getString("BASYID"));//病案首页ID
-				homeDiagnoseVO.setHospitalId(Long.valueOf("3"));//医院ID
-				homeDiagnoseVO.setDiagnoseOrderNo(rs.getString("BAZDXH"));//诊断序号
-				homeDiagnoseVO.setDiagnoseName(rs.getString("JBDMMC"));//诊断名称
-				homeDiagnoseVO.setDiagnoseType(rs.getString("ZDLBDM"));//诊断类别
-				homeDiagnoseVO.setDiagnoseTypeShort(rs.getString("ZCZDPB"));//诊断判别
-				homeDiagnoseVO.setBehospitalType(rs.getString("RYQKBM"));//入院情况
-				//homeDiagnoseVO.setLeaveHospitalType(rs.getString("RYQKBM"));//出院情况
-				//homeDiagnoseVO.setPathologyDiagnose(rs.getString("BASYID"));//病理号
-				homeDiagnoseVO.setIcdCode(rs.getString("ICDM"));//诊断编码
-				
-				homeDiagnoseVO.setGmtCreate(new Date());
-				
-				HomeDiagnoseInfo homeDiagnoseInfo=new HomeDiagnoseInfo();
-				BeanUtil.copyProperties(homeDiagnoseVO, homeDiagnoseInfo);
-				homeDiagnoseVOList.add(homeDiagnoseInfo);
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		
-		return homeDiagnoseVOList;
-	}
-	
-	/**
-	 * 病案手术
-	 * @return
-	 */
-	public static List<HomeOperationInfo> getHomeOperation() {
-		List<FHomeOperationVO> homeOperationVOList=Lists.newLinkedList();
-		try {
-			DBConn dbconn=new DBConn();
-			String sql="select * from br_recoperation where CJCXRQ BETWEEN TO_DATE('2020-02-01', 'yyyy-MM-dd') and TO_DATE('2020-04-30', 'yyyy-MM-dd')";
-			ResultSet rs =dbconn.Query(sql, null);
-			while(rs.next()){
-				FHomeOperationVO homeOperationVO=new FHomeOperationVO();
-				homeOperationVO.setHomePageId(rs.getString("BASYID"));//病案首页ID
-				homeOperationVO.setHospitalId(Long.valueOf("3"));//医院ID
-				homeOperationVO.setOperationOrderNo(rs.getString("BRSSXH"));//手术序号
-				homeOperationVO.setOperationDate(rs.getDate("BRSSRQ"));//手术日期
-				homeOperationVO.setOperationCode(rs.getString("SSDMID"));//手术编码
-				homeOperationVO.setOperationDoctorId(rs.getString("SSYSID"));//手术医生
-				homeOperationVO.setFirstAssistantId(rs.getString("YZHSID"));//一助医生
-				homeOperationVO.setSecondAssistantId(rs.getString("EZHSID"));//二助医生
-				homeOperationVO.setCutLevel(rs.getString("QKDJDM"));//切口等级
-				homeOperationVO.setHealingLevel(rs.getString("QKDJDM"));//愈合等级
-				homeOperationVO.setOperationName(rs.getString("BRSSMC"));//手术名称
-				homeOperationVO.setOperationLevel(rs.getString("SSJBID"));//手术级别
-				homeOperationVO.setAnaesthesiaName(rs.getString("MZFFMC"));//麻醉方式
-				homeOperationVO.setShamOperationName(rs.getString("NSSMC"));//拟手术名称
-				homeOperationVO.setGmtCreate(new Date());
-				
-				homeOperationVOList.add(homeOperationVO);
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		List<HomeOperationInfo> homeOperationList=BeanUtil.listCopyTo(homeOperationVOList, HomeOperationInfo.class);
-		return homeOperationList;
-	}
-	
-	/**
-	 * 从视图获取病案首页信息
-	 */
-	public static List<HomePage> getHomePage() {
-		List<HomePage> homePageList=Lists.newLinkedList();
-		try {
-			DBConn dbconn=new DBConn();
-			String sql="select * from br_rechome where CJCXRQ BETWEEN TO_DATE('2020-01-01', 'yyyy-MM-dd') and TO_DATE('2020-01-01', 'yyyy-MM-dd')";
-			ResultSet rs =dbconn.Query(sql, null);
-			while(rs.next()){
-				FHomePageVO homePageVO=new FHomePageVO();
-				homePageVO.setHomePageId(rs.getString("BASYID"));//病案首页ID
-				homePageVO.setHospitalId(Long.valueOf("3"));//医院ID
-				homePageVO.setBehospitalCode(rs.getString("BRZYID"));//病人住院序号
-				homePageVO.setHospitalCode(rs.getString("ZZJGID"));//组织机构id
-				homePageVO.setHospitalName(rs.getString("ZZJGMC"));//医疗机构名称
-				homePageVO.setOrgCode(rs.getString("ZZJGBH"));//医疗机构代码
-				homePageVO.setPayType(rs.getString("YLFKLB"));//医疗付费方式
-				homePageVO.setHealthCard(rs.getString("BRJKKH"));//健康卡号
-				homePageVO.setBehospitalNum(rs.getString("BRZYCS"));//住院次数
-				homePageVO.setFileCode(rs.getString("BRBABH"));//病案号
-				homePageVO.setName(rs.getString("BRBAXM"));//姓名
-				homePageVO.setSex(rs.getString("BRBAXB"));//性别
-				homePageVO.setBirthday(rs.getDate("BRCSRQ"));//出生日期
-				homePageVO.setAge(rs.getString("BRDQNL"));//病人年龄
-				homePageVO.setAgeUnit(rs.getString("BRNLDW"));//年龄单位
-				homePageVO.setNationality(rs.getString("BRBAGJ"));//国籍
-				homePageVO.setNewbornMonth(rs.getString("YENLYS"));//新生儿出生月数
-				homePageVO.setNewbornDay(rs.getString("YENLTS"));//新生儿出生天数
-				homePageVO.setNewbornWeight(rs.getString("YECSTZ"));//新生儿出生体重
-				homePageVO.setNewbornBehospitalWeight(rs.getString("YERYTZ"));//新生儿入院体重
-				homePageVO.setBornAddress(rs.getString("BRCSDZ"));//出生地
-				homePageVO.setBornPlace(rs.getString("BRBAJG"));//籍贯
-				homePageVO.setNation(rs.getString("BRBAMZ"));//民族
-				homePageVO.setIdentityCardNo(rs.getString("BRSFZH"));//身份证号
-				homePageVO.setJobType(rs.getString("BRBASF"));//职业
-				homePageVO.setMarriage(rs.getString("BRHYZK"));//婚姻
-				homePageVO.setCurAddress(rs.getString("BRLXDZ"));//现住址
-				homePageVO.setCurPhone(rs.getString("BRLXDH"));//现住址电话
-				homePageVO.setCurPostCode(rs.getString("LXDZYB"));//现住址邮编
-				homePageVO.setResidenceAddress(rs.getString("BRHKDZ"));//户口地址
-				homePageVO.setResidencePostCode(rs.getString("HKDZYB"));//户口地址邮编
-				homePageVO.setWorkAddress(rs.getString("GZDWMC"));//工作单位
-				homePageVO.setWorkPhone(rs.getString("GZDWDH"));//工作单位电话
-				homePageVO.setWorkPostCode(rs.getString("GZDWYB"));//工作单位邮编
-				homePageVO.setContactName(rs.getString("LXRYXM"));//联系人姓名
-				homePageVO.setContactRelation(rs.getString("LXRYGX"));//联系人关系
-				homePageVO.setContactAddress(rs.getString("LXRYDZ"));//联系人地址
-				homePageVO.setContactPhone(rs.getString("LXRYDH"));//联系人电话
-				homePageVO.setBehospitalWay(rs.getString("RYLYDM"));//入院途径
-				homePageVO.setBehospitalDate(rs.getDate("BRRYRQ"));//入院时间
-				homePageVO.setBehospitalDept(rs.getString("RYKSID"));//入院科室
-				homePageVO.setBehospitalWard(rs.getString("RYBQID"));//入院病房
-				homePageVO.setBehospitalBedId(rs.getString("RYCWID"));//入院床位序号
-				homePageVO.setBehospitalBedCode(rs.getString("RYCWHM"));//入院床位号码
-				homePageVO.setChangeDept(rs.getString("BRZKKB"));//转科科别
-				homePageVO.setLeaveHospitalDate(rs.getDate("BRCYRQ"));//出院时间
-				homePageVO.setLeaveHospitalDept(rs.getString("CYKSID"));//出院科别
-				homePageVO.setLeaveHospitalWard(rs.getString("CYBQID"));//出院病房
-				homePageVO.setLeaveHospitalBedId(rs.getString("CYCWID"));//出院床位序号
-				homePageVO.setLeaveHospitalBedCode(rs.getString("CYCWHM"));//出院床位号码
-				homePageVO.setBehospitalDayNum(rs.getString("SJZYTS"));//实际住院天数
-				homePageVO.setOutpatientEmrDiagnose(rs.getString("BRMZZD"));//门急诊诊断
-				homePageVO.setOutpatientEmrDiagnoseCode(rs.getString("MZZDDM"));//门急诊诊断编码
-				homePageVO.setPoisonFactor(rs.getString("SSZDYSMC"));//损伤中毒因素
-				homePageVO.setPoisonFactorCode(rs.getString("SSZDYSBM"));//损伤中毒因素编码
-				homePageVO.setPathologyDiagnose(rs.getString("BLZDMC"));//病理诊断
-				homePageVO.setPathologyDiagnoseCode(rs.getString("BLZDBM"));//病理诊断编码
-				homePageVO.setPathologyDiagnoseId(rs.getString("BLZDBH"));//病理诊断编号
-				homePageVO.setIsMedAllergy(rs.getString("YWYWGM"));//药物过敏
-				homePageVO.setMedAllergyName(rs.getString("BRGMYW"));//过敏药物
-				homePageVO.setAutopsy(rs.getString("BRSFSJ"));//死亡患者尸检
-				homePageVO.setBloodType(rs.getString("BRBAXX"));//血型
-				homePageVO.setRh(rs.getString("BRBARH"));//Rh
-				homePageVO.setDeptDirector(rs.getString("KZR"));//科主任
-				homePageVO.setDirectorDoctor(rs.getString("ZRYS"));//主任医师
-				homePageVO.setAttendingDoctor(rs.getString("ZZYS"));//主治医师
-				homePageVO.setBehospitalDoctor(rs.getString("ZYYS"));//住院医师
-				homePageVO.setResponseNurse(rs.getString("ZRHS"));//责任护士
-				homePageVO.setStudyDoctor(rs.getString("JXYS"));//进修医师
-				homePageVO.setPracticeDoctor(rs.getString("SXYS"));//实习医师
-				homePageVO.setEncodeMan(rs.getString("BMY"));//编码员
-				homePageVO.setHomePageQuality(rs.getString("BRBAZL"));//病案质量
-				homePageVO.setQcDoctor(rs.getString("BAZKYS"));//质控医师
-				homePageVO.setQcNurse(rs.getString("BAZKHS"));//质控护士
-				homePageVO.setQcDate(rs.getDate("BAZKRQ"));//质控日期
-				homePageVO.setLeaveHospitalType(rs.getString("BRLYFS"));//离院方式
-				homePageVO.setAcceptOrgCode(rs.getString("ZYJGMC"));//接收机构名称
-				homePageVO.setAgainBehospitalPlan(rs.getString("SSYZZY"));//31天内再住院计划
-				homePageVO.setAgainBehospitalGoal(rs.getString("SSYZZYMD"));//再住院目的
-				homePageVO.setTbiBeforeDay(rs.getString("RYQHMTS"));//颅脑损伤患者昏迷前天数
-				homePageVO.setTbiBeforeHour(rs.getString("RYQHMXS"));//颅脑损伤患者昏迷前小时
-				homePageVO.setTbiBeforeMinute(rs.getString("RYQHMFZ"));//颅脑损伤患者昏迷前分钟
-				homePageVO.setTbiAfterDay(rs.getString("RYQHMFZ"));//颅脑损伤患者昏迷后天数
-				homePageVO.setTbiAfterHour(rs.getString("RYHHMXS"));//颅脑损伤患者昏迷后小时
-				homePageVO.setTbiAfterMinute(rs.getString("RYQHMFZ"));//颅脑损伤患者昏迷后分钟
-				homePageVO.setTotalFee(rs.getString("ZFY"));//总费用
-				homePageVO.setOwnFee(rs.getString("ZFJE"));//自付金额
-				homePageVO.setGeneralFee(rs.getString("YBYLFWF"));//一般医疗服务费
-				homePageVO.setServiceFee(rs.getString("YBZLCZF"));//一般治疗服务费
-				homePageVO.setNurseFee(rs.getString("HLF"));//护理费
-				homePageVO.setOtherFee(rs.getString("QTFY"));//其他费用
-				homePageVO.setPathologyFee(rs.getString("BLZDF"));//病理诊断费
-				homePageVO.setLabFee(rs.getString("SYSZDF"));//实验室诊断费
-				homePageVO.setPacsFee(rs.getString("YXXZDF"));//影像学诊断费
-				homePageVO.setClinicDiagnoseFee(rs.getString("LCZDXMF"));//临床诊断项目费
-				homePageVO.setNotOperationFee(rs.getString("FSSZLXMF"));//非手术治疗项目费
-				homePageVO.setClinicPhysicFee(rs.getString("LCWLZLF"));//临床物理治疗费
-				homePageVO.setOperationTreatFee(rs.getString("SSZLF"));//手术治疗费
-				homePageVO.setAnaesthesiaFee(rs.getString("MZF"));//麻醉费
-				homePageVO.setOperationFee(rs.getString("SSF"));//手术费
-				homePageVO.setHealthTypeFee(rs.getString("KFF"));//康复类
-				homePageVO.setChnTreatFee(rs.getString("ZYZLF"));//中医治疗费
-				homePageVO.setWesternMedFee(rs.getString("XYF"));//西药费
-				homePageVO.setAntibiosisFee(rs.getString("KJYWF"));//抗菌药物费用
-				homePageVO.setChnMedFee(rs.getString("ZCYF"));//中成药费
-				homePageVO.setChnHerbFee(rs.getString("CYF"));//中草药费
-				homePageVO.setBloodFee(rs.getString("XF"));//血费
-				homePageVO.setAlbumenFee(rs.getString("BDBLZPF"));//白蛋白类制品费
-				homePageVO.setGlobulinFee(rs.getString("QDBLZPF"));//球蛋白类制品费
-				homePageVO.setBloodFactorFee(rs.getString("NXYZLZPF"));//凝血因子类制品费
-				homePageVO.setCellFactorFee(rs.getString("XBYZLZPF"));//细胞因子类制品费
-				homePageVO.setCheckMaterialFee(rs.getString("JCYYCXYYCLF"));//检查用一次性医用材料费
-				homePageVO.setTreatMaterialFee(rs.getString("ZLYYCXYYCLF"));//治疗用一次性医用材料费
-				homePageVO.setOperationMaterialFee(rs.getString("SSYYCXYYCLF"));//手术用一次性医用材料费
-				homePageVO.setOtherTypeFee(rs.getString("QTF"));//其他类其他费
-				homePageVO.setSingleDiagManage(rs.getString("DBZGL"));//单病种管理
-				homePageVO.setClinicPathwayManage(rs.getString("SSLCLJGL"));//临床路径管理
-				homePageVO.setIsOutpatientBehospital(rs.getString("MZZYFH"));//门诊与住院
-				homePageVO.setIsLeaveBehospital(rs.getString("RYCYFH"));//入院与出院
-				homePageVO.setIsOperationBeforeAfter(rs.getString("SQSHFH"));//术前与术后
-				homePageVO.setIsClinicPathology(rs.getString("LCBLFH"));//临床与病理
-				homePageVO.setIsRadiatePathology(rs.getString("FSBLFH"));//放射与病理
-				homePageVO.setRescueSuccessNum(rs.getString("BRQJCS"));//病人抢救次数
-				homePageVO.setRescueSuccessNum(rs.getString("QJCGCS"));//病人抢救成功次数
-				homePageVO.setIsAutoLeavehospital(rs.getString("ZDCYPB"));//是否为自动出院
-				homePageVO.setReturnToType(rs.getString("CYQKDM"));//转归情况
-				
-				homePageVO.setGmtCreate(new Date());
-				
-				HomePage homePage=new HomePage();
-				BeanUtil.copyProperties(homePageVO, homePage);
-				homePageList.add(homePage);
-				
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return homePageList;
-	}
-	
-	/**
-	 * 获取病历信息
-	 * @return
-	 */
-	public static List<BehospitalInfo> getBehospitalInfo() {
-		List<BehospitalInfo> behospitalInfoList=Lists.newLinkedList();
-		try {
-			DBConn dbconn=new DBConn();
-			String sql="select * from br_inpatientinfo where CJCXRQ BETWEEN TO_DATE('2020-01-01', 'yyyy-MM-dd') and TO_DATE('2020-01-20', 'yyyy-MM-dd')";
-			ResultSet rs =dbconn.Query(sql, null);
-			while(rs.next()){
-				FBehospitalInfoVO behospitalInfoVO=new FBehospitalInfoVO();
-				behospitalInfoVO.setBehospitalCode(rs.getString("BRZYID"));//病人住院ID
-				behospitalInfoVO.setHospitalId("3");//医院ID
-				behospitalInfoVO.setName(rs.getString("BRDAXM"));//姓名
-				behospitalInfoVO.setSex(rs.getString("BRDAXB"));//性别
-				behospitalInfoVO.setBirthday(rs.getDate("BRCSRQ"));//出生日期
-				behospitalInfoVO.setFileCode(rs.getString("BRDABH"));//档案号
-				behospitalInfoVO.setWardCode(rs.getString("ZYBQID"));//病区编码
-				behospitalInfoVO.setWardName(rs.getString("ZYBQMC"));//病区名称
-				behospitalInfoVO.setBehDeptId(rs.getString("ZYKSID"));//住院科室ID
-				behospitalInfoVO.setBehDeptName(rs.getString("ZYKSMC"));//住院科室名称
-				behospitalInfoVO.setBedCode(rs.getString("ZYCWID"));//床位号
-				behospitalInfoVO.setBedName(rs.getString("ZYCWHM"));//床位名称
-				behospitalInfoVO.setInsuranceName(rs.getString("BRLBID"));//医保类别
-				behospitalInfoVO.setJobType(rs.getString("BRXZID"));//职业
-				behospitalInfoVO.setBehospitalDate(rs.getDate("BRRYRQ"));//入院时间
-				behospitalInfoVO.setLeaveHospitalDate(rs.getDate("BRCYRQ"));//出院时间
-				behospitalInfoVO.setDiagnoseIcd(rs.getString("JBDMID"));//疾病ICD编码
-				behospitalInfoVO.setDiagnose(rs.getString("JBMSXX"));//疾病名称
-				behospitalInfoVO.setDoctorId(rs.getString("ZZYSID"));//医生ID
-				behospitalInfoVO.setDoctorName(rs.getString("ZZYSXM"));//医生姓名
-				
-				behospitalInfoVO.setGmtCreate(new Date());
-				
-				BehospitalInfo behospitalInfo=new BehospitalInfo();
-				BeanUtil.copyProperties(behospitalInfoVO, behospitalInfo);
-				behospitalInfoList.add(behospitalInfo);
-				
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		
-		return behospitalInfoList;
-	}
-	
-	/**
-	 * 从视图中获取医嘱信息
-	 * @return
-	 */
-	public static List<DoctorAdvice> getDoctorAdvice(){
-		List<DoctorAdvice> doctorAdviceList=Lists.newLinkedList();
-		
-		try {
-			DBConn dbconn=new DBConn();
-			String sql="select * from br_doctadvice where CJCXRQ BETWEEN TO_DATE('2020-03-01', 'yyyy-MM-dd') and TO_DATE('2020-03-30', 'yyyy-MM-dd')";
-			ResultSet rs =dbconn.Query(sql, null);
-			while(rs.next()){
-				FDoctorAdviceVO doctorAdviceVO=new FDoctorAdviceVO();
-				doctorAdviceVO.setDoctorAdviceId(rs.getString("BRYZID"));//病人医嘱ID
-				doctorAdviceVO.setHospitalId(Long.valueOf("3"));//医院ID
-				doctorAdviceVO.setBehospitalCode(rs.getString("BRZYID"));//病人ID
-				doctorAdviceVO.setOrderDoctorName(rs.getString("YSKDPB"));//医生开单判别
-				doctorAdviceVO.setFrequency(rs.getString("YZPLPB"));//医嘱频率判别
-				doctorAdviceVO.setParentTypeId(rs.getString("FLYZID"));//父类医嘱ID
-				doctorAdviceVO.setDoctorAdviceType(rs.getString("YZLXPB"));//医嘱类型判别
-				doctorAdviceVO.setUsageNum(rs.getString("YCSYSL"));//一次使用数量
-				doctorAdviceVO.setUsageUnit(rs.getString("YCYLDW"));//一次用量单位
-				doctorAdviceVO.setDose(rs.getString("YZDCJL"));//医嘱单次剂量
-				doctorAdviceVO.setDoseUnit(rs.getString("DCJLDW"));//单次剂量单位
-				doctorAdviceVO.setMedModeType(rs.getString("GYFSID"));//给药方式
-				doctorAdviceVO.setDaFrequency(rs.getString("YZPLID"));//医嘱频率
-				doctorAdviceVO.setDaDealType(rs.getString("YZCLLX"));//医嘱处理类型
-				doctorAdviceVO.setDaStartDate(rs.getDate("YZKSSJ"));//医嘱开始时间
-				doctorAdviceVO.setDaItemName(rs.getString("YZXMMC"));//医嘱项目名称
-				doctorAdviceVO.setDaStatus(rs.getString("YZZTPB"));//医嘱状态判别
-				doctorAdviceVO.setDaStopDate(rs.getDate("YZJSSJ"));//医嘱结束时间
-				doctorAdviceVO.setDaGroupNo(rs.getString("YZTZXH"));//医嘱同组序号
-				doctorAdviceVO.setDaPrescriptionType(rs.getString("YZCFLX"));//医嘱处方类型
-				doctorAdviceVO.setDaMedType(rs.getString("YZLYLX"));//医嘱领药类型
-				doctorAdviceVO.setDoctorNotice(rs.getString("YSZTSM"));//医生嘱托
-				doctorAdviceVO.setDoctorId(rs.getString("KDYSID"));//开单医生ID
-				doctorAdviceVO.setDoctorName(rs.getString("KDYSXM"));//开单医生姓名
-				
-				//doctorAdviceVO.set
-				
-				DoctorAdvice doctorAdvice=new DoctorAdvice();
-				BeanUtil.copyProperties(doctorAdviceVO, doctorAdvice);
-				
-				doctorAdviceList.add(doctorAdvice);
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return doctorAdviceList;
-	}
-
-	/**
-	 * 从视图中获取文书类型
-	 * @return
-	 */
-	public static List<MedicalRecord> getMedicalRecord(){
-		List<FMedicalRecordVO> medicalRecordVOList=Lists.newLinkedList();
-		try {
-			DBConn dbconn=new DBConn();
-			String sql="select * from ar_medirecclass where CJCXRQ BETWEEN TO_DATE('2020-02-01', 'yyyy-MM-dd') and TO_DATE('2020-04-30', 'yyyy-MM-dd')";
-			ResultSet rs =dbconn.Query(sql, null);
-			while(rs.next()){
-				FMedicalRecordVO medicalRecordVO=new FMedicalRecordVO();
-				medicalRecordVO.setRecId(rs.getString("BLCJID"));
-				medicalRecordVO.setHospitalId(Long.valueOf("3"));//医院ID
-				medicalRecordVO.setBehospitalCode(rs.getString("BRZYID"));//病人住院ID
-				medicalRecordVO.setOrgCode(rs.getString("ZZJGDM"));//组织机构代码
-				medicalRecordVO.setRecTypeId(rs.getString("BLLBID"));//病历类别编号
-				medicalRecordVO.setRecDate(rs.getString("BCJLSJ"));//病历日期
-				medicalRecordVO.setRecTitle(rs.getString("BLJLMC"));//病历标题
-				
-				medicalRecordVO.setGmtCreate(new Date());
-				
-				medicalRecordVOList.add(medicalRecordVO);
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		
-		List<MedicalRecord> medicalRecordList=BeanUtil.listCopyTo(medicalRecordVOList, MedicalRecord.class);
-		return medicalRecordList;
-	}
-	
-	/**
-	 * 从视图中获取文书内容
-	 * @return
-	 */
-	public static List<MedicalRecordContent> getMedicalRecordContent(){
-		List<FMedicalRecordContentVO> mrContentVOList=Lists.newLinkedList();
-		try {
-			DBConn dbconn=new DBConn();
-			String sql="select * from mr_mrcontent where CJCXRQ BETWEEN TO_DATE('2020-02-01', 'yyyy-MM-dd') and TO_DATE('2020-02-20', 'yyyy-MM-dd')";
-			ResultSet rs =dbconn.Query(sql, null);
-			while(rs.next()){
-				FMedicalRecordContentVO mrContentVO=new FMedicalRecordContentVO();
-				//oracle.sql.BLOB blob = (oracle.sql.BLOB)rs.getBlob("BLJLNR");
-				//mrContentVO.setContentBlob(blob);
-				mrContentVO.setHospitalId(Long.valueOf("3"));
-				mrContentVO.setRecId(rs.getString("BLJLID"));
-				
-				mrContentVO.setGmtCreate(new Date());
-				mrContentVOList.add(mrContentVO);
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		List<MedicalRecordContent> mrContentList=BeanUtil.listCopyTo(mrContentVOList, MedicalRecordContent.class);
-		return mrContentList;
-	}
-	
-	/**
-	 * 从视图中获取文书类型
-	 * @return
-	 */
-	public static List<MedRecordType> getMedicalRecordType(){
-		List<FMedicalRecordTypeVO> mrTypeVOList=Lists.newLinkedList();
-		try {
-			DBConn dbconn=new DBConn();
-			String sql="select * from ar_medirecclass where CJCXRQ BETWEEN TO_DATE('2020-02-01', 'yyyy-MM-dd') and TO_DATE('2020-02-20', 'yyyy-MM-dd')";
-			ResultSet rs =dbconn.Query(sql, null);
-			while(rs.next()){
-				FMedicalRecordTypeVO mrTypeVO=new FMedicalRecordTypeVO();
-				mrTypeVO.setTypeId(rs.getString("BLLBID"));
-				mrTypeVO.setHospitalId(Long.valueOf("3"));
-				mrTypeVO.setTypeName(rs.getString("BLLBMC"));
-				mrTypeVO.setParentTypeId(rs.getString("SJLBID"));
-				mrTypeVO.setObjName(rs.getString("BLLBFW"));
-				mrTypeVO.setSpell(rs.getString("HZSRM1"));
-				mrTypeVOList.add(mrTypeVO);
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		
-		List<MedRecordType> medicalRecordTypeList=BeanUtil.listCopyTo(mrTypeVOList, MedRecordType.class);
-		return medicalRecordTypeList;
+	public static void main(String[] args) {
+		TZDBConn dbconn=new TZDBConn();
+		String sql="select * from hi_deptinfo where CJCXRQ BETWEEN TO_DATE('2020-03-01', 'yyyy-MM-dd') and TO_DATE('2020-03-30', 'yyyy-MM-dd')";
+		ResultSet rs =dbconn.Query(sql, null);
 	}
 	
 }

src/main/java/com/diagbot/web/DataController.java

@@ -1,115 +1,13 @@
 package com.diagbot.web;
-
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.diagbot.annotation.SysLogger;
-import com.diagbot.dto.FBehospitalInfoDTO;
-import com.diagbot.dto.FDoctorAdviceDTO;
-import com.diagbot.dto.FHomeDiagnoseDTO;
-import com.diagbot.dto.FHomePageDTO;
-import com.diagbot.dto.FMedicalRecordContentDTO;
-import com.diagbot.dto.FMedicalRecordDTO;
-import com.diagbot.dto.FMedicalRecordTypeDTO;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.entity.BehospitalInfo;
-import com.diagbot.entity.DoctorAdvice;
-import com.diagbot.entity.HomeDiagnoseInfo;
-import com.diagbot.entity.HomeOperationInfo;
-import com.diagbot.entity.HomePage;
-import com.diagbot.entity.MedRecordType;
-import com.diagbot.entity.MedicalRecord;
-import com.diagbot.entity.MedicalRecordContent;
-import com.diagbot.facade.DataFacade;
-import com.diagbot.util.BeanUtil;
 
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 
 @RestController
 @RequestMapping("/qc/data")
 @Api(value = "病案首页API", tags = { "病案首页API" })
-@SuppressWarnings("unchecked")
 public class DataController {
 
-	@Autowired
-    private DataFacade dataFacade;
-	
-	@ApiOperation(value = "获取医院病案首页信息[by:gaodm]",notes = "")
-	@PostMapping("/initData")
-	@SysLogger("initData")
-	public RespDTO<Boolean> initData() {
-		//return RespDTO.onSuc(dataFacade.initData());
-		return null;
-	}
-	
-	@ApiOperation(value = "获取医院病案首页信息[by:gaodm]",notes = "")
-	@PostMapping("/getHomePage")
-	@SysLogger("getHomePage")
-	public RespDTO<Boolean> getHomePage(List<FHomePageDTO> homePageDTOList) {
-		List<HomePage> homePageList=BeanUtil.listCopyTo(homePageDTOList, HomePage.class);
-		return RespDTO.onSuc(dataFacade.addHomePage(homePageList));
-	}
-	
-	@ApiOperation(value = "获取病案手术信息[by:gaodm]",notes = "")
-	@PostMapping("/getHomeOperation")
-	@SysLogger("getHomeOperation")
-	public RespDTO<Boolean> getHomeOperation(List<FHomeDiagnoseDTO> homeOperationDTO) {
-		List<HomeOperationInfo> homeOperationList=BeanUtil.listCopyTo(homeOperationDTO, HomeOperationInfo.class);
-		return RespDTO.onSuc(dataFacade.addHomeOperation(homeOperationList));
-	}
-	
-	@ApiOperation(value = "获取病案诊断信息[by:gaodm]",notes = "")
-	@PostMapping("/getHomeDiagnose")
-	@SysLogger("getHomeDiagnose")
-	public RespDTO<Boolean> getHomeDiagnose(List<FHomeDiagnoseDTO> homeDiagnoseDTOList) {
-		List<HomeDiagnoseInfo> homeDiagnoseList=BeanUtil.listCopyTo(homeDiagnoseDTOList, HomeDiagnoseInfo.class);
-		return RespDTO.onSuc(dataFacade.addHomeDiagnose(homeDiagnoseList));
-	}
-	
-	@ApiOperation(value = "获取文书类型信息[by:]",notes = "")
-	@PostMapping("/getMedicalRecordType")
-	@SysLogger("getMedicalRecordType")
-	public RespDTO<Boolean> getMedicalRecordType(List<FMedicalRecordTypeDTO> medlRecordTypeDTOList) {
-		List<MedRecordType> medlRecordTypeList=BeanUtil.listCopyTo(medlRecordTypeDTOList, MedRecordType.class);
-		return RespDTO.onSuc(dataFacade.addMedicalRecordType(medlRecordTypeList));
-	}
-	
-	
-	@ApiOperation(value = "获取文书内容信息[by:gaodm]",notes = "")
-	@PostMapping("/getMedicalRecordContent")
-	@SysLogger("getMedicalRecordContent")
-	public RespDTO<Boolean> getMedicalRecordContent(List<FMedicalRecordContentDTO> medlRecordContentDTOList) {
-		List<MedicalRecordContent> medicalRecordContentList=BeanUtil.listCopyTo(medlRecordContentDTOList, MedicalRecordContent.class);
-		return RespDTO.onSuc(dataFacade.addMedicalRecordContent(medicalRecordContentList));
-	}
-
-	@ApiOperation(value = "获取文书基本信息[by:gaodm]",notes = "")
-	@PostMapping("/getMedicalRecord")
-	@SysLogger("getMedicalRecord")
-	public RespDTO<Boolean> getMedicalRecord(List<FMedicalRecordDTO> medicalRecordDTOList) {
-		List<MedicalRecord> medicalRecordList=BeanUtil.listCopyTo(medicalRecordDTOList, MedicalRecord.class);
-		return RespDTO.onSuc(dataFacade.addMedicalRecord(medicalRecordList));
-	}
-	
-	@ApiOperation(value = "获取医院医嘱信息[by:gaodm]",notes = "")
-	@PostMapping("/getDoctorAdvice")
-	@SysLogger("getDoctorAdvice")
-	public RespDTO<Boolean> getDoctorAdvice(List<FDoctorAdviceDTO> doctorAdviceDTOList) {
-		List<DoctorAdvice> doctorAdviceList=BeanUtil.listCopyTo(doctorAdviceDTOList, DoctorAdvice.class);
-		return RespDTO.onSuc(dataFacade.addDoctorAdvice(doctorAdviceList));
-	}
-	
-	@ApiOperation(value = "获取病历信息[by:gaodm]",notes = "")
-	@PostMapping("/getBehospitalInfo")
-	@SysLogger("getBehospitalInfo")
-	public RespDTO<Boolean> getBehospitalInfo(List<FBehospitalInfoDTO> behospitalInfoDTOList) {
-		List<BehospitalInfo> behospitalInfoList=BeanUtil.listCopyTo(behospitalInfoDTOList, BehospitalInfo.class);
-		return RespDTO.onSuc(dataFacade.addBehospitalInfo(behospitalInfoList));
-	}
-	
 }

src/main/resources/jdbc.properties

@@ -10,7 +10,7 @@
 #jdbc.password=ETRACKMRQC
 
 jdbc.driverClassName=com.microsoft.sqlserver.jdbc.SQLServerDriver
-idbc.url=jdbc:sqlserver://192.168.100.39\tzmhemr:1433;DatabaseName=bigemr
+jdbc.url=jdbc:sqlserver://192.168.100.39/tzmhemr;DatabaseName=bigemr
 jdbc.username=zjlt
 jdbc.password=ETRACKMRQC