jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 08c84282e755185add36a7bba080c395610bc0a4

Authored by dongqin
1 parent 6886acd33a
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

修复bug

Showing 4 changed files with 25 additions and 20 deletions

platform-dal/src/main/java/com/lyms/platform/query/BabyNutritionQuery.java View file @ 08c8428
... ... @@ -38,14 +38,14 @@
38 38  
39 39 private String interpretDoctorId;
40 40  
41   - private String status;
  41 + private List<String> ids;
42 42  
43   - public String getStatus() {
44   - return status;
  43 + public List<String> getIds() {
  44 + return ids;
45 45 }
46 46  
47   - public void setStatus(String status) {
48   - this.status = status;
  47 + public void setIds(List<String> ids) {
  48 + this.ids = ids;
49 49 }
50 50  
51 51 @Override
... ... @@ -76,8 +76,8 @@
76 76 condition = condition.and("doctorId", doctorId, MongoOper.IS);
77 77 }
78 78  
79   - if (null != status) {
80   - condition = condition.and("status", status, MongoOper.IS);
  79 + if (CollectionUtils.isNotEmpty(ids)) {
  80 + condition = condition.and("id", ids, MongoOper.IN);
81 81 }
82 82  
83 83  
platform-dal/src/main/java/com/lyms/platform/query/HealthChargeQuery.java View file @ 08c8428
... ... @@ -171,7 +171,7 @@
171 171 }
172 172  
173 173 if (CollectionUtils.isNotEmpty(ids)) {
174   - condition = condition.and("id", ids, MongoOper.IN);
  174 + condition = condition.and("babyForeignId", ids, MongoOper.IN);
175 175 }
176 176  
177 177 if (CollectionUtils.isNotEmpty(hospitalIds)){
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyNutritionController.java View file @ 08c8428
... ... @@ -5,6 +5,7 @@
5 5 import com.lyms.platform.common.base.BaseController;
6 6 import com.lyms.platform.common.result.BaseObjectResponse;
7 7 import com.lyms.platform.common.result.BaseResponse;
  8 +import com.lyms.platform.common.utils.DateUtil;
8 9 import com.lyms.platform.operate.web.facade.BabyNutritionFacade;
9 10 import com.lyms.platform.operate.web.request.BabyNutritionRequest;
10 11 import com.lyms.platform.operate.web.request.BabyNutritionSettleRequest;
... ... @@ -146,6 +147,7 @@
146 147 @TokenRequired
147 148 public BaseResponse unSettleList(@Valid @RequestBody BabyNutritionSettleRequest request,
148 149 HttpServletRequest httpServletRequest) {
  150 + getStartTimeAndEndTime(request);
149 151 return babyNutritionFacade.unSettleList(request, getUserId(httpServletRequest));
150 152 }
151 153  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java View file @ 08c8428
... ... @@ -245,9 +245,18 @@
245 245 if (StringUtils.isNotEmpty(interpretDoctorId)) {
246 246 babyQuery.setInterpretDoctorId(interpretDoctorId);
247 247 }
  248 + ArrayList<String> arrayList = new ArrayList<>();
248 249 if (StringUtils.isNotEmpty(settleStatus)) {
249   - babyQuery.setStatus(settleStatus);
  250 + List<HealthChargeModel> models = mongoTemplate.find(Query.query(Criteria.where("status").is(settleStatus).and("healthType").is("5")), HealthChargeModel.class);
  251 + if (CollectionUtils.isNotEmpty(models)) {
  252 + for (HealthChargeModel model : models) {
  253 + arrayList.add(model.getId());
  254 + }
  255 + }
250 256 }
  257 + if (arrayList.size() > 0) {
  258 + babyQuery.setIds(arrayList);
  259 + }
251 260  
252 261 if (StringUtils.isNotEmpty(recordTime)) {
253 262 String[] dates = recordTime.split(" - ");
... ... @@ -262,17 +271,10 @@
262 271 if (CollectionUtils.isNotEmpty(models)) {
263 272 for (BabyNutritionModel model : models) {
264 273 Integer currentSettleStatus = getSettleStatus(model);
265   - if (settleStatus != null) {
266   - if (currentSettleStatus != null && (currentSettleStatus == Integer.parseInt(settleStatus))) {
267   - // 组织数据格式
268   - Map mapData = getMapData(model, currentSettleStatus);
269   - list.add(mapData);
270   - }
271   - } else {
272   - // 组织数据格式
273   - Map mapData = getMapData(model, currentSettleStatus);
274   - list.add(mapData);
275   - }
  274 +
  275 + // 组织数据格式
  276 + Map mapData = getMapData(model, currentSettleStatus);
  277 + list.add(mapData);
276 278 }
277 279 }
278 280  
... ... @@ -1051,6 +1053,7 @@
1051 1053 private List<BabyModel> getBabyModels(String findNo, String babyForeignId) {
1052 1054 BabyModelQuery babyQuery = new BabyModelQuery();
1053 1055 babyQuery.setQueryNo(findNo);
  1056 + babyQuery.setMphone(findNo);
1054 1057 babyQuery.setYn(YnEnums.YES.getId());
1055 1058 if (babyForeignId != null) {
1056 1059 babyQuery.setId(babyForeignId);