fangcheng / regional-platform

Download as
Browse Code ยป

Commit fee7fef3a8d5555ed333551cd90a325c3ce628c7

Authored by rui.zhang
2 parents 21c3583d03 0a00a58e57
Exists in master and in 1 other branch nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 1 changed file

platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyVisitResult.java View file @ fee7fef
... ... @@ -732,10 +732,10 @@
732 732 setSkin(JsonUtil.str2Obj(destModel.getSkin(),Map.class));
733 733 setNose(JsonUtil.str2Obj(destModel.getNose(),Map.class));
734 734 setNextVisitAddr(destModel.getNextVisitAddr());
735   - setNextVisitDate(DateUtil.getYmd(destModel.getNextVisitDate()));
  735 + setNextVisitDate(DateUtil.getyyyy_MM_dd(destModel.getNextVisitDate()));
736 736 setCervicalMass(JsonUtil.str2Obj(destModel.getCervicalMass(),Map.class));
737 737 setComplexion(JsonUtil.str2Obj(destModel.getComplexion(),Map.class));
738   - setCurrentVisit(DateUtil.getYmd(destModel.getCurrentVisit()));
  738 + setCurrentVisit(DateUtil.getyyyy_MM_dd(destModel.getCurrentVisit()));
739 739 setDoctorSign(destModel.getDoctorSign());
740 740 setEye(JsonUtil.str2Obj(destModel.getEye(), Map.class));
741 741 setFunicle(JsonUtil.str2Obj(destModel.getFunicle(),Map.class));
... ... @@ -775,6 +775,7 @@
775 775 }
776 776  
777 777 public BabyVisitResult convertToResult1(BabyModel destModel, Address address) {
  778 + mname=destModel.getMname();
778 779 setmName(destModel.getMname());
779 780 setAge(DateUtil.getAge(destModel.getBirth()));
780 781 setmCardNo(destModel.getCardNo());