Commit b795d0b8759d167672a34fe0f2ab0cb2a80c6e2d
1 parent
e7d3807780
Exists in
master
and in
6 other branches
更改创建时间
Showing 1 changed file with 6 additions and 5 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java
View file @
b795d0b
| ... | ... | @@ -933,10 +933,11 @@ |
| 933 | 933 | healthChargeQuery.setYn(YnEnums.YES.getId()); |
| 934 | 934 | healthChargeQuery.setHospitalId(request.getHospitalId()); |
| 935 | 935 | healthChargeQuery.setStatus(1); |
| 936 | - // 默认值-年初 | |
| 937 | - Date startDate = areaCountFacade.getStartDate(); | |
| 938 | - healthChargeQuery.setCreatedStart(startDate); | |
| 939 | - healthChargeQuery.setCreatedEnd(new Date()); | |
| 936 | + if (request.getStartTime() == null){ | |
| 937 | + Date startDate = areaCountFacade.getStartDate(); | |
| 938 | + healthChargeQuery.setCreatedStart(startDate); | |
| 939 | + healthChargeQuery.setCreatedEnd(new Date()); | |
| 940 | + } | |
| 940 | 941 | if (request.getStartTime() != null) { |
| 941 | 942 | healthChargeQuery.setCreatedStart(request.getStartTime()); |
| 942 | 943 | healthChargeQuery.setCreatedEnd(request.getEndTime()); |
| ... | ... | @@ -1034,7 +1035,7 @@ |
| 1034 | 1035 | hashMap.put("cardNo", mongoTemplateOne.getVcCardNo()); |
| 1035 | 1036 | hashMap.put("weight", weight); |
| 1036 | 1037 | hashMap.put("babyHeight", babyHeight); |
| 1037 | - hashMap.put("createTime", createTime); | |
| 1038 | + hashMap.put("createTime", healthChargeModel.getCreated()); | |
| 1038 | 1039 | hashMap.put("interpretDoctorName", doctorName); |
| 1039 | 1040 | hashMap.put("id", babyNutritionId); |
| 1040 | 1041 | list.add(hashMap); |