From a7a1149c69d620c1af40d987d5c3f91b4866f974 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Mon, 30 Aug 2021 17:52:07 +0800 Subject: [PATCH] update --- .../com/lyms/hospitalapi/cdfy/CdGwInterface.java | 431 ++++++++++----------- .../lyms/platform/worker/BoneTransferWorker.java | 72 ++-- .../com/lyms/platform/worker/TransferWorker.java | 11 +- 3 files changed, 256 insertions(+), 258 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/cdfy/CdGwInterface.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/cdfy/CdGwInterface.java index cd9be50..6e0def0 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/cdfy/CdGwInterface.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/cdfy/CdGwInterface.java @@ -72,7 +72,7 @@ public class CdGwInterface { // private static final String BASE_URL = "http://gxgg.greatsoft.net:8082"; //线上地址222.223.187.132:7076 // private static final String BASE_URL = "http://gxgg.greatsoft.net:8083"; - private static final String BASE_URL = "http://10.0.255.31:7076"; + private static final String BASE_URL = "http://222.223.187.132:7076"; /** @@ -187,8 +187,8 @@ public class CdGwInterface { BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(organization.getTownOrgId()); //String hospitalName = basicConfig == null ? "" : basicConfig.getName(); - String code = basicConfig.getCode();//getCodeByHospital(hospitalName); - + String code = basicConfig == null ? (organization.getTownOrgId() == null ? "" : organization.getTownOrgId()): basicConfig.getCode();//getCodeByHospital(hospitalName); + code = code == null || code == "" ? "000209471" : code; MaternalInfo maternalInfo = new MaternalInfo(); getNation(patient.getPnationId(),maternalInfo); @@ -197,7 +197,7 @@ public class CdGwInterface { ps = conn.prepareStatement(inBaseInfoSql); ps.setString(1,code); ps.setString(2,id); - ps.setString(3,patient.getVcCardNo()); + ps.setString(3,patient.getVcCardNo() == null || patient.getVcCardNo() == "" ? "23452346" : patient.getVcCardNo()); ps.setString(4,"03"); ps.setString(5,patient.getUsername()); ps.setString(6,"2"); @@ -551,30 +551,30 @@ public class CdGwInterface { String liveAddress = CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(), patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getAddressRegister(), basicConfigService); - Organization organization = organizationService.getOrganization(Integer.parseInt(patients.getTownOrgId())); - - - if (organization == null) - { - return null; - } - - //智业中间库的医疗机构编码 - BasicConfig basic = basicConfigService.getOneBasicConfigById(organization.getTownOrgId()); - //String hospital =basic.getName(); - - String code = basic.getCode();//getCodeByHospital(hospital); - - Map gxMap = findGxHospitalById(organization.getTownOrgId()); - if(gxMap != null){ - createOrgId = gxMap.get("createOrgId"); - orgName = gxMap.get("orgName"); - creator = gxMap.get("creator"); - creatorId = gxMap.get("creatorId"); - }else{ - return null; - } - +// Organization organization = organizationService.getOrganization(Integer.parseInt(patients.getTownOrgId())); +// +// +// if (organization == null) +// { +// return null; +// } +// +// //智业中间库的医疗机构编码 +// BasicConfig basic = basicConfigService.getOneBasicConfigById(organization.getTownOrgId()); +// //String hospital =basic.getName(); +// +// String code = basic == null ? (organization.getTownOrgId() == null? "" : organization.getTownOrgId()) : basic.getCode();//getCodeByHospital(hospital); +// +// Map gxMap = findGxHospitalById(organization.getTownOrgId()); +// if(gxMap != null){ +// createOrgId = gxMap.get("createOrgId"); +// orgName = gxMap.get("orgName"); +// creator = gxMap.get("creator"); +// creatorId = gxMap.get("creatorId"); +// }else{ +// return null; +// } + String code ="000209471"; BaseObjectResponse br = viewFacade.findAntExChu(antExChuModel.getId()); if (br.getData() != null && patients != null) { @@ -599,9 +599,8 @@ public class CdGwInterface { //冠鑫孕产登记（智业WOMAN_PREGNANCY_DIAG） String inSqlDiag = "insert into WOMAN_PREGNANCY_DIAG(LAST_UPDATE_DTIME,ORG_CODE,PATIENT_ID,ORG_FORM_NO," + "NAME,PRESENT_VILLAGE,TEL_NO,EMPLOYER_NAME,WEIGHT,MENSES_LAST_DATE,EXPECTED_TIEM,GRAVIDITY," + - "PARITY,SPONTANEOUS_ABORTION,INDUCED_ABORTION,HUSBAND_NAME,DIAGNOSIS_DATE,CREATE_DATE,create_OrgId," + - "orgName,creator,creator_Id) " + - "values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; + "PARITY,SPONTANEOUS_ABORTION,INDUCED_ABORTION,HUSBAND_NAME,DIAGNOSIS_DATE,CREATE_DATE) " + + "values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; ps = conn.prepareStatement(inSqlDiag); ps.setDate(1, new Date(antExChuModel.getModified().getTime())); ps.setString(2, code); @@ -649,10 +648,10 @@ public class CdGwInterface { }else{ ps.setNull(18,Types.DATE); } - ps.setString(19,createOrgId); - ps.setString(20,orgName); - ps.setString(21,creator); - ps.setString(22,creatorId); +// ps.setString(19,createOrgId); +// ps.setString(20,orgName); +// ps.setString(21,creator); +// ps.setString(22,creatorId); ps.executeUpdate(); @@ -669,9 +668,9 @@ public class CdGwInterface { "WVD_CLEAN_CODE,HBEAB_TEST_RESULT_CODE,HBEAG_TEST_RESULT_CODE,HBSAB_TEST_RESULT_CODE,HBSAG_TEST_RESULT_CODE,\n" + "HBCAB_TEST_RESULT_CODE,STS_RESULT_CODE,HIV_ANTI_RESULT_CODE,BSCAN_RESULT_DESCR,PREG_HEALTH_ABNORM_MARK,\n" + "PREG_HEALTH_ABNORM_DESCR,REFERRAL_MARK,REFERTO_ORG_NAME,REFERTO_DEPT_NAME,REFERRAL_REASON,VISIT_DOCTOR_NAME,\n" + - "THIS_VISIT_DATE,NEXT_VISIT_DATE,NEXT_VISIT_PLACE,create_OrgId,orgNane,creator,creator_Id) " + + "THIS_VISIT_DATE,NEXT_VISIT_DATE,NEXT_VISIT_PLACE) " + "values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,\n" + - "?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; + "?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; ps = conn.prepareStatement(inSql); ps.setDate(1, new Date(antExChuModel.getModified().getTime())); @@ -1062,10 +1061,10 @@ public class CdGwInterface { ps.setNull(85, Types.DATE); } ps.setString(86, null); - ps.setString(87,createOrgId); - ps.setString(88,orgName); - ps.setString(89,creator); - ps.setString(90,creatorId); +// ps.setString(87,createOrgId); +// ps.setString(88,orgName); +// ps.setString(89,creator); +// ps.setString(90,creatorId); ps.executeUpdate(); try { @@ -1189,37 +1188,37 @@ public class CdGwInterface { return null; } - Organization organization = organizationService.getOrganization(Integer.parseInt(patients.getTownOrgId())); - - if (organization == null) - { - return null; - } +// Organization organization = organizationService.getOrganization(Integer.parseInt(patients.getTownOrgId())); +// +// if (organization == null) +// { +// return null; +// } //智业中间库的医疗机构编码 - String code = ""; - String hospital = basicConfigService.getOneBasicConfigById(organization.getTownOrgId()).getName(); - - if(hospital != "" && hospital != null){ - code = patients.getHospitalId(); - String hoSql = "select code from yljg where wname=\'"+hospital+"\'"; - ps = conn.prepareStatement(hoSql); - rs = ps.executeQuery(); - while(rs.next()){ - code = rs.getString("code"); - } - - gxMap = findGxHospitalById(organization.getTownOrgId()); - if(gxMap != null){ - createOrgId = gxMap.get("createOrgId"); - orgName = gxMap.get("orgName"); - creator = gxMap.get("creator"); - creatorId = gxMap.get("creatorId"); - }else{ - return null; - } - - } + String code ="000209471"; +// String hospital = basicConfigService.getOneBasicConfigById(organization.getTownOrgId() == null ? organization.getId()+"" : organization.getTownOrgId()).getName(); +// +// if(hospital != "" && hospital != null){ +// code = patients.getHospitalId(); +// String hoSql = "select code from yljg where wname=\'"+hospital+"\'"; +// ps = conn.prepareStatement(hoSql); +// rs = ps.executeQuery(); +// while(rs.next()){ +// code = rs.getString("code"); +// } +// +// gxMap = findGxHospitalById(organization.getTownOrgId()); +// if(gxMap != null){ +// createOrgId = gxMap.get("createOrgId"); +// orgName = gxMap.get("orgName"); +// creator = gxMap.get("creator"); +// creatorId = gxMap.get("creatorId"); +// }else{ +// return null; +// } +// +// } BaseObjectResponse br = viewFacade.findAntenatalExamination(antenatalExaminationModel.getId()); @@ -1251,8 +1250,8 @@ public class CdGwInterface { "GEST_WEEKS,WEIGHT,CHIEF_COMPLAINT,FUNDUS_HEIGHT,ABDOMEN_CIRCUM,FETUS_POSITION_CODE,FETAL_HEART_RATE,\n" + "SBP,DBP,HGB,PRO_QUAN_TEST_VALUE,PRO_QUAL_RESULT_CODE,PREG_HEALTH_ABNORM_MARK,PREG_HEALTH_ABNORM_DESCR,\n" + "REFERRAL_MARK,REFERTO_ORG_NAME,REFERTO_DEPT_NAME,REFERRAL_REASON,VISIT_DOCTOR_NAME,THIS_VISIT_DATE,\n" + - "NEXT_VISIT_DATE,create_OrgId,orgNane,creator,creator_Id,servicetimes) " + - "values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; + "NEXT_VISIT_DATE) " + + "values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; ps = conn.prepareStatement(inSql); ps.setDate(1, new Date(antenatalExaminationModel.getModified().getTime())); ps.setString(2, code); @@ -1290,13 +1289,13 @@ public class CdGwInterface { ps.setNull(14,Types.INTEGER); } if(antenatalExaminationModel.getUrineProtein() != null && !"-".equals(antenatalExaminationModel.getUrineProtein())){ - Double parseDouble = null; try { - parseDouble = Double.parseDouble(antenatalExaminationModel.getUrineProtein()); + Double parseDouble = Double.parseDouble(antenatalExaminationModel.getUrineProtein()); + ps.setDouble(15, parseDouble); }catch (Exception e){ e.printStackTrace(); } - ps.setDouble(15, parseDouble); + }else{ ps.setNull(15,Types.DOUBLE); } @@ -1326,11 +1325,11 @@ public class CdGwInterface { }else{ ps.setNull(25,Types.DATE); } - ps.setString(26, createOrgId); - ps.setString(27,orgName); - ps.setString(28,creator); - ps.setString(29,creatorId); - ps.setInt(30,service); +// ps.setString(26, createOrgId); +// ps.setString(27,orgName); +// ps.setString(28,creator); +// ps.setString(29,creatorId); +// ps.setInt(30,service); int rel = ps.executeUpdate(); if(rel > 0){ System.out.print("推送成功！"); @@ -1386,46 +1385,46 @@ public class CdGwInterface { - Organization organization = organizationService.getOrganization(Integer.parseInt(patients.getTownOrgId())); - - if (organization == null) - { - return null; - } +// Organization organization = organizationService.getOrganization(Integer.parseInt(patients.getTownOrgId())); +// +// if (organization == null) +// { +// return null; +// } Map map = (Map)br.getData(); //智业中间库的医疗机构编码 - String code = ""; - String hospital = basicConfigService.getOneBasicConfigById(organization.getTownOrgId()).getName(); - if(hospital != "" && hospital != null){ - code = patients.getHospitalId(); - String hoSql = "select code from yljg where wname=\'"+hospital+"\'"; - ps = conn.prepareStatement(hoSql); - rs = ps.executeQuery(); - while(rs.next()){ - code = rs.getString("code"); - } - - //分娩机构编码 - fmCode = patients.getHospitalId(); - String fmSql = "select code from yljg where wname=\'"+map.get("fmHospital").toString()+"\'"; - ps = conn.prepareStatement(fmSql); - rs = ps.executeQuery(); - while(rs.next()){ - fmCode = rs.getString("code"); - } - - gxMap = findGxHospitalById(organization.getTownOrgId()); - if(gxMap != null){ - createOrgId = gxMap.get("createOrgId"); - orgName = gxMap.get("orgName"); - creator = gxMap.get("creator"); - creatorId = gxMap.get("creatorId"); - }else{ - return null; - } - - } + String code = "000209541"; +// String hospital = basicConfigService.getOneBasicConfigById(organization.getTownOrgId() == null ? organization.getId() +"" : organization.getTownOrgId()).getName(); +// if(hospital != "" && hospital != null){ +// code = patients.getHospitalId(); +// String hoSql = "select code from yljg where wname=\'"+hospital+"\'"; +// ps = conn.prepareStatement(hoSql); +// rs = ps.executeQuery(); +// while(rs.next()){ +// code = rs.getString("code"); +// } +// +// //分娩机构编码 +// fmCode = patients.getHospitalId(); +// String fmSql = "select code from yljg where wname=\'"+map.get("fmHospital").toString()+"\'"; +// ps = conn.prepareStatement(fmSql); +// rs = ps.executeQuery(); +// while(rs.next()){ +// fmCode = rs.getString("code"); +// } +// +//// gxMap = findGxHospitalById(organization.getTownOrgId()); +//// if(gxMap != null){ +//// createOrgId = gxMap.get("createOrgId"); +//// orgName = gxMap.get("orgName"); +//// creator = gxMap.get("creator"); +//// creatorId = gxMap.get("creatorId"); +//// }else{ +//// return null; +//// } +// +// } if(StringUtils.isNotEmpty(patients.getId()) && StringUtils.isNotEmpty(data.getId())){ String delSql = "delete from WOMAN_DELIVERY where ORG_FORM_NO = \'"+data.getId()+"\'"; @@ -1460,10 +1459,10 @@ public class CdGwInterface { "Save_Cord_Blood_Flag,Full_Membrane_State,Amniotic_Fluid,Amniotic_Fluid_Amount,Raogeng_Body,Postpartum_Obs_Time,\n" + "Postpartum_Exam_Time,Postpartum_Pulse_Rate,Postpartum_Heart_Rate,Postpartum_Uc,Postpartum_Fundus_Height,\n" + "Anus_Check,Delivery_Outcome_Code,Assistant_Signature,Baby_Care_Siganture,Instructor_Signature,Writor_Signature,\n" + - "Tumor_Size,Tumor_Part,Newborn_Abnormal_Code,create_OrgId,orgNane,creator,creator_Id) \n" + + "Tumor_Size,Tumor_Part,Newborn_Abnormal_Code) \n" + "values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?," + "?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?," + - "?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; + "?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; if(CollectionUtils.isNotEmpty(data.getBaby()) && data.getBaby().size()>1){ for(MaternalDeliverModel.Baby temp : data.getBaby()){ @@ -1479,7 +1478,7 @@ public class CdGwInterface { ps.setString(8, null); ps.setString(9, null); ps.setDate(10, new Date(DateUtil.parseYMD(data.getDueDate()).getTime())); - ps.setString(11, temp.getDueTime()); + ps.setString(11, DateUtil.getYmd(data.getDueDate1())); if(data.getDueWeek() != null){ ps.setInt(12, Integer.parseInt(data.getDueWeek().substring(0, 1))); int index = data.getDueWeek().indexOf("天"); @@ -1791,10 +1790,7 @@ public class CdGwInterface { ps.setString(128,null); ps.setString(129,null); ps.setString(130,"1"); - ps.setString(131,createOrgId); - ps.setString(132,orgName); - ps.setString(133,creator); - ps.setString(134,creatorId); + int inl = ps.executeUpdate(); @@ -1813,7 +1809,7 @@ public class CdGwInterface { ps.setString(8, null); ps.setString(9, null); ps.setDate(10, new Date(DateUtil.parseYMD(data.getDueDate()).getTime())); - ps.setString(11, data.getBaby().get(0).getDueTime()); + ps.setString(11, DateUtil.getYmd(DateUtil.parseYMD(data.getBaby().get(0).getDueTime()))); ps.setInt(12, Integer.parseInt(data.getDueWeek().substring(0, 1))); int index = data.getDueWeek().indexOf("天"); if(index == -1){ @@ -2110,10 +2106,7 @@ public class CdGwInterface { ps.setString(128,null); ps.setString(129,null); ps.setString(130,"1"); - ps.setString(131,createOrgId); - ps.setString(132,orgName); - ps.setString(133,creator); - ps.setString(134,creatorId); + int in = ps.executeUpdate(); if(in > 0){ System.out.print("分娩数据插入成功！"); @@ -2412,7 +2405,7 @@ public class CdGwInterface { //智业中间库的医疗机构编码 String code = ""; - String hospital = basicConfigService.getOneBasicConfigById(organization.getTownOrgId()).getName(); + String hospital = basicConfigService.getOneBasicConfigById(organization.getTownOrgId() == null ? organization.getId()+"" : organization.getTownOrgId()).getName(); if(hospital != "" && hospital != null){ code = patients.getHospitalId(); String hoSql = "select code from yljg where wname=\'"+hospital+"\'"; @@ -2444,9 +2437,8 @@ public class CdGwInterface { "NAME,FOLLOWUP_VISIT_DATE,BODY_TEMPERATURE,HEALTH_CONDITION_DESCR,PSYCHOLOGY_CONDITION_DESCR,SBP,DBP,\n" + "LBREAST_EXAM_RESULT_CODE,RBREAST_EXAM_RESULT_CODE,CORPUSUTERI_ABNORM_MARK,CORPUSUTERI_ABNORM_DESCR,\n" + "LOCHIA_ABNORM_MARK,LOCHIA_DESCR,WOUND_HEALING_CODE,PREG_HEALTH_ABNORM_MARK,PREG_HEALTH_ABNORM_DESCR,\n" + - "REFERRAL_MARK,REFERRAL_REASON,REFERTO_ORG_NAME,REFERTO_DEPT_NAME,VISIT_DOCTOR_NAME,NEXT_VISIT_DATE,\n" + - "create_OrgId,orgNane,creator,creator_Id) \n" + - "values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; + "REFERRAL_MARK,REFERRAL_REASON,REFERTO_ORG_NAME,REFERTO_DEPT_NAME,VISIT_DOCTOR_NAME,NEXT_VISIT_DATE) \n" + + "values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; ps = conn.prepareStatement(inSql); ps.setDate(1, new Date(matdeliverFollowModel.getUpdateDate().getTime())); ps.setString(2, code); @@ -2454,7 +2446,7 @@ public class CdGwInterface { ps.setString(4, matdeliverFollowModel.getId()); ps.setString(5, matdeliverFollowModel.getId()); ps.setString(6, patients.getUsername()); - ps.setDate(7, new Date(matdeliverFollowModel.getMakeVisitDate().getTime())); + ps.setDate(7, matdeliverFollowModel.getMakeVisitDate() == null ? null : new Date(matdeliverFollowModel.getMakeVisitDate().getTime())); if(matdeliverFollowModel.getTemperature() != null && matdeliverFollowModel.getTemperature().length()>0){ ps.setDouble(8, Double.parseDouble(matdeliverFollowModel.getTemperature())); }else{ @@ -2483,10 +2475,10 @@ public class CdGwInterface { }else{ ps.setNull(27, Types.DATE); } - ps.setString(28,createOrgId); - ps.setString(29,orgName); - ps.setString(30,creator); - ps.setString(31,creatorId); +// ps.setString(28,createOrgId); +// ps.setString(29,orgName); +// ps.setString(30,creator); +// ps.setString(31,creatorId); int inResult = ps.executeUpdate(); }catch (Exception e){ @@ -2683,24 +2675,24 @@ public class CdGwInterface { Patients patients = getMainPatient(babyModel.getParentId()); if(patients != null && StringUtils.isNotEmpty(patients.getTownOrgId())){ - String delSql = "delete from CHILD_INFO where ORG_FORM_NO=\'"+babyModel.getId()+"\'"; + String delSql = "delete from CHILD_INFO where HEALTH_RECORD_NO=\'"+babyModel.getId().substring(16)+"\'"; deleteData(delSql,conn,ps); //智业中间库的医疗机构编码 - String code = ""; - String hospital = basicConfigService.getOneBasicConfigById(patients.getTownOrgId()).getName(); - - if(hospital != "" && hospital != null){ - code = patients.getHospitalId(); - String hoSql = "select code from yljg where wname=\'"+hospital+"\'"; - ps = conn.prepareStatement(hoSql); - rs = ps.executeQuery(); - while(rs.next()){ - code = rs.getString("code"); - } - } + String code = "000210971"; +// String hospital = basicConfigService.getOneBasicConfigById(patients.getTownOrgId() == null ? patients.getHospitalId() : patients.getTownOrgId()).getName(); +// +// if(hospital != "" && hospital != null){ +// code = patients.getHospitalId(); +// String hoSql = "select code from yljg where wname=\'"+hospital+"\'"; +// ps = conn.prepareStatement(hoSql); +// rs = ps.executeQuery(); +// while(rs.next()){ +// code = rs.getString("code"); +// } +// } //居住地址 String jzSheng = CommonsHelper.getName1(patients.getProvinceRegisterId(), basicConfigService); @@ -2721,15 +2713,15 @@ public class CdGwInterface { "MOTHER_OCCUP_CODE,MOTHER_IDNO,PRESENT_ADDR_PROVINCE,PRESENT_ADDR_CITY,PRESENT_ADDR_COUNTY,\n" + "PRESENT_ADDR_TOWN,PRESENT_ADDR_VILLAGE,PRESENT_ADDR_HOUSE_NO,BIRTH_GEST_WEEKS,MOTHER_GEST_COMPLICATION,\n" + "DELIVERY_ORG_NAME,LAST_DELIVER_WAY_CODE,TWINS_MARK,ASPHYXIA_MARK,APGAR_SCORE,MALFORM_MARK,MALFORM_DESCR,\n" + - "HEARING_SCREEN_CODE,HEARING_SCREEN_RESULT_CODE,DISEASE_SCREEN_ITEM_CODE,BIRTH_WEIGHT,BIRTH_LENGTH,ORG_FORM_NO) \n" + - "values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; + "HEARING_SCREEN_CODE,HEARING_SCREEN_RESULT_CODE,DISEASE_SCREEN_ITEM_CODE,BIRTH_WEIGHT,BIRTH_LENGTH) \n" + + "values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; ps = conn.prepareStatement(inSql); ps.setDate(1, new Date(babyModel.getModified().getTime())); ps.setString(2, code); ps.setString(3, id); ps.setString(4, id); - ps.setString(5,babyModel.getId()); + ps.setString(5,babyModel.getId().substring(16)); ps.setString(6, babyModel.getName()); if(1 == babyModel.getSex()){ ps.setString(7,"1"); @@ -2790,7 +2782,7 @@ public class CdGwInterface { }else{ ps.setNull(39,Types.DOUBLE); } - ps.setString(40,maternalDeliverModel.getId()); + //ps.setString(40,maternalDeliverModel.getId()); ps.executeUpdate(); @@ -2863,28 +2855,28 @@ public class CdGwInterface { //智业中间库的医疗机构编码 - String code = ""; - String hospital = basicConfigService.getOneBasicConfigById(organization.getTownOrgId()).getName(); - - if(hospital != "" && hospital != null){ - code = patients.getHospitalId(); - String hoSql = "select code from yljg where wname=\'"+hospital+"\'"; - ps = conn.prepareStatement(hoSql); - rs = ps.executeQuery(); - while(rs.next()){ - code = rs.getString("code"); - } - - gxMap = findGxHospitalById(organization.getTownOrgId()); - if(gxMap != null){ - createOrgId = gxMap.get("createOrgId"); - orgName = gxMap.get("orgName"); - creator = gxMap.get("creator"); - creatorId = gxMap.get("creatorId"); - }else{ - return null; - } - } + String code = "000209541"; +// String hospital = basicConfigService.getOneBasicConfigById(organization.getTownOrgId()).getName(); +// +// if(hospital != "" && hospital != null){ +// code = patients.getHospitalId(); +// String hoSql = "select code from yljg where wname=\'"+hospital+"\'"; +// ps = conn.prepareStatement(hoSql); +// rs = ps.executeQuery(); +// while(rs.next()){ +// code = rs.getString("code"); +// } +// +// gxMap = findGxHospitalById(organization.getTownOrgId()); +// if(gxMap != null){ +// createOrgId = gxMap.get("createOrgId"); +// orgName = gxMap.get("orgName"); +// creator = gxMap.get("creator"); +// creatorId = gxMap.get("creatorId"); +// }else{ +// return null; +// } +// } String id = getPersonId(patients); if (null == id) { return null; @@ -2901,9 +2893,9 @@ public class CdGwInterface { "SKIN_EXAM_RESULT_CODE,ANUS_ABNORM_MARK,ANUS_ABNORM_DESCR,GENITALIA_ABNORM_MARK,\n" + "GENITALIA_ABNORM_DESCR,SPINE_ABNORM_MARK,SPINE_ABNORM_DESCR,UMB_CORD_RESULT_CODE,\n" + "REFERRAL_MARK,REFERTO_ORG_NAME,REFERTO_DEPT_NAME,REFERRAL_REASON,VISIT_DOCTOR_NAME,\n" + - "THIS_VISIT_DATE,NEXT_VISIT_DATE,NEXT_VISIT_PLACE,create_OrgId,orgNane,creator,creator_Id) \n" + + "THIS_VISIT_DATE,NEXT_VISIT_DATE,NEXT_VISIT_PLACE) \n" + "values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,\n" + - "?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; + "?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; ps = conn.prepareStatement(inSql); ps.setDate(1, new Date(newbornVisit.getCreated().getTime())); ps.setString(2, code); @@ -2950,7 +2942,7 @@ public class CdGwInterface { if(StringUtils.isNotBlank(newbornVisit.getTemperature())) { ps.setDouble(13,Double.parseDouble(newbornVisit.getTemperature())); }else{ - ps.setNull(13,Types.DOUBLE); + ps.setNull(13, Types.DOUBLE); } if(StringUtils.isNotBlank(newbornVisit.getHeartRate())) { ps.setInt(14,Integer.parseInt(newbornVisit.getHeartRate())); @@ -2960,7 +2952,7 @@ public class CdGwInterface { if(StringUtils.isNotBlank(newbornVisit.getRespiratoryRate())) { ps.setInt(15,Integer.parseInt(newbornVisit.getRespiratoryRate())); }else{ - ps.setNull(15,Types.INTEGER); + ps.setNull(15, Types.INTEGER); } if("1".equals(newbornVisit.getComplexion())){ ps.setString(16, "1"); @@ -3021,7 +3013,7 @@ public class CdGwInterface { } }else{ ps.setString(27,null); - ps.setString(28,null); + ps.setString(28, null); } if(newbornVisit.getHeartLung() != null){ if("未见异常".equals(newbornVisit.getHeartLung())){ @@ -3143,8 +3135,8 @@ public class CdGwInterface { } ps.setString(47,null); ps.setString(48,null); - ps.setString(49,null); - ps.setString(50,null); + ps.setString(49, null); + ps.setString(50, null); ps.setString(51,mapper.getUserName(newbornVisit.getDoctor())); ps.setDate(52, new Date(newbornVisit.getCheckTime().getTime())); if(newbornVisit.getNextVisitTimeDesc() != null){ @@ -3153,10 +3145,7 @@ public class CdGwInterface { ps.setNull(53,Types.DATE); } ps.setString(54,null); - ps.setString(55,createOrgId); - ps.setString(56,orgName); - ps.setString(57,creator); - ps.setString(58,creatorId); + ps.executeUpdate(); } } @@ -3210,7 +3199,7 @@ public class CdGwInterface { } - Organization organization = organizationService.getOrganization(Integer.parseInt(patients.getTownOrgId())); + Organization organization = organizationService.getOrganization(patients.getTownOrgId() == null ? Integer.parseInt(patients.getHospitalId()) : Integer.parseInt(patients.getTownOrgId())); if (organization == null) { @@ -3224,29 +3213,18 @@ public class CdGwInterface { //智业中间库的医疗机构编码 - String code = ""; - String hospital = basicConfigService.getOneBasicConfigById(organization.getTownOrgId()).getName(); - - if(hospital != "" && hospital != null){ - code = patients.getHospitalId(); - String hoSql = "select code from yljg where wname=\'"+hospital+"\'"; - ps = conn.prepareStatement(hoSql); - rs = ps.executeQuery(); - while(rs.next()){ - code = rs.getString("code"); - } - - gxMap = findGxHospitalById(organization.getTownOrgId()); - if(gxMap != null){ - createOrgId = gxMap.get("createOrgId"); - orgName = gxMap.get("orgName"); - creator = gxMap.get("creator"); - creatorId = gxMap.get("creatorId"); - }else{ - return null; - } - - } + String code = "000209541"; +// String hospital = basicConfigService.getOneBasicConfigById(organization.getTownOrgId() == null ? organization.getId()+"" : organization.getTownOrgId()).getName(); +// +// if(hospital != "" && hospital != null){ +// code = patients.getHospitalId(); +// String hoSql = "select code from yljg where wname=\'"+hospital+"\'"; +// ps = conn.prepareStatement(hoSql); +// rs = ps.executeQuery(); +// while(rs.next()){ +// code = rs.getString("code"); +// } +// } String id = getPersonId(patients); @@ -3266,10 +3244,9 @@ public class CdGwInterface { "OUTDOOR_ACT_HOURS,VITAMIND_NAME,VITAMIND_DOSE,DEVELOP_PASS_MARK,SICK_2VISIT_MARK,\n" + "PNEUM_2VISIT_INPAT_TIMES,DIARRHEA_2VISIT_INPAT_TIMES,TRAUMA_2VISIT_INPAT_TIMES,\n" + "OTHERS_2VISIT_DESCR,REFERRAL_MARK,REFERRAL_REASON,REFERTO_ORG_NAME,REFERTO_DEPT_NAME,\n" + - "FOLLOWUP_VISIT_DATE,FOLLOWUP_VISIT_DOCTOR_NAME,NEXT_FOLLOWUP_DATE,AGE_CODE,create_OrgId,\n" + - "orgNane,creator,creator_Id) \n" + + "FOLLOWUP_VISIT_DATE,FOLLOWUP_VISIT_DOCTOR_NAME,NEXT_FOLLOWUP_DATE,AGE_CODE) \n" + "values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,\n" + - "?,?,?,?,?,?,?,?,?,?,?,?)"; + "?,?,?,?,?,?,?,?)"; ps = conn.prepareStatement(inSql); ps.setTimestamp(1, new Timestamp(babyCheckModel.getCreated().getTime())); ps.setString(2, code); @@ -3463,13 +3440,19 @@ public class CdGwInterface { } }else{ ps.setString(39,null); - ps.setString(40,null); + ps.setString(40, null); } - if(babyCheckModel.getHemoglobin() != null){ - ps.setInt(41, Integer.parseInt(babyCheckModel.getHemoglobin())); - }else{ - ps.setNull(41,Types.INTEGER); + try { + if(babyCheckModel.getHemoglobin() != null){ + ps.setInt(41, (int)Double.parseDouble(babyCheckModel.getHemoglobin())); + }else{ + ps.setNull(41, 0); + } + }catch (Exception e) + { + ps.setNull(41,0); } + ps.setNull(42, Types.DOUBLE); ps.setString(43, null); ps.setNull(44, Types.INTEGER); @@ -3492,10 +3475,10 @@ public class CdGwInterface { } ps.setDate(57, new Date(babyCheckModel.getNextDate().getTime())); ps.setString(58, babyCheckModel.getCheckMonth().toString()); - ps.setString(59,createOrgId); - ps.setString(60,orgName); - ps.setString(61,creator); - ps.setString(62,creatorId); +// ps.setString(59,createOrgId); +// ps.setString(60,orgName); +// ps.setString(61,creator); +// ps.setString(62,creatorId); ps.executeUpdate(); } } diff --git a/platform-transfer/src/main/java/com/lyms/platform/worker/BoneTransferWorker.java b/platform-transfer/src/main/java/com/lyms/platform/worker/BoneTransferWorker.java index b6de396..4cb6263 100644 --- a/platform-transfer/src/main/java/com/lyms/platform/worker/BoneTransferWorker.java +++ b/platform-transfer/src/main/java/com/lyms/platform/worker/BoneTransferWorker.java @@ -27,6 +27,8 @@ public class BoneTransferWorker extends TransferAbstract implements ITransfer{ @Override public void doTransfer() { + while (true) { + logger.info("getBoneRecords start"); Connection conn = null; Statement sta = null; @@ -40,52 +42,60 @@ public class BoneTransferWorker extends TransferAbstract implements ITransfer{ rst = sta.executeQuery(sql); while (rst.next()) { Map map = new HashMap(); - String PatientID = rst.getString("PatientID"); //身份证后八位 - map.put("cardNo",PatientID); + String PatientID = rst.getString("PatientID"); //身份证后八位 + map.put("cardNo", PatientID); - String PartDisplayName = rst.getString("PartDisplayName"); - map.put("position",PartDisplayName); + String PartDisplayName = rst.getString("PartDisplayName"); + map.put("position", PartDisplayName); - String PatientName = rst.getString("PatientName"); //孕妇姓名 - map.put("username",PatientName); + String PatientName = rst.getString("PatientName"); //孕妇姓名 + map.put("username", PatientName); - String ZScore = rst.getString("ZScore"); - String TScore = rst.getString("TScore"); - String dbSos = rst.getString("dbSos"); + String ZScore = rst.getString("ZScore"); + String TScore = rst.getString("TScore"); + String dbSos = rst.getString("dbSos"); - String bqi = rst.getString("dbBqi"); - String rrf = rst.getString("dbRrf"); - String eoa = rst.getString("dbEoa"); + String bqi = rst.getString("dbBqi"); + String rrf = rst.getString("dbRrf"); + String eoa = rst.getString("dbEoa"); - String adultPercent = rst.getString("YoungAdult"); - String agePercent = rst.getString("ageMatched"); - String age = rst.getString("dbAge"); + String adultPercent = rst.getString("YoungAdult"); + String agePercent = rst.getString("ageMatched"); + String age = rst.getString("dbAge"); - map.put("zvalue",ZScore); - map.put("tvalue",TScore); - map.put("sos",dbSos); + map.put("zvalue", ZScore); + map.put("tvalue", TScore); + map.put("sos", dbSos); - map.put("bqi",bqi); - map.put("rrf",rrf); - map.put("eoa",eoa); + map.put("bqi", bqi); + map.put("rrf", rrf); + map.put("eoa", eoa); - map.put("adultPercent",adultPercent); - map.put("agePercent",agePercent); - map.put("age",age); - map.put("type",properties.getType()); // - map.put("hospitalId",properties.getHospitalId()); // - exeUpdate( map, PatientID); + map.put("adultPercent", adultPercent); + map.put("agePercent", agePercent); + map.put("age", age); + map.put("type", properties.getType()); // + map.put("hospitalId", properties.getHospitalId()); // + exeUpdate(map, PatientID); } - Thread.sleep(5000); + } catch (Exception e) { - logger.error("getBoneRecords Exception. ",e); + logger.error("getBoneRecords Exception. ", e); + } finally { + iConnection.close(conn, sta, rst); } - finally { - iConnection.close(conn, sta,rst); + + try { + Thread.sleep(50000); + }catch (Exception e) + { + } } + } + public void exeUpdate(Map map,String PatientID) { diff --git a/platform-transfer/src/main/java/com/lyms/platform/worker/TransferWorker.java b/platform-transfer/src/main/java/com/lyms/platform/worker/TransferWorker.java index 747a58f..cf35b5d 100644 --- a/platform-transfer/src/main/java/com/lyms/platform/worker/TransferWorker.java +++ b/platform-transfer/src/main/java/com/lyms/platform/worker/TransferWorker.java @@ -1,5 +1,6 @@ package com.lyms.platform.worker; +import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -8,15 +9,19 @@ import org.springframework.stereotype.Component; * Created by Administrator on 2020-03-23. */ @Component -public class TransferWorker extends TransferAbstract implements ITransfer { +public class TransferWorker extends TransferAbstract implements ITransfer,InitializingBean { @Autowired private BoneTransferWorker boneTransferWorker; @Override - @Scheduled(cron = "0 0/1 * * * ?") + // @Scheduled(cron = "0 0/1 * * * ?") public void doTransfer() { - boneTransferWorker.doTransfer(); + // boneTransferWorker.doTransfer(); } + @Override + public void afterPropertiesSet() throws Exception { + boneTransferWorker.doTransfer(); + } } -- 1.8.3.1