jiangjiazhi / regional-platform

Download as
Browse Code »

Commit b1857dc4eda7991369cf63c1300c521ff48a466b

Authored by liquanyu
2 parents 61ac35020c 8c14e41d35
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 6 changed files

platform-common/src/main/java/com/lyms/platform/common/constants/ErrorCodeConstants.java View file @ b1857dc
... ... @@ -65,5 +65,8 @@
65 65  
66 66 //数据已过期
67 67 public static final int DATA_EXPIRE = 4108;
  68 +
  69 + //体重一体机数据异常
  70 + public static final int WEIGHT_EXPIRE = 4500;
68 71 }
platform-dal/src/main/java/com/lyms/platform/query/MatDeliverQuery.java View file @ b1857dc
... ... @@ -509,8 +509,14 @@
509 509 condition = condition.and("cityPostRestId", cityPostRestId, MongoOper.IS);
510 510 if (null != areaPostRestId) {
511 511 condition = condition.and("areaPostRestId", areaPostRestId, MongoOper.IS);
512   - if (streetPostRestId != null && !streetPostRestId.equals("")) {
513   - condition = condition.and("streetRegisterId", streetPostRestId, MongoOper.IS);
  512 + if (StringUtils.isNotEmpty(streetPostRestId)) {
  513 + System.out.println(":::::::::StringUtils.isNotEmpty(streetPostRestId)::::::::::");
  514 + if (!streetPostRestId.trim().equals("")) {
  515 + System.out.println(":::::::::streetPostRestId.trim().equals(\"\")::::::::::");
  516 + MongoCondition mongoCondition = MongoCondition.newInstance("streetRegisterId", streetPostRestId, MongoOper.IS);
  517 + MongoCondition condition12 = MongoCondition.newInstance("streetPostRestId", streetPostRestId, MongoOper.IS);
  518 + condition = condition.orCondition(new MongoCondition[]{condition12, mongoCondition});
  519 + }
514 520 }
515 521 }
516 522 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BasicConfigController.java View file @ b1857dc
... ... @@ -43,8 +43,8 @@
43 43 */
44 44 @RequestMapping(method = RequestMethod.GET, value = "/findNewHighRisk")
45 45 @ResponseBody
46   - public BaseResponse findNewHighRisk() {
47   - return basicConfigFacade.findNewHighRisk();
  46 + public BaseResponse findNewHighRisk(@RequestParam("orgId") String orgId) {
  47 + return basicConfigFacade.findNewHighRisk(orgId);
48 48 }
49 49  
50 50 /**
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java View file @ b1857dc
... ... @@ -48,7 +48,7 @@
48 48 *
49 49 * @return
50 50 */
51   - public BaseResponse findNewHighRisk() {
  51 + public BaseResponse findNewHighRisk(String orgId) {
52 52 // //true-开发、false-正式
53 53 // boolean isTest = true;
54 54 // if(isTest){
... ... @@ -62,6 +62,25 @@
62 62  
63 63 //所有数据
64 64 List<BasicConfig> basicConfigList = basicConfigService.queryBasicConfig(basicConfigQuery);
  65 + /**
  66 + * 大同单独添加高位因素==高血压（需要药物治疗）
  67 + */
  68 + if (!orgId.equalsIgnoreCase("2100002419")) {
  69 + Iterator<BasicConfig> basicConfigIterator = basicConfigList.iterator();
  70 + while (basicConfigIterator.hasNext()) {
  71 + BasicConfig basicConfig = basicConfigIterator.next();
  72 + if (basicConfig.getName().equalsIgnoreCase("高血压（需要药物治疗）")) {
  73 + basicConfigIterator.remove();
  74 + }
  75 + }
  76 + }
  77 + if (orgId.equalsIgnoreCase("2100002419")) {
  78 + Iterator<BasicConfig> basicConfigIterator = basicConfigList.iterator();
  79 + while (basicConfigIterator.hasNext()) {
  80 + BasicConfig basicConfig = basicConfigIterator.next();
  81 + basicConfig.setName(basicConfig.getName()+"1");
  82 + }
  83 + }
65 84  
66 85 //主节点数据
67 86 basicConfigQuery.setTypeId(null);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ b1857dc
... ... @@ -6,7 +6,6 @@
6 6 import com.lyms.hospitalapi.pojo.WhfyHisModel;
7 7 import com.lyms.hospitalapi.whfy.WhfyHisService;
8 8 import com.lyms.platform.biz.service.*;
9   -import com.lyms.platform.common.base.LoginContext;
10 9 import com.lyms.platform.common.base.PageInfo;
11 10 import com.lyms.platform.common.constants.ErrorCodeConstants;
12 11 import com.lyms.platform.common.enums.*;
13 12  
... ... @@ -31,14 +30,12 @@
31 30 import com.lyms.platform.permission.service.UsersService;
32 31 import com.lyms.platform.pojo.*;
33 32 import com.lyms.platform.query.*;
34   -import com.mchange.lang.IntegerUtils;
35 33 import org.apache.commons.collections.CollectionUtils;
36 34 import org.apache.commons.collections.MapUtils;
37 35 import org.apache.commons.collections.Transformer;
38 36 import org.apache.commons.collections.map.HashedMap;
39 37 import org.apache.commons.lang.StringUtils;
40 38 import org.apache.commons.lang.math.NumberUtils;
41   -import org.apache.tools.ant.util.DateUtils;
42 39 import org.slf4j.Logger;
43 40 import org.slf4j.LoggerFactory;
44 41 import org.springframework.beans.factory.annotation.Autowired;
45 42  
... ... @@ -2292,12 +2289,12 @@
2292 2289 matDeliverQuery.setLimit(matdeliverFollowRequest.getLimit());
2293 2290 matDeliverQuery.setPage(matdeliverFollowRequest.getPage());
2294 2291  
2295   - System.out.println(matDeliverQuery.convertToQuery().convertToMongoQuery().toString());
  2292 + System.out.println("::::::::产后访视：：：："+matDeliverQuery.convertToQuery().convertToMongoQuery().toString());
2296 2293 maternalDeliverModelList = matDeliverService.pageQuery(matDeliverQuery);
2297 2294 } else {
2298 2295 maternalDeliverModelList = matDeliverService.query(matDeliverQuery);
2299 2296 }
2300   -
  2297 + System.out.println("::::::::产后访视：：：："+matDeliverQuery.convertToQuery().convertToMongoQuery().toString());
2301 2298 if (CollectionUtils.isEmpty(maternalDeliverModelList)) {
2302 2299  
2303 2300 HashMap <String, Object> map = new HashMap <>();
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java View file @ b1857dc
... ... @@ -1134,7 +1134,38 @@
1134 1134 request.setRemarkValue(nutritionInfoRequest.getBeforeWeight() == null ? patientWeights.get(0).getBeforeWeight() : nutritionInfoRequest.getBeforeWeight());
1135 1135  
1136 1136 addToDataInfo(request);
1137   -
  1137 + /*************************************************************/
  1138 + /**
  1139 + * 体重一体机标准
  1140 + * BMI值 低体重<18.5
  1141 + * 正常体重18.5-23.9
  1142 + * 超重24.0-27.9
  1143 + * 肥胖≥28
  1144 + * 血压一体机标准
  1145 + * 妊娠期高血压标准：收缩压≥140mmHg和（或）舒张压≥90mmHg
  1146 + * 正常血压标准：收缩压90-139mmHg，舒张压60-89mmHg
  1147 + */
  1148 + if (Double.valueOf(request.getValueThree()).compareTo(18.5) < 0){
  1149 + //BMI值 低体重<18.5
  1150 + BaseObjectResponse objectResponse = new BaseObjectResponse();
  1151 + objectResponse.setErrorcode(ErrorCodeConstants.WEIGHT_EXPIRE);
  1152 + objectResponse.setErrormsg("BMI值 低体重<18.5");
  1153 + return objectResponse;
  1154 + }
  1155 + if (Double.valueOf(request.getValueThree()).compareTo(23.9) > 0 && Double.valueOf(request.getValueThree()).compareTo(27.9) < 0){
  1156 + //BMI值 超重24.0-27.9
  1157 + BaseObjectResponse objectResponse = new BaseObjectResponse();
  1158 + objectResponse.setErrorcode(ErrorCodeConstants.WEIGHT_EXPIRE);
  1159 + objectResponse.setErrormsg("BMI值 超重24.0-27.9");
  1160 + return objectResponse;
  1161 + }
  1162 + if (Double.valueOf(request.getValueThree()).compareTo(28.0) > 0){
  1163 + //BMI值 肥胖≥28
  1164 + BaseObjectResponse objectResponse = new BaseObjectResponse();
  1165 + objectResponse.setErrorcode(ErrorCodeConstants.WEIGHT_EXPIRE);
  1166 + objectResponse.setErrormsg("BMI值 肥胖≥28");
  1167 + return objectResponse;
  1168 + }
1138 1169  
1139 1170 BaseObjectResponse objectResponse = new BaseObjectResponse();
1140 1171 objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);