七院质控

src/main/java/com/diagbot/config/ResourceServerConfigurer.java

@@ -164,6 +164,7 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/qc/data/getColumnZhAndCh").permitAll()
                 .antMatchers("/qc/data/analyseRec").permitAll()
                 .antMatchers("/qc/data/hisDataDeal").permitAll()
+                .antMatchers("/qc/data/sendDataDeal").permitAll()
                 .antMatchers("/qc/data_str/sendAdmissionNote").permitAll()
                 .antMatchers("/qc/data_str/sendBloodResult").permitAll()
                 .antMatchers("/qc/data_str/sendBloodTransfusion").permitAll()

src/main/java/com/diagbot/config/security/UrlAccessDecisionManager.java

@@ -208,6 +208,7 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/qc/data/getColumnZhAndCh", request)
                 || matchers("/qc/data/analyseRec", request)
                 || matchers("/qc/data/hisDataDeal", request)
+                || matchers("/qc/data/sendDataDeal", request)
                 || matchers("/qc/data_str/sendAdmissionNote", request)
                 || matchers("/qc/data_str/sendBloodResult", request)
                 || matchers("/qc/data_str/sendBloodTransfusion", request)

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

@@ -38,7 +38,7 @@ import com.diagbot.vo.TaskVO;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 
-import mapper.QcModelHospitalFacade;
+
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/resources/mapper/QcModelHospitalFacade.java

@@ -1,4 +1,4 @@
-package mapper;
+package com.diagbot.facade;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.entity.QcModelHospital;

src/main/java/com/diagbot/facade/data/ADoctorAdviceFacade.java

