From 2f055ed591f796f5535bb949bbaf2cf81d926d19 Mon Sep 17 00:00:00 2001 From: wangbo <184677810@qq.com> Date: Sun, 5 May 2019 18:35:41 +0800 Subject: [PATCH] update --- .../lyms/platform/pojo/TemporaryBloodSugar.java | 20 +------------ .../impl/TemporaryBloodSugarServiceImpl.java | 34 ++++++++++------------ .../web/service/impl/TemporaryUserServiceImpl.java | 8 +++++ .../web/service/impl/TnbComputeKulServiceImpl.java | 19 +++++++----- 4 files changed, 36 insertions(+), 45 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryBloodSugar.java b/platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryBloodSugar.java index e0ff1b9..5315723 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryBloodSugar.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryBloodSugar.java @@ -13,8 +13,6 @@ public class TemporaryBloodSugar extends BaseModel { private static final long serialVersionUID = SerialIdEnum.TemporaryBloodSugarModel.getCid(); private String id; - //当前体重 - private String nowWeight; private String cardID; @@ -40,7 +38,7 @@ public class TemporaryBloodSugar extends BaseModel { private String bloodSugar; - private Map dayWeights; + // private Map dayWeights; private String hospitalId; //报告状态 1未查看 2查看 @@ -65,15 +63,6 @@ public class TemporaryBloodSugar extends BaseModel { this.hospitalId = hospitalId; } - - public Map getDayWeights() { - return dayWeights; - } - - public void setDayWeights(Map dayWeights) { - this.dayWeights = dayWeights; - } - public String getBloodSugar() { return bloodSugar; } @@ -108,13 +97,6 @@ public class TemporaryBloodSugar extends BaseModel { } - public String getNowWeight() { - return nowWeight; - } - - public void setNowWeight(String nowWeight) { - this.nowWeight = nowWeight; - } public String getCardID() { return cardID; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodSugarServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodSugarServiceImpl.java index 112ac69..4ee2494 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodSugarServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodSugarServiceImpl.java @@ -17,12 +17,12 @@ import com.lyms.platform.operate.web.facade.HealthChargeFacade; import com.lyms.platform.operate.web.facade.OrganizationGroupsFacade; import com.lyms.platform.operate.web.service.ITemporaryBloodSugarService; import com.lyms.platform.operate.web.service.PatientWeightService; +import com.lyms.platform.operate.web.utils.CollectionUtils; import com.lyms.platform.operate.web.utils.ReportConfig; import com.lyms.platform.permission.model.Organization; import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.pojo.*; import com.mongodb.WriteResult; -import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Sort; import org.springframework.data.mongodb.core.MongoTemplate; @@ -292,15 +292,12 @@ public class TemporaryBloodSugarServiceImpl extends BaseServiceImpl implements I @Override public BaseResponse getSysBloodSugarReport(String id, Integer userId) { BaseObjectResponse resp = new BaseObjectResponse(); - - TemporaryBloodSugar bloodSugar = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(id)), TemporaryBloodSugar.class); - + //穿临时用户id + TemporaryUserModel temporaryUserModel = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(id)), TemporaryUserModel.class); //Patients patients = patientsService.findOnePatientById(patientId); - TemporaryUserModel temporaryUser = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(bloodSugar.getTemporaryUserId())), TemporaryUserModel.class); - - List risks = temporaryUser.getRiskFactorId(); //妊娠期糖尿病（无需药物治疗） //糖尿病合并妊娠（无需药物治疗） - if (!(com.lyms.platform.operate.web.utils.CollectionUtils.isNotEmpty(risks) && (risks.contains("5aab6d3d422b03d4ad2bf83e") || risks.contains("5aab6d3e422b03d4ad2bf83f") + List risks = temporaryUserModel.getRiskFactorId(); //妊娠期糖尿病（无需药物治疗） //糖尿病合并妊娠（无需药物治疗） + if (!(CollectionUtils.isNotEmpty(risks) && (risks.contains("5aab6d3d422b03d4ad2bf83e") || risks.contains("5aab6d3e422b03d4ad2bf83f") //需药物治疗的糖尿病 || risks.contains("de7468e6-1bb5-4fab-ae84-78857868409a")))) { resp.setErrorcode(ResponseCode.DATA_ERROR.getCode()); @@ -308,15 +305,16 @@ public class TemporaryBloodSugarServiceImpl extends BaseServiceImpl implements I return resp; } - // PatientWeight patientWeight = mongoTemplate.findOne(Query.query(Criteria.where("patientId").is(patientId)), PatientWeight.class); + TemporaryWeightModel temporaryWeightModel = mongoTemplate.findOne(Query.query(Criteria.where("temporaryUserId").is(id)), TemporaryWeightModel.class); + //PatientWeight patientWeight = mongoTemplate.findOne(Query.query(Criteria.where("patientId").is(patientId)), PatientWeight.class); - if (bloodSugar == null) { + if (temporaryWeightModel == null) { resp.setErrorcode(ResponseCode.DATA_ERROR.getCode()); resp.setErrormsg("没有体重测量记录"); return resp; } - Map dayWeights = bloodSugar.getDayWeights(); + Map dayWeights = temporaryWeightModel.getDayWeights(); //当天没有体重测量 if (!(dayWeights != null && dayWeights.size() > 0 && StringUtils.isNotEmpty(dayWeights.get(DateUtil.getyyyy_MM_dd(new Date()))))) { @@ -327,7 +325,7 @@ public class TemporaryBloodSugarServiceImpl extends BaseServiceImpl implements I String rid = ""; - int week = DateUtil.getWeek(temporaryUser.getLastMenses(), new Date()); + int week = DateUtil.getWeek(temporaryUserModel.getLastMenses(), new Date()); if (week < 6) { resp.setErrorcode(ResponseCode.DATA_ERROR.getCode()); @@ -351,13 +349,11 @@ public class TemporaryBloodSugarServiceImpl extends BaseServiceImpl implements I //1:妊娠期糖尿病（无需药物治疗） 2:糖尿病合并妊娠（无需药物治疗）(需药物治疗的糖尿病) data.put("riskType", "5aab6d3d422b03d4ad2bf83e".equals(rid) ? "1" : "2"); - //算出bmi值 - String bmiStr = patientWeightService.getBmi(temporaryUser.getBeforeWeight(), temporaryUser.getBeforeHeight()); - double bmi = Double.parseDouble(bmiStr); + double bmi = Double.parseDouble(temporaryWeightModel.getBmi()); //根据高危获取不同的卡路里计算公式 - Map kmap = computeKulServiceManager.getComputeKulByRisk(rid).getComputeKul(Double.parseDouble(temporaryUser.getBeforeWeight()), - Double.parseDouble(bloodSugar.getNowWeight()), week, bmi, temporaryUser.getBregmatic(), temporaryUser.getBeforeHeight()); + Map kmap = computeKulServiceManager.getComputeKulByRisk(rid).getComputeKul(Double.parseDouble(temporaryUserModel.getBeforeWeight()), + Double.parseDouble(temporaryWeightModel.getNowWeight()), week, bmi, temporaryUserModel.getBregmatic(), temporaryUserModel.getBeforeHeight()); String weekYyzl = ""; @@ -403,9 +399,11 @@ public class TemporaryBloodSugarServiceImpl extends BaseServiceImpl implements I } data.put("weekRange", weekRange); + + healthChargeFacade.addHealthCharge(hospitalId, 2, id, 1, 2, userId); + resp.setData(data); resp.setErrorcode(ResponseCode.SUCCESS.getCode()); - healthChargeFacade.addHealthCharge(hospitalId, 2, bloodSugar.getTemporaryUserId(), 1, 2, userId); resp.setErrormsg("成功"); return resp; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryUserServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryUserServiceImpl.java index b68c4cf..7b62fec 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryUserServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryUserServiceImpl.java @@ -55,6 +55,14 @@ public class TemporaryUserServiceImpl extends BaseServiceImpl implements ITempor temporaryUser.setModified(new Date()); return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("修改成功"); } + if (StringUtils.isNotEmpty(temporaryUser.getCardID()) || StringUtils.isNotEmpty(temporaryUser.getPhone())) { + Criteria criteria = new Criteria(); + criteria = criteria.orOperator(Criteria.where("cardID").is(temporaryUser.getCardID()), Criteria.where("phone").is(temporaryUser.getPhone())); + List temporaryUserModels = mongoTemplate.find(Query.query(criteria), TemporaryUserModel.class); + if (CollectionUtils.isNotEmpty(temporaryUserModels)) { + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("该用户已建档!"); + } + } temporaryUser.setCreated(new Date()); temporaryUser.setModified(new Date()); List riskLevelIdList = new ArrayList<>(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TnbComputeKulServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TnbComputeKulServiceImpl.java index 8aada4c..45129e5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TnbComputeKulServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TnbComputeKulServiceImpl.java @@ -30,7 +30,8 @@ import java.util.Map; @Service class TnbComputeKulServiceImpl implements IComputeKul { - private List supportList =new ArrayList<>(); + private List supportList = new ArrayList<>(); + { /* 5aab6d3d422b03d4ad2bf83e 妊娠期糖尿病（无需药物治疗） 5aab6d3e422b03d4ad2bf83f 糖尿病合并妊娠（无需药物治疗） @@ -41,7 +42,7 @@ class TnbComputeKulServiceImpl implements IComputeKul { } -// 妊娠期糖尿病卡路里计算公式支持的高危id + // 妊娠期糖尿病卡路里计算公式支持的高危id @Override public boolean canSupported(String riskId) { return supportList.contains(riskId); @@ -57,19 +58,19 @@ class TnbComputeKulServiceImpl implements IComputeKul { String status = ""; double add = Double.valueOf(String.format("%.2f", currentWeight - beforeWeight)); - double height = Double.valueOf(String.format("%.2f", Double.parseDouble(beforeHeight)/100)); + double height = Double.valueOf(String.format("%.2f", Double.parseDouble(beforeHeight) / 100)); //孕早期 if (week <= 12) { if (add < 1 && (1 - add >= 0.5)) { status = "低于"; - kulStart = (new BigDecimal(Double.toString(height)).multiply(new BigDecimal(Double.toString(height))).doubleValue()*21 + 500+add)*25; + kulStart = (new BigDecimal(Double.toString(height)).multiply(new BigDecimal(Double.toString(height))).doubleValue() * 21 + 500 + add) * 25; } else if (add > 1.5 && (add - 1.5 >= 0.5)) { status = "高于"; - kulStart =(new BigDecimal(Double.toString(height)).multiply(new BigDecimal(Double.toString(height))).doubleValue()*21- 500+add)*25; + kulStart = (new BigDecimal(Double.toString(height)).multiply(new BigDecimal(Double.toString(height))).doubleValue() * 21 - 500 + add) * 25; } else { status = "处于"; - kulStart =(new BigDecimal(Double.toString(height)).multiply(new BigDecimal(Double.toString(height))).doubleValue()*21+add)*25; + kulStart = (new BigDecimal(Double.toString(height)).multiply(new BigDecimal(Double.toString(height))).doubleValue() * 21 + add) * 25; } kulEnd = kulStart; } @@ -90,7 +91,9 @@ class TnbComputeKulServiceImpl implements IComputeKul { if (StringUtils.isEmpty(bregmatic) || "1".equals(bregmatic)) { rangeWeight = ReportConfig.getWeightRange(bmiStr).split("-"); } else { + System.out.println("====>" + bmiStr); rangeWeight = ReportConfig.getDWeightRange(bmiStr).split("-"); + System.out.println("体重==========>" + rangeWeight); } @@ -102,8 +105,8 @@ class TnbComputeKulServiceImpl implements IComputeKul { double addWeightEnd = Double.parseDouble(rangeWeight[1]); - double d2= new BigDecimal(Double.toString(height)).multiply(new BigDecimal(Double.toString(height))).doubleValue()*21; - d2=add+d2; + double d2 = new BigDecimal(Double.toString(height)).multiply(new BigDecimal(Double.toString(height))).doubleValue() * 21; + d2 = add + d2; double kstart = new BigDecimal(d2).multiply(new BigDecimal(25)).doubleValue() + basekul; double kend = new BigDecimal(d2).multiply(new BigDecimal(25)).doubleValue() + basekul; -- 1.8.3.1