shiyang / regional-platform

Download as
Browse Code »

Commit 04977e533cd4111ab5c0a4c405a86526d678439a

Authored by jiangjiazhi
2 parents 2c921d42ec 54289bbc4c
Exists in master and in 1 other branch nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 2 changed files

platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java View file @ 04977e5
... ... @@ -759,7 +759,7 @@
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("2016-08-30"),new Date());
  762 + int a = daysBetween(parseYMD("2013-09-13"),new Date())/7;
763 763 System.out.println(a);
764 764 } catch (Exception e)
765 765 {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java View file @ 04977e5
... ... @@ -652,6 +652,7 @@
652 652 data.put("checkDoctor", rp.getCheckDoctor());
653 653 data.put("lName", rp.getlName());
654 654 data.put("phone", rp.getPhone());
  655 + data.put("serviceType", rp.getServiceType());
655 656 datas.add(data);
656 657 }
657 658 cnames.put("name", "姓名");