@@ -56,6 +56,10 @@ public class ADoctorAdviceFacade extends DoctorAdviceServiceImpl{
      * @return
      */
     public RespDTO executeDoctorAdvice(List<ADoctorAdviceVO> list) {
+
+
+
+
         try {
             if(list!=null && list.size()>0){
                 //循环验证数据有效性

src/main/java/com/diagbot/facade/data/AHomePageFacade.java

@@ -134,7 +134,18 @@ public class AHomePageFacade extends HomePageServiceImpl{
                 //初始化入参
                 HomePage homePage=new HomePage();
                 BeanUtil.copyProperties(s,homePage);
-                homePage.setBirthday(DateUtil.parseDate(s.getBirthday()));
+                if (StringUtil.isNotEmpty(s.getBirthday())){
+                    homePage.setBirthday(DateUtil.parseDate(s.getBirthday()));
+                }
+                if (StringUtil.isNotEmpty(s.getBehospitalDate())){
+                    homePage.setBehospitalDate(DateUtil.parseDateTime(s.getBehospitalDate()));
+                }
+                if (StringUtil.isNotEmpty(s.getLeaveHospitalDate())){
+                    homePage.setLeaveHospitalDate(DateUtil.parseDateTime(s.getLeaveHospitalDate()));
+                }
+                if (StringUtil.isNotEmpty(s.getQcDate())){
+                    homePage.setQcDate(DateUtil.parseDateTime(s.getQcDate()));
+                }
                 homePageList.add(homePage);
 
                 //初始化诊断和手术，并同步到数据库

src/main/java/com/diagbot/facade/data/AMedicalRecordFacade.java

@@ -275,8 +275,6 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
                     return RespDTO.onError("请输入病历类别编号!");
                 } else if ("".equals(aMedicalRecordVO.getRecTitle())) {
                     return RespDTO.onError("请输入病历标题!");
-                } else if (aMedicalRecordVO.getContents() == null || aMedicalRecordVO.getContents().size() == 0) {
-                    return RespDTO.onError("请输入文书详情!");
                 }
             }
             //更新文书信息

src/main/java/com/diagbot/facade/data/SendDataDealFacade.java

@@ -0,0 +1,157 @@
+package com.diagbot.facade.data;
+
+
+import com.alibaba.fastjson.JSON;
+import com.diagbot.entity.*;
+import com.diagbot.util.TZDBConn;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Component
+public class SendDataDealFacade {
+
+    @Autowired
+    private ADoctorAdviceFacade aDoctorAdviceFacade;
+    @Autowired
+    private AHomePageFacade aHomePageFacade;
+    @Autowired
+    private AHomeOperationInfoFacade aHomeOperationInfoFacade;
+    @Autowired
+    private AHomeDiagnoseInfoFacade aHomeDiagnoseInfoFacade;
+    @Autowired
+    private ABehospitalInfoFacade aBehospitalInfoFacade;
+    @Autowired
+    private AMedicalRecordContentFacade aMedicalRecordContentFacade;
+    @Autowired
+    private AMedicalRecordFacade aMedicalRecordFacade;
+    @Autowired
+    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
+
+    private TZDBConn tzDBConn = new TZDBConn();
+
+
+
+
+    public void sendDataDeal(String startDate,String stopDate){
+        //根据时间得到历史病人登记数据
+        List<BehospitalInfo> behospitalInfoList =sendDataDealABehospitalInfo(startDate,stopDate);
+        //根据的到的病人登记数据来获取病人的其他信息
+        if (behospitalInfoList.size()>0){
+            behospitalInfoList.forEach(s->{
+                sendDataDealADoctorAdvice(s.getBehospitalCode());
+                sendDataDealAMedicalRecord(s.getBehospitalCode());
+//                sendDataDealAHomePage(s.getBehospitalCode());
+//                sendDataDealAHomeDiagnoseInfo(s.getBehospitalCode());
+//                sendDataDealAHomeOperationInfo(s.getBehospitalCode());
+            });
+        }else {
+            System.out.println("没有该时间点的病人登记信息");
+        }
+
+    }
+
+
+
+
+    /**
+     * 获取病人住院登记历史数据
+     */
+    public List<BehospitalInfo> sendDataDealABehospitalInfo(String startDate,String stopDate) {
+        List<BehospitalInfo> behospitalInfos =new ArrayList<>();
+        try {
+            String sql = "select * from   登记视图 t where t.";
+            behospitalInfos = tzDBConn.getBehospitalInfo(sql);
+            aBehospitalInfoFacade.execute(behospitalInfos);
+        } catch (Exception e) {
+            aMedAbnormalInfoFacade.saveAbnormalInfo("获取病人住院登记历史数据", startDate+"--"+stopDate, "", "", e.getMessage());
+        }
+        return behospitalInfos;
+    }
+
+    /**
+     * 获取医嘱历史数据
+     */
+    public void sendDataDealADoctorAdvice(String behospitalCode) {
+        try {
+            String sql = "select * from   医嘱视图  where BEHOSPITALCODE= '"+behospitalCode+" '";
+            List<DoctorAdvice> doctorAdviceList = tzDBConn.getDoctorAdvice(sql);
+            aDoctorAdviceFacade.execute(doctorAdviceList);
+        } catch (Exception e) {
+            aMedAbnormalInfoFacade.saveAbnormalInfo("获取医嘱历史数据", behospitalCode, "", "", e.getMessage());
+        }
+
+    }
+
+    /**
+     * 获取文书历史数据
+     */
+    public void sendDataDealAMedicalRecord(String behospitalCode) {
+        try {
+            String sql = "select * from  文书信息视图   where BEHOSPITALCODE= '"+behospitalCode+" '";
+            List<MedicalRecord> medicalRecords = tzDBConn.getMedicalRecord(sql);
+            aMedicalRecordFacade.execute(medicalRecords);
+            medicalRecords.forEach(medicalRecord -> {
+                sendDataDealAMedicalRecordContent(medicalRecord.getRecId());
+            });
+        } catch (Exception e) {
+            aMedAbnormalInfoFacade.saveAbnormalInfo("获取文书历史数据", behospitalCode, "", "", e.getMessage());
+        }
+    }
+
+    /**
+     * 获取文书详情历史数据
+     */
+    public void sendDataDealAMedicalRecordContent(String recId) {
+        try {
+            String sql = "select RECID,XMLTEXT from v_jkcdss_bl_bingli where RECID= '"+recId+" '";
+            List<MedicalRecordContent> medicalRecordContents = tzDBConn.getMedicalRecordContent(sql);
+            aMedicalRecordContentFacade.execute(medicalRecordContents);
+        } catch (Exception e) {
+            aMedAbnormalInfoFacade.saveAbnormalInfo("获取文书详情历史数据", recId, "", "", e.getMessage());
+        }
+    }
+
+    /**
+     * 获取病案首页历史数据
+     */
+    public void sendDataDealAHomePage(String behospitalCode) {
+        try {
+            String sql = "";
+            List<HomePage> homePages = tzDBConn.getHomePage(sql);
+            aHomePageFacade.execute(homePages);
+        } catch (Exception e) {
+            aMedAbnormalInfoFacade.saveAbnormalInfo("获取病案首页历史数据", behospitalCode, "", "", e.getMessage());
+        }
+    }
+
+    /**
+     * 获取病案首页医嘱历史数据
+     */
+    public void sendDataDealAHomeDiagnoseInfo(String behospitalCode) {
+        try {
+            String sql = "";
+            List<HomeDiagnoseInfo> homeDiagnoseInfoFacades = tzDBConn.getHomeDiagnose(sql);
+            aHomeDiagnoseInfoFacade.execute(homeDiagnoseInfoFacades);
+        } catch (Exception e) {
+            aMedAbnormalInfoFacade.saveAbnormalInfo("获取病案首页医嘱历史数据", behospitalCode, "", "", e.getMessage());
+        }
+    }
+
+    /**
+     * 获取病案首页手术及操作历史数据
+     */
+    public void sendDataDealAHomeOperationInfo(String behospitalCode) {
+        try {
+            String sql = "";
+            List<HomeOperationInfo> homeOperationInfos = tzDBConn.getHomeOperation(sql);
+            aHomeOperationInfoFacade.execute(homeOperationInfos);
+        } catch (Exception e) {
+            aMedAbnormalInfoFacade.saveAbnormalInfo("获取病案首页手术及操作历史数据", behospitalCode, "", "", e.getMessage());
+        }
+    }
+
+
+}

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

@@ -13,7 +13,7 @@ public class TZDBConn {
     private static final String USERNAME = getValue("jdbc.username");
     private static final String PASSWORD = getValue("jdbc.password");
 
-	public static final Long HOSPITAL_ID=Long.valueOf("3");//1:长兴，2：邵逸夫，3：台州市立医院
+	public static final Long HOSPITAL_ID=Long.valueOf("14");//1:长兴，2：邵逸夫，3：台州市立医院
     
     private static Connection connection = null;
     private static PreparedStatement sta = null;
@@ -171,17 +171,16 @@ public class TZDBConn {
 			ResultSet rs =dbconn.Query(sql, null);
 			while(rs.next()){
 				HomeDiagnoseInfo homeDiagnose=new HomeDiagnoseInfo();
-				homeDiagnose.setHomePageId(rs.getString("BASYID"));//病案首页ID
+				homeDiagnose.setHomePageId(rs.getString("homePageId"));//病案首页ID
 				homeDiagnose.setHospitalId(HOSPITAL_ID);//医院ID
-				homeDiagnose.setDiagnoseOrderNo(rs.getString("BAZDXH"));//诊断序号
-				homeDiagnose.setDiagnoseName(rs.getString("ZDJBMC"));//诊断名称
-				homeDiagnose.setDiagnoseType(rs.getString("ZDLBDM"));//诊断类别
-				homeDiagnose.setDiagnoseTypeShort(rs.getString("ZCZDPB"));//诊断判别
-				homeDiagnose.setBehospitalType(rs.getString("RYQKBM"));//入院情况
-				//homeDiagnoseVO.setLeaveHospitalType(rs.getString("RYQKBM"));//出院情况
-				//homeDiagnoseVO.setPathologyDiagnose(rs.getString("BASYID"));//病理号
-				homeDiagnose.setIcdCode(rs.getString("ICDM"));//诊断编码
-
+				homeDiagnose.setDiagnoseOrderNo(rs.getString("diagnoseOrderNo"));//诊断序号
+				homeDiagnose.setDiagnoseName(rs.getString("diagnoseType"));//诊断名称
+				homeDiagnose.setDiagnoseType(rs.getString("diagnoseTypeShort"));//诊断类别
+				homeDiagnose.setDiagnoseTypeShort(rs.getString("diagnoseName"));//诊断判别
+				homeDiagnose.setBehospitalType(rs.getString("behospitalType"));//入院情况
+				homeDiagnose.setLeaveHospitalType(rs.getString("leaveHospitalType"));//出院情况
+				homeDiagnose.setPathologyDiagnose(rs.getString("pathologyDiagnose"));//病理号
+				homeDiagnose.setIcdCode(rs.getString("icdCode"));//诊断编码
 				homeDiagnoseVOList.add(homeDiagnose);
 			}
 		} catch (Exception e) {
@@ -204,21 +203,21 @@ public class TZDBConn {
 			ResultSet rs =dbconn.Query(sql, null);
 			while(rs.next()){
 				HomeOperationInfo homeOperationVO=new HomeOperationInfo();
-				homeOperationVO.setHomePageId(rs.getString("BASYID"));//病案首页ID
+				homeOperationVO.setHomePageId(rs.getString("homePageId"));//病案首页ID
 				homeOperationVO.setHospitalId(HOSPITAL_ID);//医院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.setOperationOrderNo(rs.getString("operationOrderNo"));//手术序号
+				homeOperationVO.setOperationDate(rs.getDate("operationDate"));//手术日期
+				homeOperationVO.setOperationCode(rs.getString("operationCode"));//手术编码
+				homeOperationVO.setOperationDoctorId(rs.getString("operationDoctorId"));//手术医生
+				homeOperationVO.setFirstAssistantId(rs.getString("firstAssistantId"));//一助医生
+				homeOperationVO.setSecondAssistantId(rs.getString("secondAssistantId"));//二助医生
+				homeOperationVO.setCutLevel(rs.getString("cutLevel"));//切口等级
+				homeOperationVO.setHealingLevel(rs.getString("healingLevel"));//愈合等级
+				homeOperationVO.setOperationName(rs.getString("operationName"));//手术名称
+				homeOperationVO.setOperationLevel(rs.getString("operationLevel"));//手术级别
+				homeOperationVO.setAnaesthesiaName(rs.getString("anaesthesiaName"));//麻醉方式
+				homeOperationVO.setAnaesthesiaDoctor(rs.getString("anaesthesiaDoctor"));//麻醉医师
+				homeOperationVO.setShamOperationName(rs.getString("shamOperationName"));//拟手术名称
 				homeOperationVOList.add(homeOperationVO);
 			}
 		} catch (Exception e) {
@@ -241,265 +240,135 @@ public class TZDBConn {
 			ResultSet rs =dbconn.Query(sql, null);
 			while(rs.next()){
 				HomePage homePageVO=new HomePage();
-				homePageVO.setHomePageId(rs.getString("BASYID"));//病案首页ID
+				homePageVO.setHomePageId(rs.getString("homePageId"));//病案首页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"));//出生日期
-				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.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"));//质控护士
-				if(!"".equals(rs.getString("BAZKRQ"))){
-					homePageVO.setQcDate(DateUtil.parseDate(rs.getString("BAZKRQ"),DateUtil.DATE_TIME_FORMAT));//质控日期
+				homePageVO.setBehospitalCode(rs.getString("behospitalCode"));//病人住院序号
+				homePageVO.setHospitalCode(rs.getString("hospitalCode"));//组织机构id
+				homePageVO.setHospitalName(rs.getString("hospitalName"));//医疗机构名称
+				homePageVO.setOrgCode(rs.getString("orgCode"));//医疗机构代码
+				homePageVO.setPayType(rs.getString("payType"));//医疗付费方式
+				homePageVO.setHealthCard(rs.getString("healthCard"));//健康卡号
+				homePageVO.setBehospitalNum(rs.getString("behospitalNum"));//住院次数
+				homePageVO.setFileCode(rs.getString("fileCode"));//病案号
+				homePageVO.setName(rs.getString("name"));//姓名
+				homePageVO.setSex(rs.getString("sex"));//性别
+				homePageVO.setBirthday(rs.getDate("birthday"));//出生日期
+				homePageVO.setAge(rs.getString("age").equals("-")?null:rs.getString("BRDQNL"));//病人年龄
+				homePageVO.setAgeUnit(rs.getString("ageUnit"));//年龄单位
+				homePageVO.setNationality(rs.getString("nationality"));//国籍
+				homePageVO.setNewbornMonth(rs.getString("newbornMonth"));//新生儿出生月数
+				homePageVO.setNewbornDay(rs.getString("newbornDay"));//新生儿出生天数
+				homePageVO.setNewbornWeight(rs.getString("newbornWeight"));//新生儿出生体重
+				homePageVO.setNewbornBehospitalWeight(rs.getString("newbornBehospitalWeight"));//新生儿入院体重
+				homePageVO.setBornAddress(rs.getString("bornAddress"));//出生地
+				homePageVO.setBornPlace(rs.getString("bornPlace"));//籍贯
+				homePageVO.setNation(rs.getString("nation"));//民族
+				homePageVO.setIdentityCardNo(rs.getString("identityCardNo"));//身份证号
+				homePageVO.setJobType(rs.getString("jobType"));//职业
+				homePageVO.setMarriage(rs.getString("marriage"));//婚姻
+				homePageVO.setCurAddress(rs.getString("curAddress"));//现住址
+				homePageVO.setCurPhone(rs.getString("curPhone"));//现住址电话
+				homePageVO.setCurPostCode(rs.getString("curPostCode"));//现住址邮编
+				homePageVO.setResidenceAddress(rs.getString("residenceAddress"));//户口地址
+				homePageVO.setResidencePostCode(rs.getString("residencePostCode"));//户口地址邮编
+				homePageVO.setWorkAddress(rs.getString("workAddress"));//工作单位
+				homePageVO.setWorkPhone(rs.getString("workPhone"));//工作单位电话
+				homePageVO.setWorkPostCode(rs.getString("workPostCode"));//工作单位邮编
+				homePageVO.setContactName(rs.getString("contactName"));//联系人姓名
+				homePageVO.setContactRelation(rs.getString("contactRelation"));//联系人关系
+				homePageVO.setContactAddress(rs.getString("contactAddress"));//联系人地址
+				homePageVO.setContactPhone(rs.getString("contactPhone"));//联系人电话
+				homePageVO.setBehospitalWay(rs.getString("behospitalWay"));//入院途径
+				homePageVO.setBehospitalDate(rs.getDate("behospitalDate"));//入院时间
+				homePageVO.setBehospitalDept(rs.getString("behospitalDept"));//入院科室
+				homePageVO.setBehospitalWard(rs.getString("behospitalWard"));//入院病房
+				homePageVO.setBehospitalBedId(rs.getString("behospitalBedId"));//入院床位序号
+				homePageVO.setBehospitalBedCode(rs.getString("behospitalBedCode"));//入院床位号码
+				homePageVO.setChangeDept(rs.getString("changeDept"));//转科科别
+				homePageVO.setLeaveHospitalDate(rs.getDate("leaveHospitalDate"));//出院时间
+				homePageVO.setLeaveHospitalDept(rs.getString("leaveHospitalDept"));//出院科别
+				homePageVO.setLeaveHospitalWard(rs.getString("leaveHospitalWard"));//出院病房
+				homePageVO.setLeaveHospitalBedId(rs.getString("leaveHospitalBedId"));//出院床位序号
+				homePageVO.setLeaveHospitalBedCode(rs.getString("leaveHospitalBedCode"));//出院床位号码
+				homePageVO.setBehospitalDayNum(rs.getString("behospitalDayNum"));//实际住院天数
+				homePageVO.setOutpatientEmrDiagnose(rs.getString("outpatientEmrDiagnose"));//门急诊诊断
+				homePageVO.setOutpatientEmrDiagnoseCode(rs.getString("outpatientEmrDiagnoseCode"));//门急诊诊断编码
+				homePageVO.setPoisonFactor(rs.getString("poisonFactor"));//损伤中毒因素
+				homePageVO.setPoisonFactorCode(rs.getString("poisonFactorCode"));//损伤中毒因素编码
+				homePageVO.setPathologyDiagnose(rs.getString("pathologyDiagnose"));//病理诊断
+				homePageVO.setPathologyDiagnoseCode(rs.getString("pathologyDiagnoseCode"));//病理诊断编码
+				homePageVO.setPathologyDiagnoseId(rs.getString("pathologyDiagnoseId"));//病理诊断编号
+				homePageVO.setIsMedAllergy(rs.getString("isMedAllergy"));//药物过敏
+				homePageVO.setMedAllergyName(rs.getString("medAllergyName"));//过敏药物
+				homePageVO.setAutopsy(rs.getString("autopsy"));//死亡患者尸检
+				homePageVO.setBloodType(rs.getString("bloodType"));//血型
+				homePageVO.setRh(rs.getString("rh"));//Rh
+				homePageVO.setDeptDirector(rs.getString("deptDirector"));//科主任
+				homePageVO.setDirectorDoctor(rs.getString("directorDoctor"));//主任医师
+				homePageVO.setAttendingDoctor(rs.getString("attendingDoctor"));//主治医师
+				homePageVO.setBehospitalDoctor(rs.getString("behospitalDoctor"));//住院医师
+				homePageVO.setResponseNurse(rs.getString("responseNurse"));//责任护士
+				homePageVO.setStudyDoctor(rs.getString("studyDoctor"));//进修医师
+				homePageVO.setPracticeDoctor(rs.getString("practiceDoctor"));//实习医师
+				homePageVO.setEncodeMan(rs.getString("encodeMan"));//编码员
+				homePageVO.setHomePageQuality(rs.getString("homePageQuality"));//病案质量
+				homePageVO.setQcDoctor(rs.getString("qcDoctor"));//质控医师
+				homePageVO.setQcNurse(rs.getString("qcNurse"));//质控护士
+				if(!"".equals(rs.getString("qcDate"))){
+					homePageVO.setQcDate(DateUtil.parseDate(rs.getString("qcDate"),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"));//转归情况
-
+				homePageVO.setLeaveHospitalType(rs.getString("leaveHospitalType"));//离院方式
+				homePageVO.setAcceptOrgCode(rs.getString("acceptOrgCode"));//接收机构名称
+				homePageVO.setAgainBehospitalPlan(rs.getString("againBehospitalPlan"));//31天内再住院计划
+				homePageVO.setAgainBehospitalGoal(rs.getString("againBehospitalGoal"));//再住院目的
+				homePageVO.setTbiBeforeDay(rs.getString("tbiBeforeDay"));//颅脑损伤患者昏迷前天数
+				homePageVO.setTbiBeforeHour(rs.getString("tbiBeforeHour"));//颅脑损伤患者昏迷前小时
+				homePageVO.setTbiBeforeMinute(rs.getString("tbiBeforeMinute"));//颅脑损伤患者昏迷前分钟
+				homePageVO.setTbiAfterDay(rs.getString("tbiAfterDay"));//颅脑损伤患者昏迷后天数
+				homePageVO.setTbiAfterHour(rs.getString("tbiAfterHour"));//颅脑损伤患者昏迷后小时
+				homePageVO.setTbiAfterMinute(rs.getString("tbiAfterMinute"));//颅脑损伤患者昏迷后分钟
+				homePageVO.setTotalFee(rs.getString("totalFee"));//总费用
+				homePageVO.setOwnFee(rs.getString("ownFee"));//自付金额
+				homePageVO.setGeneralFee(rs.getString("generalFee"));//一般医疗服务费
+				homePageVO.setServiceFee(rs.getString("serviceFee"));//一般治疗服务费
+				homePageVO.setNurseFee(rs.getString("nurseFee"));//护理费
+				homePageVO.setOtherFee(rs.getString("otherFee"));//其他费用
+				homePageVO.setPathologyFee(rs.getString("pathologyFee"));//病理诊断费
+				homePageVO.setLabFee(rs.getString("labFee"));//实验室诊断费
+				homePageVO.setPacsFee(rs.getString("pacsFee"));//影像学诊断费
+				homePageVO.setClinicDiagnoseFee(rs.getString("clinicDiagnoseFee"));//临床诊断项目费
+				homePageVO.setNotOperationFee(rs.getString("notOperationFee"));//非手术治疗项目费
+				homePageVO.setClinicPhysicFee(rs.getString("clinicPhysicFee"));//临床物理治疗费
+				homePageVO.setOperationTreatFee(rs.getString("operationTreatFee"));//手术治疗费
+				homePageVO.setAnaesthesiaFee(rs.getString("anaesthesiaFee"));//麻醉费
+				homePageVO.setOperationFee(rs.getString("operationFee"));//手术费
+				homePageVO.setHealthTypeFee(rs.getString("healthTypeFee"));//康复类
+				homePageVO.setChnTreatFee(rs.getString("chnTreatFee"));//中医治疗费
+				homePageVO.setWesternMedFee(rs.getString("westernMedFee"));//西药费
+				homePageVO.setAntibiosisFee(rs.getString("antibiosisFee"));//抗菌药物费用
+				homePageVO.setChnMedFee(rs.getString("chnMedFee"));//中成药费
+				homePageVO.setChnHerbFee(rs.getString("chnHerbFee"));//中草药费
+				homePageVO.setBloodFee(rs.getString("bloodFee"));//血费
+				homePageVO.setAlbumenFee(rs.getString("albumenFee"));//白蛋白类制品费
+				homePageVO.setGlobulinFee(rs.getString("globulinFee"));//球蛋白类制品费
+				homePageVO.setBloodFactorFee(rs.getString("bloodFactorFee"));//凝血因子类制品费
+				homePageVO.setCellFactorFee(rs.getString("cellFactorFee"));//细胞因子类制品费
+				homePageVO.setCheckMaterialFee(rs.getString("checkMaterialFee"));//检查用一次性医用材料费
+				homePageVO.setTreatMaterialFee(rs.getString("treatMaterialFee"));//治疗用一次性医用材料费
+				homePageVO.setOperationMaterialFee(rs.getString("operationMaterialFee"));//手术用一次性医用材料费
+				homePageVO.setOtherTypeFee(rs.getString("otherTypeFee"));//其他类其他费
+				homePageVO.setSingleDiagManage(rs.getString("singleDiagManage"));//单病种管理
+				homePageVO.setClinicPathwayManage(rs.getString("clinicPathwayManage"));//临床路径管理
+				homePageVO.setIsOutpatientBehospital(rs.getString("isOutpatientBehospital"));//门诊与住院
+				homePageVO.setIsLeaveBehospital(rs.getString("isLeaveBehospital"));//入院与出院
+				homePageVO.setIsOperationBeforeAfter(rs.getString("isOperationBeforeAfter"));//术前与术后
+				homePageVO.setIsClinicPathology(rs.getString("isClinicPathology"));//临床与病理
+				homePageVO.setIsRadiatePathology(rs.getString("isRadiatePathology"));//放射与病理
+				homePageVO.setRescueSuccessNum(rs.getString("rescueNum"));//病人抢救次数
+				homePageVO.setRescueSuccessNum(rs.getString("rescueSuccessNum"));//病人抢救成功次数
+				homePageVO.setIsAutoLeavehospital(rs.getString("isAutoLeavehospital"));//是否为自动出院
+				homePageVO.setReturnToType(rs.getString("returnToType"));//转归情况HomePage homePageVO=new HomePage();
 				homePageList.add(homePageVO);
-				
 			}
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -641,9 +510,8 @@ public class TZDBConn {
 			ResultSet rs =dbconn.Query(sql, null);
 			while(rs.next()){
 				MedicalRecordContent mrContent=new MedicalRecordContent();
-				mrContent.setHospitalId(HOSPITAL_ID);
 				mrContent.setRecId(rs.getString("RECID"));
-				mrContent.setHospitalId(rs.getLong(8));
+				mrContent.setHospitalId(rs.getLong(14));
 				mrContent.setXmlText(rs.getString("XMLTEXT"));
 
 				mrContentList.add(mrContent);

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

@@ -254,7 +254,7 @@ public class BehospitalInfoController {
     @PostMapping("/exportQcresultByPerson")
     @SysLogger("exportQcresultByPerson")
     public void exportQcresultByPerson(HttpServletResponse response, @RequestBody ExportQcresultVO exportQcresultVO) {
-        behospitalInfoFacade.exportQcresultByPerson(response, exportQcresultVO);
+        behospitalInfoFacade.exportQcresultByPerson(exportQcresultVO);
     }
 
     @ApiOperation(value = "【医疗组】质控结果导出[by:zhoutg]",

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

@@ -50,6 +50,8 @@ public class DataController {
     private AMedPacsInfoFacade aMedPacsInfoFacade;
     @Autowired
     private AMedLisInfoFacade aMedLisInfoFacade;
+    @Autowired
+    private SendDataDealFacade sendDataDealFacade;
 
     @ApiOperation(value = "数据引擎-获取医院所有在职医生的基本信息")
     @PostMapping("/sendDoctorInfos")
@@ -216,6 +218,14 @@ public class DataController {
         return RespDTO.onSuc(b);
     }
 
+    @ApiOperation(value = "数据引擎-历史数据拉取<七院>")
+    @PostMapping("/sendDataDeal")
+    @SysLogger("sendDataDeal")
+    public void sendDataDeal(String startDate,String stopDate){
+        sendDataDealFacade.sendDataDeal(startDate,stopDate);
+    }
+
+
     /*
     @ApiOperation(value = "数据引擎-列字段名和注释")
     @PostMapping("/getColumnZhAndCh")