diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java index a8a5418..3b49bee 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java @@ -531,7 +531,8 @@ public class CouponServiceImpl implements CouponService { restMap.put("vcCardNo", baby.getVcCardNo()); /** 就诊卡号 */ // restMap.put("cardNo", baby.getCardNo()); /** 证件号 */ restMap.put("cardNo", person.getCardNo()); /** 证件号 */ - + restMap.put("name", baby.getName()); /** 姓名 */ + restMap.put("phone", baby.getMphone()); /** 手机号码 */ List list = mongoTemplate.find(Query.query(Criteria.where("cardNo").is(person.getCardNo())).with(new Sort(Sort.Direction.DESC, "created")), Patients.class); if (CollectionUtils.isNotEmpty(list)) { restMap.put("pcerteTypeId", list.get(0).getPcerteTypeId()); /** 证件类型id */ @@ -544,6 +545,9 @@ public class CouponServiceImpl implements CouponService { restMap.put("vcCardNo", patients.getVcCardNo()); /** 就诊卡号 */ restMap.put("cardNo", patients.getCardNo()); /** 证件号 */ restMap.put("pcerteTypeId", patients.getPcerteTypeId()); /** 证件类型id */ + + restMap.put("name", patients.getUsername()); /** 姓名 */ + restMap.put("phone", patients.getPhone()); /** 手机号码 */ } } } 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 ae635fb..6cafa3a 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 @@ -195,13 +195,14 @@ public class CdGwInterface { BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(patient.getTownOrgId()); - String hospitalName = basicConfig == null ? "" : basicConfig.getName(); + //String hospitalName = basicConfig == null ? "" : basicConfig.getName(); - String code = getCodeByHospital(hospitalName); + String code = basicConfig.getCode();//getCodeByHospital(hospitalName); MaternalInfo maternalInfo = new MaternalInfo(); getNation(patient.getPnationId(),maternalInfo); + //执行插入个人基本信息表（BASEINFO） ps = conn.prepareStatement(inBaseInfoSql); ps.setString(1,code); @@ -560,9 +561,10 @@ public class CdGwInterface { //智业中间库的医疗机构编码 - String hospital = basicConfigService.getOneBasicConfigById(patients.getTownOrgId()).getName(); + BasicConfig basic = basicConfigService.getOneBasicConfigById(patients.getTownOrgId()); + //String hospital =basic.getName(); - String code = getCodeByHospital(hospital); + String code = basic.getCode();//getCodeByHospital(hospital); Map gxMap = findGxHospitalById(patients.getId()); if(gxMap != null){ @@ -817,7 +819,11 @@ public class CdGwInterface { ps.setNull(49,Types.DOUBLE); } if(antExChuModel.getPlatelet() != null){ - ps.setInt(50, Integer.parseInt(antExChuModel.getPlatelet())); + if (StringUtils.isNumeric(antExChuModel.getPlatelet())) + { + ps.setDouble(50, Double.parseDouble(antExChuModel.getPlatelet())); + } + }else{ ps.setNull(50,Types.INTEGER); } @@ -1055,27 +1061,33 @@ public class CdGwInterface { ps.setString(90,creatorId); ps.executeUpdate(); + try { //个人史 - if (!"无".equals(map.get("personalHistory").toString()) && StringUtils.isNotEmpty(antExChuModel.getPersonalHistory()) - && !"".equals(antExChuModel.getPersonalHistory())) { - - String inPerSql = "insert into WOMAN_PREFIRST_PERSONAL(LAST_UPDATE_DTIME,ORG_CODE,PREN_VISIT_FORM_NO,\n" + - "ID,HARM_FACTOR_CODE) \n" + - "values(?,?,?,?,?)"; - - ps = conn.prepareStatement(inPerSql); - ps.setDate(1, new Date(antExChuModel.getModified().getTime())); - ps.setString(2, code); - ps.setString(3, antExChuModel.getId()); - ps.setString(4, antExChuModel.getId()); - if(map.get("personalHistory") != null){ - ps.setString(5, map.get("personalHistory").toString()); - }else{ - ps.setString(5, null); + if (!"无".equals(map.get("personalHistory").toString()) && StringUtils.isNotEmpty(antExChuModel.getPersonalHistory()) + && !"".equals(antExChuModel.getPersonalHistory())) { + + String inPerSql = "insert into WOMAN_PREFIRST_PERSONAL(LAST_UPDATE_DTIME,ORG_CODE,PREN_VISIT_FORM_NO,\n" + + "ID,HARM_FACTOR_CODE) \n" + + "values(?,?,?,?,?)"; + + ps = conn.prepareStatement(inPerSql); + ps.setDate(1, new Date(antExChuModel.getModified().getTime())); + ps.setString(2, code); + ps.setString(3, antExChuModel.getId()); + ps.setString(4, antExChuModel.getId()); + if(map.get("personalHistory") != null){ + ps.setString(5, map.get("personalHistory").toString()); + }else{ + ps.setString(5, ""); + } + ps.executeUpdate(); } - ps.executeUpdate(); + }catch (Exception e) + { + } + try { //既往史 if (!"无".equals(map.get("pastHistory").toString()) && StringUtils.isNotEmpty(antExChuModel.getPastHistory()) && !"".equals(antExChuModel.getPastHistory())) { @@ -1088,33 +1100,42 @@ public class CdGwInterface { ps.setString(2, code); ps.setString(3, antExChuModel.getId()); ps.setString(4, antExChuModel.getId()); - ps.setString(5, null); + ps.setString(5, ""); ps.setDate(6, null); - if(map.get("pastHistory") != null){ + if (map.get("pastHistory") != null) { ps.setString(7, map.get("pastHistory").toString()); - }else{ + } else { ps.setString(7, null); } ps.executeUpdate(); } + }catch (Exception e) + { - //家族史 - if (!"无".equals(map.get("familyHistory").toString()) && StringUtils.isNotEmpty(antExChuModel.getFamilyHistory()) - && !"".equals(antExChuModel.getFamilyHistory())) { + } - String inFamSql = "insert into WOMAN_PREFIRSTVISIT_FAMHIS(LAST_UPDATE_DTIME,ORG_CODE,PREN_VISIT_FORM_NO,\n" + - "ID,PATIENT_RELATION_CODE,FAMILY_DISEASE_HISTORY_CODE,FAMILY_PAST_DISEASE_CODE) \n" + - "values(?,?,?,?,?,?,?)"; - ps = conn.prepareStatement(inFamSql); - ps.setDate(1, new Date(antExChuModel.getModified().getTime())); - ps.setString(2, code); - ps.setString(3, antExChuModel.getId()); - ps.setString(4, antExChuModel.getId()); - ps.setString(5, null); - ps.setString(6, null); - ps.setString(7, null); - ps.executeUpdate(); + try { + //家族史 + if (!"无".equals(map.get("familyHistory").toString()) && StringUtils.isNotEmpty(antExChuModel.getFamilyHistory()) + && !"".equals(antExChuModel.getFamilyHistory())) { + + String inFamSql = "insert into WOMAN_PREFIRSTVISIT_FAMHIS(LAST_UPDATE_DTIME,ORG_CODE,PREN_VISIT_FORM_NO,\n" + + "ID,PATIENT_RELATION_CODE,FAMILY_DISEASE_HISTORY_CODE,FAMILY_PAST_DISEASE_CODE) \n" + + "values(?,?,?,?,?,?,?)"; + ps = conn.prepareStatement(inFamSql); + ps.setDate(1, new Date(antExChuModel.getModified().getTime())); + ps.setString(2, code); + ps.setString(3, antExChuModel.getId()); + ps.setString(4, antExChuModel.getId()); + ps.setString(5, ""); + ps.setString(6, null); + ps.setString(7, null); + ps.executeUpdate(); + + } + }catch (Exception e) + { } return br;