diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java index a94ed55..2b687a0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java @@ -193,4 +193,19 @@ public class SieveController extends BaseController { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); sieveFacade.exportCqsieves(cqSieveQueryRequest, loginState.getId(),response); } + + + /** + * 产筛备注保存 + * @param cqId 产筛id + * @param qsTypeId 备注类型Id + * @param detail 详情 + * @return + */ + @ResponseBody + @RequestMapping(value = "/saveCqRemark",method = RequestMethod.GET) + @TokenRequired + public BaseResponse saveCqRemark(@RequestParam(required = true)String cqId,@RequestParam(required = true)String qsTypeId,@RequestParam(required = false)String detail) { + return sieveFacade.saveCqRemark(cqId,qsTypeId,detail); + } } \ No newline at end of file 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 9179834..e348a7d 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 @@ -189,10 +189,10 @@ public class SieveFacade { sieveQuery.setDueWeekEnd(7 * Integer.valueOf(cqSieveQueryRequest.getDueWeekEnd()) + 6); } if(null!=cqSieveQueryRequest.getcDueWeekStart()){ - sieveQuery.setLastMensesEnd(DateUtil.addDay(DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(new Date())), -(cqSieveQueryRequest.getcDueWeekStart()*7))); + sieveQuery.setLastMensesEnd(DateUtil.addDay(DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(new Date())), -(cqSieveQueryRequest.getcDueWeekStart() * 7))); } if(null!=cqSieveQueryRequest.getcDueWeekEnd()){ - sieveQuery.setLastMensesStart(DateUtil.addDay(DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(new Date())), -(cqSieveQueryRequest.getcDueWeekEnd()*7)-6)); + sieveQuery.setLastMensesStart(DateUtil.addDay(DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(new Date())), -(cqSieveQueryRequest.getcDueWeekEnd() * 7) - 6)); } sieveQuery.setZtfx(cqSieveQueryRequest.getZtfx()); @@ -203,7 +203,7 @@ public class SieveFacade { String hospitalId = autoMatchFacade.getHospitalId(userId); sieveQuery.setHospitalId(hospitalId); //查询产筛list - List list = sieveService.queryList1(sieveQuery,"status"); + List list = sieveService.queryList1(sieveQuery, "status"); List data = new ArrayList<>(); if (CollectionUtils.isNotEmpty(list)) { for (SieveModel sieveModel : list) { @@ -259,13 +259,16 @@ public class SieveFacade { Map data = new HashMap<>(); data.put("name", sive.getName()); data.put("cDueWeek", sive.getcDueWeek()); + data.put("statusText", sive.getStatusText()); + data.put("ztfxText", sive.getZtfxText()); data.put("tireNumber", sive.getTireNumber()); data.put("dueWeek", sive.getDueWeek()); - data.put("ztfxText", sive.getZtfxText()); - data.put("phone", sive.getRealPhone()); data.put("cqStatus", sive.getCqStatus()); data.put("cqResult", sive.getCqResult()); data.put("renShenResult", sive.getRenShenResult()); + data.put("phone", sive.getRealPhone()); + data.put("remarkTypeText", sive.getCsRemarkTypeText()); + data.put("detail", sive.getDetail()); datas.add(data); } } @@ -273,19 +276,39 @@ public class SieveFacade { Map cnames = new LinkedHashMap<>(); cnames.put("name", "姓名"); cnames.put("cDueWeek", "当前孕周"); + cnames.put("statusText", "当前状态"); + cnames.put("ztfxText", "整体风险"); cnames.put("tireNumber", "胎数"); cnames.put("dueWeek", "申请孕周"); - cnames.put("ztfxText", "整体风险"); - cnames.put("phone", "联系方式"); cnames.put("cqStatus", "产前诊断"); cnames.put("cqResult", "产前诊断结果"); cnames.put("renShenResult", "妊娠结局"); + cnames.put("phone", "联系方式"); + cnames.put("remarkTypeText", "备注"); + cnames.put("detail", "详情"); response.setContentType("application/octet-stream"); response.setCharacterEncoding("UTF-8"); - response.setHeader("Content-Disposition", "attachment;fileName=" + "childDatas.xls"); + response.setHeader("Content-Disposition", "attachment;fileName=" + "csdata.xls"); ExcelUtil.toExcel(out, datas, cnames); } catch (Exception e) { } } + + /** + * 修改产筛 备注 + * @param csId + * @param qsTypeId + * @param detail + * @return + */ + public BaseResponse saveCqRemark(String csId, String qsTypeId, String detail) { + + SieveModel sieve = new SieveModel(); + sieve.setId(csId); + sieve.setCsRemarkTypeId(qsTypeId); + sieve.setDetail(detail); + sieveService.updateOneChanQianDiaSieve(sieve); + return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); + } } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveListResult.java index 0fbfae1..2e408ce 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveListResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveListResult.java @@ -37,6 +37,37 @@ public class SieveListResult implements IBasicResultConvert