jiangjiazhi / regional-platform

Download as
Browse Code »

Commit f80af5fe74137367463338525a6c0b9dbd2cc831

Authored by wtt
1 parent 67968d5adf
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

秦皇岛需求

Showing 6 changed files with 48 additions and 7 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java View file @ f80af5f
... ... @@ -460,7 +460,8 @@
460 460  
461 461 public void setAutoMatDeliver(String cardNo,Date dueDate)
462 462 {
463   - Date endDate = DateUtil.addDay(new Date(), -294);
  463 +// Date endDate = DateUtil.addDay(new Date(), -294);
  464 + Date endDate = DateUtil.addDay(new Date(), -301);
464 465 PatientsQuery patientsQuery = new PatientsQuery();
465 466 patientsQuery.setYn(YnEnums.YES.getId());
466 467 patientsQuery.setType(1);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientWeightController.java View file @ f80af5f
... ... @@ -58,8 +58,8 @@
58 58 @ResponseBody
59 59 @TokenRequired
60 60 @RequestMapping(value = "/query", method = RequestMethod.GET)
61   - public BaseResponse list(String key, String vcCardNo, Integer currentWeekStart, Integer currentWeekEnd, Integer age, Integer page, Integer limit, HttpServletRequest request) {
62   - return patientWeightService.list(key, vcCardNo, currentWeekStart, currentWeekEnd, age, page, limit, getUserId(request));
  61 + public BaseResponse list(String key, String lastname,String vcCardNo, Integer currentWeekStart, Integer currentWeekEnd, Integer age, Integer page, Integer limit, HttpServletRequest request) {
  62 + return patientWeightService.list(key, lastname, vcCardNo, currentWeekStart, currentWeekEnd, age, page, limit, getUserId(request));
63 63 }
64 64  
65 65 /**
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java View file @ f80af5f
... ... @@ -800,7 +800,8 @@
800 800 if(StringUtils.isNotEmpty(need)){
801 801 pq.setNeed(need);
802 802 }
803   - List <Patients> ps = patientsService.queryPatientBySort(pq, riskPatientsQueryRequest.getSort(), riskPatientsQueryRequest.getOrder());
  803 +// List <Patients> ps = patientsService.queryPatientBySort(pq, riskPatientsQueryRequest.getSort(), riskPatientsQueryRequest.getOrder());
  804 + List <Patients> ps = patientsService.queryPatientBySort(pq, "ASC", riskPatientsQueryRequest.getOrder());
804 805 if (CollectionUtils.isNotEmpty(ps)) {
805 806 data = convertToQuanWeight(ps);
806 807 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ f80af5f
... ... @@ -7102,7 +7102,7 @@
7102 7102 babyState = "差";
7103 7103 }else if("一般".equals(baby.getBabyHealthy())){
7104 7104 babyState = "一般";
7105   - }else if("良好".equals(baby.getBabyHealthy())){
  7105 + }else if("良好".equals(baby.getBabyHealthy()) || "健康".equals(baby.getBabyHealthy())){
7106 7106 babyState = "良好";
7107 7107 }
7108 7108 }else {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/PatientWeightService.java View file @ f80af5f
... ... @@ -27,7 +27,7 @@
27 27  
28 28 BaseResponse addOrUpdate(Integer userId, PatientWeight patientWeight);
29 29  
30   - BaseResponse list(String key, String vcCardNo, Integer currentWeekStart, Integer currentWeekEnd, Integer age, Integer page, Integer limit, Integer userId);
  30 + BaseResponse list(String key,String lastname, String vcCardNo, Integer currentWeekStart, Integer currentWeekEnd, Integer age, Integer page, Integer limit, Integer userId);
31 31  
32 32 BaseResponse info(String id);
33 33  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java View file @ f80af5f
... ... @@ -405,7 +405,7 @@
405 405  
406 406  
407 407 @Override
408   - public BaseResponse list(String key, String vcCardNo, Integer currentWeekStart, Integer currentWeekEnd, Integer age, Integer page, Integer limit, Integer userId) {
  408 + public BaseResponse list(String key, String lastname,String vcCardNo, Integer currentWeekStart, Integer currentWeekEnd, Integer age, Integer page, Integer limit, Integer userId) {
409 409 boolean flag = false;
410 410 List<String> hospital = groupsFacade.findGroupHospital(userId, false);
411 411 Criteria criteria = Criteria.where("yn").ne("0").and("hospitalId").in(hospital);
... ... @@ -414,6 +414,10 @@
414 414 pCriteria.orOperator(Criteria.where("phone").regex(key), Criteria.where("username").regex(key), Criteria.where("cardNo").is(key));
415 415 flag = true;
416 416 }
  417 + if (StringUtils.isBlank(key) && StringUtils.isNotBlank(lastname)) {
  418 + pCriteria.orOperator( Criteria.where("username").regex("^"+lastname));
  419 + flag = true;
  420 + }
417 421 if (StringUtils.isNotBlank(vcCardNo)) {
418 422 pCriteria.and("vcCardNo").is(vcCardNo);
419 423 flag = true;
... ... @@ -1027,6 +1031,41 @@
1027 1031 kmap = computeKulServiceManager.getComputeKulByRisk(rid).getComputeKul(Double.parseDouble(patientWeight.getBeforeWeight()),
1028 1032 Double.parseDouble(patientWeight.getNowWeight()), week, bmi, patientWeight.getBregmatic(), patientWeight.getBeforeHeight(), version);
1029 1033 }
  1034 + if ("216".equals(hospitalId) && kmap!=null) {
  1035 + //热量计算出来后所有人不能超过2300，超过的按照2300给热量；
  1036 + String kulStart = kmap.get("kulStart");
  1037 + String kulEnd = kmap.get("kulEnd");
  1038 + if(StringUtils.isNotEmpty(kulStart)){
  1039 + double dkulStart = Double.parseDouble(kulStart);
  1040 + if(dkulStart > 2300){
  1041 + kmap.put("kulStart", "2300");
  1042 + }
  1043 + }
  1044 + if(StringUtils.isNotEmpty(kulEnd)){
  1045 + double dkulEnd = Double.parseDouble(kulEnd);
  1046 + if(dkulEnd > 2300){
  1047 + kmap.put("kulEnd", "2300");
  1048 + }
  1049 + }
  1050 +
  1051 + //孕晚期（28孕周周到42孕周）不能低于1800，低于1800的按1800给热量
  1052 + if(week >28 && week < 42 ){
  1053 + if(StringUtils.isNotEmpty(kulStart)){
  1054 + double dkulStart = Double.parseDouble(kulStart);
  1055 + if(dkulStart < 1800){
  1056 + kmap.put("kulStart", "1800");
  1057 + }
  1058 + }
  1059 + if(StringUtils.isNotEmpty(kulEnd)){
  1060 + double dkulEnd = Double.parseDouble(kulEnd);
  1061 + if(dkulEnd < 1800){
  1062 + kmap.put("kulEnd", "1800");
  1063 + }
  1064 + }
  1065 + }
  1066 +
  1067 + }
  1068 +
1030 1069 if (map == null || map.size() == 0) {
1031 1070 return null;
1032 1071 }