jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 9921ed15d6a074520a6d0b3d571d93aaceda7d8e

Authored by jiangjiazhi
2 parents 08636eac64 90c3f56b2c
Exists in master and in 8 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping, nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 4 changed files

platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java View file @ 9921ed1
... ... @@ -742,25 +742,25 @@
742 742 // System.out.println(s);
743 743 // Date s = addDay(parseYMD("2016-02-26"), 168);
744 744  
745   -// int start = 37;
746   -// int end = 37;
  745 + int start = 3;
  746 + int end = 3;
747 747 //
748 748 //
749 749 // Date startDate = DateUtil.getNewDate(-end-1,"周",1+1);
750 750 // Date endDate = DateUtil.getNewDate(-start,"周",0+1);
751 751  
752 752  
753   -// Date startDate = DateUtil.getNewDate(-end,"天",1);
754   -// Date endDate = DateUtil.getNewDate(-start,"天",1);
  753 + Date startDate = DateUtil.getNewDate(-end-1,"月",1);
  754 + Date endDate = DateUtil.getNewDate(-start,"月",1);
755 755  
756   -// System.out.println(startDate + "==="+ endDate);
  756 + System.out.println(startDate + "==="+ endDate);
757 757  
758 758  
759 759 // Date startDate = getRangeDate(parseYMD("2016-09-07"),2,"周",-1);
760 760 // System.out.println(getyyyy_MM_dd(startDate));
761 761  
762   - int a = daysBetween(parseYMD("2013-09-13"),new Date())/7;
763   - System.out.println(a);
  762 +// int a = daysBetween(parseYMD("2013-09-13"),new Date())/7;
  763 +// System.out.println(a);
764 764 } catch (Exception e)
765 765 {
766 766  
platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java View file @ 9921ed1
... ... @@ -237,7 +237,7 @@
237 237 }
238 238 }
239 239 boolean isRisk = false;
240   - if (weekNum < WeekEnums.getIdByName(week))
  240 + if (weekNum > WeekEnums.getIdByName(week))
241 241 {
242 242 /**
243 243 * 高危短信
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java View file @ 9921ed1
... ... @@ -177,7 +177,7 @@
177 177 @TokenRequired
178 178 public BaseResponse queryChanQianSieve(@Valid CqSieveQueryRequest cqSieveQueryRequest,HttpServletRequest request){
179 179 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
180   - return sieveFacade.queryList(cqSieveQueryRequest,loginState.getId());
  180 + return sieveFacade.queryList(cqSieveQueryRequest,loginState.getId(),"true");
181 181 }
182 182  
183 183  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java View file @ 9921ed1
... ... @@ -169,7 +169,7 @@
169 169 * @param cqSieveQueryRequest
170 170 * @return
171 171 */
172   - public BaseResponse queryList(CqSieveQueryRequest cqSieveQueryRequest,Integer userId) {
  172 + public BaseResponse queryList(CqSieveQueryRequest cqSieveQueryRequest,Integer userId,String needPage) {
173 173 SieveQuery sieveQuery = new SieveQuery();
174 174 sieveQuery.setYn(YnEnums.YES.getId());
175 175 sieveQuery.setPhone(cqSieveQueryRequest.getPhone());
... ... @@ -188,7 +188,7 @@
188 188 sieveQuery.setStatus(cqSieveQueryRequest.getIsNotify());
189 189 sieveQuery.setPage(cqSieveQueryRequest.getPage());
190 190 sieveQuery.setLimit(cqSieveQueryRequest.getLimit());
191   - sieveQuery.setNeed("1");
  191 + sieveQuery.setNeed(needPage);
192 192 String hospitalId=autoMatchFacade.getHospitalId(userId);
193 193 sieveQuery.setHospitalId(hospitalId);
194 194 //查询产筛list
... ... @@ -238,7 +238,7 @@
238 238 public void exportCqsieves(CqSieveQueryRequest cqSieveQueryRequest, Integer id, HttpServletResponse response) {
239 239 try {
240 240  
241   - BaseListResponse listResponse = (BaseListResponse)queryList(cqSieveQueryRequest, id);
  241 + BaseListResponse listResponse = (BaseListResponse)queryList(cqSieveQueryRequest, id,null);
242 242  
243 243 List<SieveListResult> list = listResponse.getData();
244 244 List<Map<String,Object>> datas = new ArrayList<>();
... ... @@ -263,7 +263,7 @@
263 263 OutputStream out = response.getOutputStream();
264 264 Map<String,String> cnames = new HashMap<>();
265 265 cnames.put("name", "姓名");
266   - cnames.put("sex","当前孕周");
  266 + cnames.put("cDueWeek","当前孕周");
267 267 cnames.put("tireNumber","胎数");
268 268 cnames.put("dueWeek", "申请孕周");
269 269 cnames.put("ztfxText", "整体风险");