jiangjiazhi / regional-platform

Download as
Browse Code »

Commit c8668b599cb679ecdae2b567bc6dd52554313395

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

儿心量表业务添加

Showing 4 changed files with 46 additions and 37 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEvaluationCriterionController.java View file @ c8668b5
... ... @@ -55,7 +55,7 @@
55 55 @TokenRequired
56 56 @RequestMapping(method = RequestMethod.POST, value = "/query")
57 57 private BaseResponse query(@RequestBody JSONObject jsonObject, HttpServletRequest request) {
58   - return babyEvaluationCriterionService.query(getUserId(request), jsonObject);
  58 + return babyEvaluationCriterionService.query(getUserId(request), jsonObject, false);
59 59 }
60 60  
61 61  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java View file @ c8668b5
... ... @@ -799,6 +799,7 @@
799 799 */
800 800 @RequestMapping(value = "/scale", method = RequestMethod.POST)
801 801 @ResponseBody
  802 + @TokenRequired
802 803 public BaseResponse scaleDetail(@RequestParam String babyId, HttpServletRequest request) {
803 804 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
804 805 return viewFacade.scaleDetail(babyId, loginState.getId());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ c8668b5
... ... @@ -6088,7 +6088,7 @@
6088 6088 private HashMap<String, String> getTenItem(String babyId, Integer userId) {
6089 6089 JSONObject jsonObject = new JSONObject();
6090 6090 jsonObject.put("babyId", babyId);
6091   - BaseResponse baseQuery = babyEvaluationCriterionService.query(userId, jsonObject);
  6091 + BaseResponse baseQuery = babyEvaluationCriterionService.query(userId, jsonObject, true);
6092 6092 Object object = baseQuery.getObject();
6093 6093 HashMap<String, String> hashMap = new HashMap<>();
6094 6094 // 运动智龄、发育商
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEvaluationCriterionServiceImpl.java View file @ c8668b5
... ... @@ -203,19 +203,22 @@
203 203 if (neuroPsychologicalId == null) {
204 204 neuroPsychologicalId = oneId;
205 205 }
206   - BabyEvaluationCriterionModel criterionModel = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(oneId)), BabyEvaluationCriterionModel.class);
207   - // 1/大动作 2/精细动作 3/适应能力 4/语音 5/社交行为
208   - if (criterionModel != null) {
209   - if ("1".equals(criterionModel.getProjectType())) {
210   - double1Z += criterionModel.getProjectVal();
211   - } else if ("2".equals(criterionModel.getProjectType())) {
212   - double2Z += criterionModel.getProjectVal();
213   - } else if ("3".equals(criterionModel.getProjectType())) {
214   - double3Z += criterionModel.getProjectVal();
215   - } else if ("4".equals(criterionModel.getProjectType())) {
216   - double4Z += criterionModel.getProjectVal();
217   - } else if ("5".equals(criterionModel.getProjectType())) {
218   - double5Z += criterionModel.getProjectVal();
  206 + List<String> oneConfigIds = one.getConfigId();
  207 + for (String oneConfigId : oneConfigIds) {
  208 + BabyEvaluationCriterionModel criterionModel = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(oneConfigId)), BabyEvaluationCriterionModel.class);
  209 + // 1/大动作 2/精细动作 3/适应能力 4/语音 5/社交行为
  210 + if (criterionModel != null) {
  211 + if (1 == criterionModel.getProjectType()) {
  212 + double1Z += criterionModel.getProjectVal();
  213 + } else if (2 == criterionModel.getProjectType()) {
  214 + double2Z += criterionModel.getProjectVal();
  215 + } else if (3 == criterionModel.getProjectType()) {
  216 + double3Z += criterionModel.getProjectVal();
  217 + } else if (4 == criterionModel.getProjectType()) {
  218 + double4Z += criterionModel.getProjectVal();
  219 + } else if (5 == criterionModel.getProjectType()) {
  220 + double5Z += criterionModel.getProjectVal();
  221 + }
219 222 }
220 223 }
221 224 }
... ... @@ -365,7 +368,7 @@
365 368 * @return
366 369 */
367 370 @Override
368   - public BaseResponse query(Integer userId, JSONObject jsonObject) {
  371 + public BaseResponse query(Integer userId, JSONObject jsonObject, boolean isPush) {
369 372 String hospitalId = autoMatchFacade.getHospitalId(userId);
370 373 String babyId = jsonObject.getString("babyId");
371 374 BaseResponse baseResponse = new BaseResponse();
372 375  
373 376  
374 377  
... ... @@ -379,30 +382,35 @@
379 382 String checkMonthStr = "";
380 383 if (CollectionUtils.isNotEmpty(models)) {
381 384  
382   - // 若该儿童做过该项检查，一次查出
383   - for (BabyNeuroPsychologicalModel model : models) {
384   - BaseResponse itemListByBabyId = getItemListByBabyId(model.getBabyId(), model.getCheckMonth(), model.getId());
385   - if (itemListByBabyId.getErrorcode() != 0) {
386   - // 出错直接return
387   - return itemListByBabyId;
388   - }
389   - Map<String, Object> objectMap = (Map<String, Object>) itemListByBabyId.getObject();
390   - objectMap.put("checkTimeStr", DateUtil.getyyyy_MM_dd(model.getCreateTime()));
391   - BabyModel babyModel = mongoTemplate.findOne(Query.query(Criteria.where("id").is(babyId)), BabyModel.class);
392   - if (babyModel != null) {
393   - checkMonthStr = DateUtil.getBabyMonthAge(babyModel.getBirth(), model.getCreateTime());
394   - }
395   - objectMap.put("checkMonth", checkMonthStr);
396   - objectMap.put("id", model.getId());
  385 + if (isPush){
  386 + BabyNeuroPsychologicalModel model = models.get(models.size() - 1);
  387 + BaseResponse response = getItemListByBabyId(model.getBabyId(), model.getCheckMonth(), model.getId());
  388 + return response;
  389 + } else {
  390 + // 若该儿童做过该项检查，一次查出
  391 + for (BabyNeuroPsychologicalModel model : models) {
  392 + BaseResponse itemListByBabyId = getItemListByBabyId(model.getBabyId(), model.getCheckMonth(), model.getId());
  393 + if (itemListByBabyId.getErrorcode() != 0) {
  394 + // 出错直接return
  395 + return itemListByBabyId;
  396 + }
  397 + Map<String, Object> objectMap = (Map<String, Object>) itemListByBabyId.getObject();
  398 + objectMap.put("checkTimeStr", DateUtil.getyyyy_MM_dd(model.getCreateTime()));
  399 + BabyModel babyModel = mongoTemplate.findOne(Query.query(Criteria.where("id").is(babyId)), BabyModel.class);
  400 + if (babyModel != null) {
  401 + checkMonthStr = DateUtil.getBabyMonthAge(babyModel.getBirth(), model.getCreateTime());
  402 + }
  403 + objectMap.put("checkMonth", checkMonthStr);
  404 + objectMap.put("id", model.getId());
397 405  
398   - // 发育商、智能、等级评价
399   - objectMap.put("developmentQuotient", model.getDevelopmentQuotient());
400   - objectMap.put("aptitudeName", model.getAptitudeName());
401   - objectMap.put("levelName", model.getLevelName());
  406 + // 发育商、智能、等级评价
  407 + objectMap.put("developmentQuotient", model.getDevelopmentQuotient());
  408 + objectMap.put("aptitudeName", model.getAptitudeName());
  409 + objectMap.put("levelName", model.getLevelName());
402 410  
403   - objectList.add(objectMap);
  411 + objectList.add(objectMap);
  412 + }
404 413 }
405   -
406 414 }
407 415  
408 416 // 根据当前儿童显示项目领域的配置信息，以供save