Commit d116dd82f20749bc0d964f8e839cad4c76d29afb
1 parent
20bdcf2f0d
Exists in
master
and in
7 other branches
update code
Showing 2 changed files with 29 additions and 20 deletions
platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyFmService.java
View file @
d116dd8
... | ... | @@ -61,10 +61,11 @@ |
61 | 61 | Connection conn = ConnTools.makeFmConnection(); |
62 | 62 | QueryRunner queryRunner = new QueryRunner(); |
63 | 63 | SimpleDateFormat fmt = new SimpleDateFormat("yyyyMMddHH:mm:ss"); |
64 | + SimpleDateFormat fmt1 = new SimpleDateFormat("yyyy-MM-dd HH:mm"); | |
64 | 65 | try {//select count(*) from JHMK_FMJL where CONVERT(varchar(16),SSRQ, 20) > CONVERT(varchar(16),'20170110', 20) |
65 | 66 | List<FmItem> list = queryRunner.query(conn, "select * from JHMK_FMJL where " + |
66 | 67 | " CONVERT(varchar(50),SSRQ, 20) > CONVERT(varchar(50),'"+start+"', 20) and CONVERT(varchar(50),SSRQ, 20) <= CONVERT(varchar(50),'"+end+"', 20)" + |
67 | - "and SYXH not in (select SYXH from JHMK_FMJL where JSZ is not null and SC is not null and TZ is not null and YFZ is not null and SH is not null and (SFFZRSTDT = ' 是 ' or SFSTDT = ' 是 '))", new BeanListHandler<FmItem>(FmItem.class)); | |
68 | + " and SYXH not in (select SYXH from JHMK_FMJL where JSZ is not null and SC is not null and TZ is not null and YFZ is not null and SH is not null and (SFFZRSTDT = ' 是 ' or SFSTDT = ' 是 '))", new BeanListHandler<FmItem>(FmItem.class)); | |
68 | 69 | if (CollectionUtils.isNotEmpty(list)) { |
69 | 70 | for(FmItem item : list) |
70 | 71 | { |
... | ... | @@ -175,8 +176,8 @@ |
175 | 176 | List<MaternalDeliverModel.Baby> babies = new ArrayList<>(); |
176 | 177 | MaternalDeliverModel.Baby baby = new MaternalDeliverModel.Baby(); |
177 | 178 | Map<String,String> as = new HashMap<>(); |
178 | - as.put("pf1",item.getYfz()); | |
179 | - as.put("pf5",item.getWfz()); | |
179 | + as.put("pf1", item.getYfz()); | |
180 | + as.put("pf5", item.getWfz()); | |
180 | 181 | as.put("pf10", item.getSfz()); |
181 | 182 | baby.setApgarScore(JsonUtil.obj2JsonString(as)); |
182 | 183 | baby.setBabyGender("男".equals(item.getYexb()) ? "1" : "0"); |
... | ... | @@ -186,7 +187,7 @@ |
186 | 187 | baby.setAsphyxiaM(item.getZx()); //窒息分钟 |
187 | 188 | baby.setPregnancyOut(RenShenJieJuEnums.getIdByName(item.getCcqk())); // 妊娠结局 |
188 | 189 | baby.setBabyHealthy(item.getYeqk()); //新生儿疾病 |
189 | - baby.setDueTime(item.getSsrq());//分娩时间 | |
190 | + baby.setDueTime(fmt1.format(dueDate));//分娩时间 | |
190 | 191 | babies.add(baby); |
191 | 192 | matDeliverFacade.addOrUpdateMatDeliver(deliverAddRequest, users.get(0).getId()); |
192 | 193 | } |
193 | 194 | |
194 | 195 | |
195 | 196 | |
... | ... | @@ -316,14 +317,22 @@ |
316 | 317 | |
317 | 318 | for (FmItem item1 : items) |
318 | 319 | { |
320 | + | |
321 | + String dueDateStr1 = item1.getSsrq(); | |
322 | + if (!StringUtils.isNotEmpty(dueDateStr1)) | |
323 | + { | |
324 | + continue; | |
325 | + } | |
326 | + Date dueDate1 = fmt.parse(dueDateStr1); | |
327 | + | |
319 | 328 | MaternalDeliverModel.ExtPlacenta extPlacenta = new MaternalDeliverModel.ExtPlacenta(); |
320 | - extPlacenta.setMcType(FmTypeEnums.getIdByName(item.getFmfs())); //分娩方式 | |
329 | + extPlacenta.setMcType(FmTypeEnums.getIdByName(item1.getFmfs())); //分娩方式 | |
321 | 330 | String tpmcType = ""; |
322 | - if ("手术产".equals(item.getTpmcfs())) | |
331 | + if ("手术产".equals(item1.getTpmcfs())) | |
323 | 332 | { |
324 | 333 | tpmcType = TpmcTypeEnums.O2.getId(); |
325 | 334 | } |
326 | - else if ("自然产出".equals(item.getTpmcfs())) | |
335 | + else if ("自然产出".equals(item1.getTpmcfs())) | |
327 | 336 | { |
328 | 337 | tpmcType = TpmcTypeEnums.O.getId(); |
329 | 338 | } |
330 | 339 | |
... | ... | @@ -332,18 +341,18 @@ |
332 | 341 | |
333 | 342 | MaternalDeliverModel.Baby baby = new MaternalDeliverModel.Baby(); |
334 | 343 | Map<String,String> as = new HashMap<>(); |
335 | - as.put("pf1",item.getYfz()); | |
336 | - as.put("pf5",item.getWfz()); | |
337 | - as.put("pf10", item.getSfz()); | |
344 | + as.put("pf1",item1.getYfz()); | |
345 | + as.put("pf5",item1.getWfz()); | |
346 | + as.put("pf10", item1.getSfz()); | |
338 | 347 | baby.setApgarScore(JsonUtil.obj2JsonString(as)); |
339 | - baby.setBabyGender("男".equals(item.getYexb()) ? "1" : "0"); | |
340 | - baby.setBabyHeight(item.getSc());//新生儿生长 | |
341 | - baby.setBabyWeight(item.getTz());//新生儿重量 | |
342 | - baby.setDeformity("无".equals(item.getJx()) ? 0 : 1); //畸形 0非畸形 1畸形 | |
343 | - baby.setAsphyxiaM(item.getZx()); //窒息分钟 | |
344 | - baby.setPregnancyOut(RenShenJieJuEnums.getIdByName(item.getCcqk())); // 妊娠结局 | |
345 | - baby.setBabyHealthy(item.getYeqk()); //新生儿疾病 | |
346 | - baby.setDueTime(item.getSsrq());//分娩时间 | |
348 | + baby.setBabyGender("男".equals(item1.getYexb()) ? "1" : "0"); | |
349 | + baby.setBabyHeight(item1.getSc());//新生儿生长 | |
350 | + baby.setBabyWeight(item1.getTz());//新生儿重量 | |
351 | + baby.setDeformity("无".equals(item1.getJx()) ? 0 : 1); //畸形 0非畸形 1畸形 | |
352 | + baby.setAsphyxiaM(item1.getZx()); //窒息分钟 | |
353 | + baby.setPregnancyOut(RenShenJieJuEnums.getIdByName(item1.getCcqk())); // 妊娠结局 | |
354 | + baby.setBabyHealthy(item1.getYeqk()); //新生儿疾病 | |
355 | + baby.setDueTime(fmt1.format(dueDate1));//分娩时间 | |
347 | 356 | babies.add(baby); |
348 | 357 | |
349 | 358 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
View file @
d116dd8
... | ... | @@ -800,7 +800,7 @@ |
800 | 800 | bm.setDueDate(DateUtil.parseYMD(b.getDueDate())); |
801 | 801 | bm.setDueType(b.getDueType()); |
802 | 802 | bm.setMalformation(b.getMalformation()); |
803 | - bm.setOrg(b.getDeliverOrg()); | |
803 | + bm.setDeliverOrg(b.getDeliverOrg()); | |
804 | 804 | bm.setBuildDoctor(b.getBuildDoctor()); |
805 | 805 | bm.setBuildDate(DateUtil.parseYMD(b.getBuildDate())); |
806 | 806 | bm.setServiceType(b.getServiceType()); |
... | ... | @@ -931,7 +931,7 @@ |
931 | 931 | result.setBabyHeight(model.getBabyHeight()); |
932 | 932 | result.setBabyWeight(model.getBabyWeight()); |
933 | 933 | result.setBabyHead(model.getBabyHead()); |
934 | - result.setDeliverOrg(model.getOrg()); | |
934 | + result.setDeliverOrg(model.getDeliverOrg()); | |
935 | 935 | result.setMalformation(model.getMalformation()); |
936 | 936 | result.setApgarScore(JsonUtil.str2Obj(model.getApgarScore(), Map.class)); |
937 | 937 |