diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java index aadc01e..ca0899a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java @@ -85,7 +85,7 @@ public class SieveFacade { sieveModel.setHospitalId(hospitalId); sieveModel.setZtfx(sieveAddRequest.getMax()); sieveService.updateOneChanQianDiaSieve(sieveModel); - SieveModel sieveModel1 =sieveService.findOneById(list.get(0).getId()); + SieveModel sieveModel1 = sieveService.findOneById(list.get(0).getId()); SieveService.handOrder(sieveModel1); sieveService.updateOneChanQianDiaSieve(sieveModel1); return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); @@ -169,7 +169,7 @@ public class SieveFacade { sieveModel.setCqStatus(1); sieveService.updateOneChanQianDiaSieve(sieveModel); - SieveModel sieveModel1 =sieveService.findOneById(chanQianDiaAddRequest.getId()); + SieveModel sieveModel1 = sieveService.findOneById(chanQianDiaAddRequest.getId()); SieveService.handOrder(sieveModel1); sieveService.updateOneChanQianDiaSieve(sieveModel1); @@ -197,10 +197,10 @@ public class SieveFacade { if (null != cqSieveQueryRequest.getDueWeekEnd()) { sieveQuery.setDueWeekEnd(7 * Integer.valueOf(cqSieveQueryRequest.getDueWeekEnd()) + 6); } - if(null!=cqSieveQueryRequest.getcDueWeekStart()){ + if (null != cqSieveQueryRequest.getcDueWeekStart()) { sieveQuery.setLastMensesEnd(DateUtil.addDay(DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(new Date())), -(cqSieveQueryRequest.getcDueWeekStart() * 7))); } - if(null!=cqSieveQueryRequest.getcDueWeekEnd()){ + if (null != cqSieveQueryRequest.getcDueWeekEnd()) { sieveQuery.setLastMensesStart(DateUtil.addDay(DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(new Date())), -(cqSieveQueryRequest.getcDueWeekEnd() * 7) - 6)); } @@ -242,13 +242,13 @@ public class SieveFacade { sieveListResult.convertToResult(sieveModel); Patients patients = patientsService.findOnePatientById(sieveModel.getParentId()); if (null != patients) { - sieveListResult.setIsGravida(patients.getFmDate() != null ? "0" : "1"); + sieveListResult.setIsGravida((patients.getType() == 3 && patients.getFmDate() != null) ? "0" : "1"); if (null != patients.getDueStatus() && 1 == patients.getDueStatus()) sieveListResult.setcDueWeek("终止妊娠"); else if (patients.getType() == 3) { sieveListResult.setcDueWeek("已分娩"); } - sieveListResult.setAge(DateUtil.getAge(patients.getBirth())+"岁"); + sieveListResult.setAge(DateUtil.getAge(patients.getBirth()) + "岁"); } data.add(sieveListResult); } @@ -301,12 +301,13 @@ public class SieveFacade { response.setHeader("Content-Disposition", "attachment;fileName=" + "csdata.xls"); ExcelUtil.toExcel(out, datas, cnames); } catch (Exception e) { - ExceptionUtils.catchException(e,"产筛导出异常"); + ExceptionUtils.catchException(e, "产筛导出异常"); } } /** * 修改产筛 备注 + * * @param csId * @param qsTypeId * @param detail @@ -320,7 +321,7 @@ public class SieveFacade { sieve.setDetail(detail); sieveService.updateOneChanQianDiaSieve(sieve); - SieveModel sieveModel1 =sieveService.findOneById(csId); + SieveModel sieveModel1 = sieveService.findOneById(csId); SieveService.handOrder(sieveModel1); sieveService.updateOneChanQianDiaSieve(sieveModel1); return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");