diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdJbgwInterface.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdJbgwInterface.java index e6c3290..e575006 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdJbgwInterface.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdJbgwInterface.java @@ -214,10 +214,16 @@ public class QhdJbgwInterface { if(allList != null && allList.size() > 0){ for(AntExChuModel antExChuModel : allList){ try{ + Map map = new HashMap(); Patients patients = patientsService.findOnePatientById(antExChuModel.getParentId()); if("2100001705".equals(patients.getHospitalId())){ continue; } + if("70ae1d93-2964-46bc-83fa-bec9ff605b1c".equals(patients.getHcertificateTypeId())){ + map.put("IDCARD",patients.getCardNo()); + }else{ + continue; + } //居住地址 String jzSheng = CommonsHelper.getName1(patients.getProvinceRegisterId(), basicConfigService); String jzShi = CommonsHelper.getName1(patients.getCityRegisterId(), basicConfigService); @@ -240,7 +246,6 @@ public class QhdJbgwInterface { day = (int)Integer.parseInt(cDueWeek.substring(cDueWeek.indexOf("+")+1, cDueWeek.indexOf("天"))); } - Map map = new HashMap(); //增加孕产登记 if("农业户口".equals(getBasicConfig(patients.getPcensusTypeId()))){ map.put("HOUSEHOLDTYPECODE", "1"); @@ -256,9 +261,7 @@ public class QhdJbgwInterface { map.put("MENSESPERIOD",patients.getMensStartDay()); map.put("MATERNALINFOID",patients.getId()); map.put("NAME",patients.getUsername()); - if("70ae1d93-2964-46bc-83fa-bec9ff605b1c".equals(patients.getHcertificateTypeId())){ - map.put("IDCARD",patients.getCardNo()); - } + map.put("TELNO",patients.getPhone()); map.put("BIRTHDAY",DateUtil.getyyyy_MM_dd(patients.getBirth())); map.put("AGE",DateUtil.getAge(patients.getBirth()).toString()); @@ -309,6 +312,12 @@ public class QhdJbgwInterface { if(antExChuModel.getDelivery() != null){ map.put("VAGINALDELIVERYTIMES",antExChuModel.getDelivery().toString()); } + if(antExChuModel.getYinchan() != null){ + map.put("yinchan",antExChuModel.getYinchan().toString()); + } + if(antExChuModel.getGongwaiyun() != null){ + map.put("gongwaiyun",antExChuModel.getGongwaiyun().toString()); + } if(antExChuModel.getPlanedProd() != null){ map.put("CAESAREANDELIVERYTIMES",antExChuModel.getPlanedProd().toString()); }