shiyang / regional-platform

Download as
Browse Code ยป

Commit 2ab90413973ab648cceb104bfabcfca516d495f8

Authored by baohanddd
2 parents 0e6c8c2d6c 7f725b2ca0
Exists in master and in 1 other branch nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 4 changed files

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/VisitService.java View file @ 2ab9041
... ... @@ -34,7 +34,7 @@
34 34 query.start(visitQuery.getOffset()).end(visitQuery.getLimit());
35 35 }
36 36  
37   - return iVisitDao.queryVisit(query.addOrder(Direction.ASC, "id"));
  37 + return iVisitDao.queryVisit(query.addOrder(Direction.ASC, "days"));
38 38 }
39 39  
40 40  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java View file @ 2ab9041
... ... @@ -29,7 +29,7 @@
29 29 * Created by zhang.rui on 2015/9/28 0028.
30 30 */
31 31 @Controller
32   -public class OrganizationController extends RestController {
  32 +public class OrganizationController extends BaseController {
33 33 @Autowired
34 34 private UsersService usersService;
35 35 @Autowired
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyVisitAddRequest.java View file @ 2ab9041
... ... @@ -775,6 +775,8 @@
775 775 babyModel.setMphone(mphone);
776 776 babyModel.setMjob(mjob);
777 777 babyModel.setWeek(week);
  778 + babyModel.setOrg(org);
  779 + babyModel.setsNumber(sNumber);
778 780 return babyModel;
779 781 }
780 782  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/VisitAddRequest.java View file @ 2ab9041
... ... @@ -495,7 +495,7 @@
495 495 }
496 496 patients.setCardNo(cardNo);
497 497 patients.setPhone(phone);
498   - patients.setDueDate(new Date());
  498 + patients.setDueDate(DateUtil.parseYMD(dueDate));
499 499 patients.setDeliverOrg(deliverOrg);
500 500 patients.setDueType(dueType);
501 501 patients.setAddress(address);
... ... @@ -527,7 +527,7 @@
527 527 visit.setNextvisit(nextVisit);
528 528 visit.setNumOfLive(numOfLive);
529 529 visit.setOther(other);
530   -
  530 + visit.setId(id);
531 531 visit.setWound(wound);
532 532 visit.setXinType(xinType);
533 533 visit.setParentId(parentId);