版本更新，调整

src/main/java/com/diagbot/service/impl/BasDoctorInfoServiceImpl.java

@@ -25,8 +25,5 @@ public class BasDoctorInfoServiceImpl extends ServiceImpl<BasDoctorInfoMapper, B
     public void updateBatchByKey(List<BasDoctorInfo> list){
         this.baseMapper.updateBatchByKey(list);
     }
-  <<<<<<< HEAD
-=======
 
->>>>>>> master
 }

src/main/java/com/diagbot/task/BasDeptInfoTask.java

@@ -47,11 +47,7 @@ public class BasDeptInfoTask implements SchedulingConfigurer{
                         && task001.getIsDeleted().equals(IsDeleteEnum.N.getKey())
                         && task001.getIsUsed().equals(1)) {
                     log.info("执行动态定时任务: " + LocalDateTime.now().toLocalTime());
-<<<<<<< HEAD
                     aBasDeptInfoFacade.executeDept();
-=======
-                    //aBasDeptInfoFacade.executeDept();
->>>>>>> master
                 }
             }
         }, new Trigger() {

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

@@ -256,265 +256,139 @@ public class TZDBConn {
 			TZDBConn dbconn=new TZDBConn();
 			ResultSet rs =dbconn.Query(sql, null);
 			while(rs.next()){
-				HomePage homePageVO=new HomePage();
-				homePageVO.setHomePageId(rs.getString("BASYID"));//病案首页ID
-				homePageVO.setHospitalId(HOSPITAL_ID);//医院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"));//出生日期
-				if(StringUtil.isNotBlank(rs.getString("BRDQNL"))){
-				homePageVO.setAge(rs.getString("BRDQNL").equals("-")?null: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"));//质控护士
-				if(!"".equals(rs.getString("BAZKRQ"))){
-					homePageVO.setQcDate(DateUtil.parseDate(rs.getString("BAZKRQ"),DateUtil.DATE_TIME_FORMAT));//质控日期
-				}
-				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"));//转归情况HomePage homePageVO=new HomePage();
-				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.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"));//质控护士
-				if(!"".equals(rs.getString("BAZKRQ"))){
-					homePageVO.setQcDate(DateUtil.parseDate(rs.getString("BAZKRQ"),DateUtil.DATE_TIME_FORMAT));//质控日期
-				}
-				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"));//转归情况
+                HomePage homePageVO=new HomePage();
+                homePageVO.setHomePageId(rs.getString("BASYID"));//病案首页ID
+                homePageVO.setHospitalId(HOSPITAL_ID);//医院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"));//出生日期
+                if(StringUtil.isNotBlank(rs.getString("BRDQNL"))){
+                    homePageVO.setAge(rs.getString("BRDQNL").equals("-")?null: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"));//质控护士
+                if(!"".equals(rs.getString("BAZKRQ"))){
+                    homePageVO.setQcDate(DateUtil.parseDate(rs.getString("BAZKRQ"),DateUtil.DATE_TIME_FORMAT));//质控日期
+                }
+                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"));//转归情况HomePage homePageVO=new HomePage();
 
-				homePageList.add(homePageVO);
+                homePageList.add(homePageVO);
 				
 			}
 		} catch (Exception e) {