From cbde2fae69861ec686e1a99feec9bb73e16bfcc5 Mon Sep 17 00:00:00 2001 From: "[wangbo]" Date: Fri, 19 Jul 2019 10:31:54 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/common/dao/operator/MongoOper.java | 42 ++++++++++----------- .../lyms/platform/query/TrackDownRecordQuery.java | 5 ++- .../web/controller/PatientWeightController.java | 12 +++--- .../operate/web/facade/MeasureInfoFacade.java | 3 +- .../operate/web/facade/TrackDownFacade.java | 4 +- .../operate/web/service/PatientWeightService.java | 5 ++- .../web/service/impl/PatientWeightServiceImpl.java | 43 ++++++++++++---------- 7 files changed, 63 insertions(+), 51 deletions(-) diff --git a/platform-common/src/main/java/com/lyms/platform/common/dao/operator/MongoOper.java b/platform-common/src/main/java/com/lyms/platform/common/dao/operator/MongoOper.java index c6546ea..417c4a0 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/dao/operator/MongoOper.java +++ b/platform-common/src/main/java/com/lyms/platform/common/dao/operator/MongoOper.java @@ -1,28 +1,28 @@ package com.lyms.platform.common.dao.operator; + /** * 查询的操作符 - * - * @author Administrator * + * @author Administrator */ public enum MongoOper { - // 等于 - IS, - // 小于 - LT, - // 小于等于 - LTE, - // 大于 - GT, - // 大于等于 - GTE, - //不等于 - NE, - //模糊 - LIKE, - ALL, - //是否存在 - EXISTS, - NIN, - IN; + // 等于 + IS, + // 小于 + LT, + // 小于等于 + LTE, + // 大于 + GT, + // 大于等于 + GTE, + //不等于 + NE, + //模糊 + LIKE, + ALL, + //是否存在 + EXISTS, + NIN, + IN; } \ No newline at end of file diff --git a/platform-dal/src/main/java/com/lyms/platform/query/TrackDownRecordQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/TrackDownRecordQuery.java index 0496f8c..b40993e 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/TrackDownRecordQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/TrackDownRecordQuery.java @@ -5,6 +5,7 @@ import com.lyms.platform.common.dao.BaseQuery; import com.lyms.platform.common.dao.operator.MongoCondition; import com.lyms.platform.common.dao.operator.MongoOper; import com.lyms.platform.common.dao.operator.MongoQuery; +import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.StringUtils; import org.springframework.data.mongodb.core.query.Criteria; @@ -373,9 +374,9 @@ public class TrackDownRecordQuery extends BaseQuery implements IConvertToNativeQ } if (null != followupStatus) { if (followupStatus == 0) { - condition = condition.and("appointmentDate", new Date(), MongoOper.GTE); + condition = condition.and("appointmentDate", new Date(), MongoOper.GT); } else if (followupStatus == 1) { - condition = condition.and("appointmentDate", new Date(), MongoOper.LTE); + condition = condition.and("appointmentDate", new Date(), MongoOper.LT); } else if (followupStatus == 2) { condition = condition.and("stop", "1", MongoOper.IS); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientWeightController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientWeightController.java index aa049a7..51a22be 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientWeightController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientWeightController.java @@ -33,7 +33,7 @@ public class PatientWeightController extends BaseController { @ResponseBody @RequestMapping(method = RequestMethod.POST) @TokenRequired - public BaseResponse addOrUpdate(@RequestParam(value = "doctorId", required = false) String doctorId, PatientWeight patientWeight, HttpServletRequest request) { + public BaseResponse addOrUpdate(@RequestParam(value = "doctorId", required = false) String doctorId, PatientWeight patientWeight, HttpServletRequest request) { return patientWeightService.addOrUpdate(getUserId(request), patientWeight, doctorId); } @@ -93,10 +93,12 @@ public class PatientWeightController extends BaseController { @TokenRequired public BaseResponse report(@PathVariable String id, HttpServletRequest request, - @RequestParam(value = "rid", required = false) String rid) { - return patientWeightService.report(id, getUserId(request), rid); + @RequestParam(value = "rid", required = false) String rid, + String version) { + return patientWeightService.report(id, getUserId(request), rid, version); } + /** * 体重报告(小程序和app使用) */ @@ -261,11 +263,11 @@ public class PatientWeightController extends BaseController { @TokenRequired public BaseResponse getWeightsReport(@PathVariable String pid, HttpServletRequest request, - @RequestParam(value = "rid", required = false) String rid) { + @RequestParam(value = "rid", required = false) String rid, String version) { if (pid.isEmpty() || "null".equals(pid)) { return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.USER_PASSWORD_ERROR).setErrormsg("pid值不能为空!"); } - return patientWeightService.getWeightsReport(pid, getUserId(request), rid); + return patientWeightService.getWeightsReport(pid, getUserId(request), rid, version); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java index 1b62c54..7af620e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java @@ -955,7 +955,8 @@ public class MeasureInfoFacade { Patients patients = patientsService.findOnePatientById(nutritionInfoRequest.getPatientId()); List patientWeights = patientWeightService2.queryPatientWeight(Query.query(Criteria.where("patientId").is(nutritionInfoRequest.getPatientId()))); - String hospitalId = nutritionInfoRequest.getHospitalId(); + String hospitalId = nutritionInfoRequest.getHospitalId().trim(); + Map dayWeights = new LinkedHashMap<>(); List> dayWeights2 = new ArrayList<>(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java index 7b628ce..eaabcfb 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java @@ -471,6 +471,8 @@ public class TrackDownFacade { downRecordQuery.setNeed("1"); // downRecordQuery.setSort("modified desc"); downRecordQuery.setHospitalId(hospitalId); + System.out.println("====>" + downRecordQuery.convertToQuery().convertToMongoQuery()); + return downRecordQuery; } @@ -920,7 +922,7 @@ public class TrackDownFacade { } else { temp.put("result", "--"); // 婚检追访结果 temp.put("trackDownTime", "--"); // 追访时间 - temp.put("yyzfTime", "--"); // 预约预约时间 + temp.put("yyzfTime", downRecord == null ? "--" : DateUtil.getyyyy_MM_dd(downRecord.getAppointmentDate())); // 预约预约时间 } //如果是产前检查取预约结果 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/PatientWeightService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/PatientWeightService.java index 1d38f68..d2b85ca 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/PatientWeightService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/PatientWeightService.java @@ -33,7 +33,8 @@ public interface PatientWeightService extends IBaseService { BaseResponse delete(String id); - BaseResponse report(String id, Integer userId, String rid); + BaseResponse report(String id, Integer userId, String rid, String version); + BaseResponse wxReport(String pid); @@ -57,7 +58,7 @@ public interface PatientWeightService extends IBaseService { public void getSeries(Map series, String bmiStr, String bregmatic); - BaseResponse getWeightsReport(String pid, Integer userId, String rid); + BaseResponse getWeightsReport(String pid, Integer userId, String rid, String version); public void setReport(Map restMap, Map weights, String beforeWeight, String bmi, Map dayWeights, String bregmatic); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java index d6d3569..883ffc3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java @@ -16,19 +16,19 @@ import com.lyms.platform.operate.web.utils.MathUtil; import com.lyms.platform.operate.web.utils.MongoUtil; import com.lyms.platform.operate.web.utils.ReportConfig; import com.lyms.platform.permission.dao.master.CouponMapper; -import com.lyms.platform.permission.model.*; -import com.lyms.platform.permission.service.DepartmentsService; +import com.lyms.platform.permission.model.Organization; +import com.lyms.platform.permission.model.PatientService; +import com.lyms.platform.permission.model.PatientServiceQuery; +import com.lyms.platform.permission.model.Users; import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.permission.service.PatientServiceService; import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.*; import com.lyms.platform.query.PatientsQuery; -import com.lyms.platform.query.SmsConfigQuery; import net.sf.json.JSONArray; import net.sf.json.JSONObject; import org.apache.commons.collections.MapUtils; import org.apache.commons.lang.StringUtils; -import org.omg.CORBA.StringHolder; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Sort; import org.springframework.data.mongodb.core.MongoTemplate; @@ -36,10 +36,7 @@ import org.springframework.data.mongodb.core.query.Criteria; import org.springframework.data.mongodb.core.query.Query; import org.springframework.data.mongodb.core.query.Update; import org.springframework.stereotype.Service; -import scala.Int; -import scala.util.parsing.combinator.testing.Str; -import javax.swing.text.html.parser.Entity; import java.math.BigDecimal; import java.math.RoundingMode; import java.util.*; @@ -607,7 +604,7 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient } @Override - public BaseResponse report(String id, Integer userId, String rid) { + public BaseResponse report(String id, Integer userId, String rid, String version) { String hospitalId = autoMatchFacade.getHospitalId(userId); Organization org = organizationService.getOrganization(Integer.parseInt(hospitalId)); @@ -649,17 +646,25 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient //根据高危获取不同的卡路里计算公式 Map kmap = null; - //威海市妇幼热量单独计算 - if ("2100001635".equals(hospitalId)) { - kmap = getWhComputeKul(week, Double.parseDouble(patientWeight.getNowWeight()), Double.parseDouble(patientWeight.getBeforeWeight()), patientWeight.getBregmatic(), bmi); - } else { - kmap = computeKulServiceManager.getComputeKulByRisk(rid).getComputeKul(Double.parseDouble(patientWeight.getBeforeWeight()), - Double.parseDouble(patientWeight.getNowWeight()), week, bmi, patientWeight.getBregmatic(), patientWeight.getBeforeHeight()); - } - if (map == null || map.size() == 0) { - return null; + + if (StringUtils.isEmpty(version)) { + //威海市妇幼热量单独计算 + if ("2100001635".equals(hospitalId)) { + kmap = getWhComputeKul(week, Double.parseDouble(patientWeight.getNowWeight()), Double.parseDouble(patientWeight.getBeforeWeight()), patientWeight.getBregmatic(), bmi); + } else { + kmap = computeKulServiceManager.getComputeKulByRisk(rid).getComputeKul(Double.parseDouble(patientWeight.getBeforeWeight()), + Double.parseDouble(patientWeight.getNowWeight()), week, bmi, patientWeight.getBregmatic(), patientWeight.getBeforeHeight()); + } + if (map == null || map.size() == 0) { + return null; + } + //秦皇岛熟食版 + } else if ("1".equals(version)) { + + } + setGuide(week, map, hospitalId); // 设置指南 String nsArea = ReportConfig.getNSArea(basicConfig.getName()); @@ -2023,7 +2028,7 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient } @Override - public BaseResponse getWeightsReport(String pid, Integer userId, String rid) { + public BaseResponse getWeightsReport(String pid, Integer userId, String rid, String version) { Map> series = new HashMap<>(); Map> datas = new TreeMap<>(); PatientWeight patientWeight = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(pid)), PatientWeight.class); @@ -2160,7 +2165,7 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient } } if (datas.size() == 0) { - BaseResponse baseResponse = this.report(pid, userId, rid); + BaseResponse baseResponse = this.report(pid, userId, rid, version); return baseResponse; } //同时出现高血压和肝硬化或肝功能不全则按照肝硬化或肝功能不全 -- 1.8.3.1