diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java index d9103df..0662b5b 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java @@ -460,7 +460,8 @@ public class PatientsService { public void setAutoMatDeliver(String cardNo,Date dueDate) { - Date endDate = DateUtil.addDay(new Date(), -294); +// Date endDate = DateUtil.addDay(new Date(), -294); + Date endDate = DateUtil.addDay(new Date(), -301); PatientsQuery patientsQuery = new PatientsQuery(); patientsQuery.setYn(YnEnums.YES.getId()); patientsQuery.setType(1); 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 fc45c32..a520194 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 @@ -58,8 +58,8 @@ public class PatientWeightController extends BaseController { @ResponseBody @TokenRequired @RequestMapping(value = "/query", method = RequestMethod.GET) - public BaseResponse list(String key, String vcCardNo, Integer currentWeekStart, Integer currentWeekEnd, Integer age, Integer page, Integer limit, HttpServletRequest request) { - return patientWeightService.list(key, vcCardNo, currentWeekStart, currentWeekEnd, age, page, limit, getUserId(request)); + public BaseResponse list(String key, String lastname,String vcCardNo, Integer currentWeekStart, Integer currentWeekEnd, Integer age, Integer page, Integer limit, HttpServletRequest request) { + return patientWeightService.list(key, lastname, vcCardNo, currentWeekStart, currentWeekEnd, age, page, limit, getUserId(request)); } /** diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index 230ee2f..f65c3cd 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -800,7 +800,8 @@ public class PatientFacade { if(StringUtils.isNotEmpty(need)){ pq.setNeed(need); } - List ps = patientsService.queryPatientBySort(pq, riskPatientsQueryRequest.getSort(), riskPatientsQueryRequest.getOrder()); +// List ps = patientsService.queryPatientBySort(pq, riskPatientsQueryRequest.getSort(), riskPatientsQueryRequest.getOrder()); + List ps = patientsService.queryPatientBySort(pq, "ASC", riskPatientsQueryRequest.getOrder()); if (CollectionUtils.isNotEmpty(ps)) { data = convertToQuanWeight(ps); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index 648bc1c..f2a407b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -7102,7 +7102,7 @@ public class ViewFacade { babyState = "差"; }else if("一般".equals(baby.getBabyHealthy())){ babyState = "一般"; - }else if("良好".equals(baby.getBabyHealthy())){ + }else if("良好".equals(baby.getBabyHealthy()) || "健康".equals(baby.getBabyHealthy())){ babyState = "良好"; } }else { 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 ff33477..711f15c 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 @@ -27,7 +27,7 @@ public interface PatientWeightService extends IBaseService { BaseResponse addOrUpdate(Integer userId, PatientWeight patientWeight); - BaseResponse list(String key, String vcCardNo, Integer currentWeekStart, Integer currentWeekEnd, Integer age, Integer page, Integer limit, Integer userId); + BaseResponse list(String key,String lastname, String vcCardNo, Integer currentWeekStart, Integer currentWeekEnd, Integer age, Integer page, Integer limit, Integer userId); BaseResponse info(String id); 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 def9967..499ae7d 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 @@ -405,7 +405,7 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient @Override - public BaseResponse list(String key, String vcCardNo, Integer currentWeekStart, Integer currentWeekEnd, Integer age, Integer page, Integer limit, Integer userId) { + public BaseResponse list(String key, String lastname,String vcCardNo, Integer currentWeekStart, Integer currentWeekEnd, Integer age, Integer page, Integer limit, Integer userId) { boolean flag = false; List hospital = groupsFacade.findGroupHospital(userId, false); Criteria criteria = Criteria.where("yn").ne("0").and("hospitalId").in(hospital); @@ -414,6 +414,10 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient pCriteria.orOperator(Criteria.where("phone").regex(key), Criteria.where("username").regex(key), Criteria.where("cardNo").is(key)); flag = true; } + if (StringUtils.isBlank(key) && StringUtils.isNotBlank(lastname)) { + pCriteria.orOperator( Criteria.where("username").regex("^"+lastname)); + flag = true; + } if (StringUtils.isNotBlank(vcCardNo)) { pCriteria.and("vcCardNo").is(vcCardNo); flag = true; @@ -1027,6 +1031,41 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient kmap = computeKulServiceManager.getComputeKulByRisk(rid).getComputeKul(Double.parseDouble(patientWeight.getBeforeWeight()), Double.parseDouble(patientWeight.getNowWeight()), week, bmi, patientWeight.getBregmatic(), patientWeight.getBeforeHeight(), version); } + if ("216".equals(hospitalId) && kmap!=null) { + //热量计算出来后所有人不能超过2300，超过的按照2300给热量； + String kulStart = kmap.get("kulStart"); + String kulEnd = kmap.get("kulEnd"); + if(StringUtils.isNotEmpty(kulStart)){ + double dkulStart = Double.parseDouble(kulStart); + if(dkulStart > 2300){ + kmap.put("kulStart", "2300"); + } + } + if(StringUtils.isNotEmpty(kulEnd)){ + double dkulEnd = Double.parseDouble(kulEnd); + if(dkulEnd > 2300){ + kmap.put("kulEnd", "2300"); + } + } + + //孕晚期（28孕周周到42孕周）不能低于1800，低于1800的按1800给热量 + if(week >28 && week < 42 ){ + if(StringUtils.isNotEmpty(kulStart)){ + double dkulStart = Double.parseDouble(kulStart); + if(dkulStart < 1800){ + kmap.put("kulStart", "1800"); + } + } + if(StringUtils.isNotEmpty(kulEnd)){ + double dkulEnd = Double.parseDouble(kulEnd); + if(dkulEnd < 1800){ + kmap.put("kulEnd", "1800"); + } + } + } + + } + if (map == null || map.size() == 0) { return null; }