Commit e3ba4db96a6160843204e0db015ad581f79a27ac
1 parent
2a3e053039
Exists in
master
and in
6 other branches
秦皇岛基本公卫
Showing 1 changed file with 13 additions and 4 deletions
platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdJbgwInterface.java
View file @
e3ba4db
| ... | ... | @@ -214,10 +214,16 @@ |
| 214 | 214 | if(allList != null && allList.size() > 0){ |
| 215 | 215 | for(AntExChuModel antExChuModel : allList){ |
| 216 | 216 | try{ |
| 217 | + Map<String,String> map = new HashMap<String,String>(); | |
| 217 | 218 | Patients patients = patientsService.findOnePatientById(antExChuModel.getParentId()); |
| 218 | 219 | if("2100001705".equals(patients.getHospitalId())){ |
| 219 | 220 | continue; |
| 220 | 221 | } |
| 222 | + if("70ae1d93-2964-46bc-83fa-bec9ff605b1c".equals(patients.getHcertificateTypeId())){ | |
| 223 | + map.put("IDCARD",patients.getCardNo()); | |
| 224 | + }else{ | |
| 225 | + continue; | |
| 226 | + } | |
| 221 | 227 | //居住地址 |
| 222 | 228 | String jzSheng = CommonsHelper.getName1(patients.getProvinceRegisterId(), basicConfigService); |
| 223 | 229 | String jzShi = CommonsHelper.getName1(patients.getCityRegisterId(), basicConfigService); |
| ... | ... | @@ -240,7 +246,6 @@ |
| 240 | 246 | day = (int)Integer.parseInt(cDueWeek.substring(cDueWeek.indexOf("+")+1, cDueWeek.indexOf("天"))); |
| 241 | 247 | } |
| 242 | 248 | |
| 243 | - Map<String,String> map = new HashMap<String,String>(); | |
| 244 | 249 | //增加孕产登记 |
| 245 | 250 | if("农业户口".equals(getBasicConfig(patients.getPcensusTypeId()))){ |
| 246 | 251 | map.put("HOUSEHOLDTYPECODE", "1"); |
| ... | ... | @@ -256,9 +261,7 @@ |
| 256 | 261 | map.put("MENSESPERIOD",patients.getMensStartDay()); |
| 257 | 262 | map.put("MATERNALINFOID",patients.getId()); |
| 258 | 263 | map.put("NAME",patients.getUsername()); |
| 259 | - if("70ae1d93-2964-46bc-83fa-bec9ff605b1c".equals(patients.getHcertificateTypeId())){ | |
| 260 | - map.put("IDCARD",patients.getCardNo()); | |
| 261 | - } | |
| 264 | + | |
| 262 | 265 | map.put("TELNO",patients.getPhone()); |
| 263 | 266 | map.put("BIRTHDAY",DateUtil.getyyyy_MM_dd(patients.getBirth())); |
| 264 | 267 | map.put("AGE",DateUtil.getAge(patients.getBirth()).toString()); |
| ... | ... | @@ -308,6 +311,12 @@ |
| 308 | 311 | } |
| 309 | 312 | if(antExChuModel.getDelivery() != null){ |
| 310 | 313 | map.put("VAGINALDELIVERYTIMES",antExChuModel.getDelivery().toString()); |
| 314 | + } | |
| 315 | + if(antExChuModel.getYinchan() != null){ | |
| 316 | + map.put("yinchan",antExChuModel.getYinchan().toString()); | |
| 317 | + } | |
| 318 | + if(antExChuModel.getGongwaiyun() != null){ | |
| 319 | + map.put("gongwaiyun",antExChuModel.getGongwaiyun().toString()); | |
| 311 | 320 | } |
| 312 | 321 | if(antExChuModel.getPlanedProd() != null){ |
| 313 | 322 | map.put("CAESAREANDELIVERYTIMES",antExChuModel.getPlanedProd().toString()); |