jiangjiazhi / regional-platform

Download as
Browse Code »

Commit c8f0b26f7c7952995e51a9d141361c755c3a35fc

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

自测bug提交

Showing 9 changed files with 62 additions and 62 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryBloodController.java View file @ c8f0b26
... ... @@ -55,8 +55,8 @@
55 55 @RequestMapping(value = "/queryAll", method = RequestMethod.GET)
56 56 @TokenRequired
57 57 @ResponseBody
58   - public BaseResponse queryAll(String key, Integer bregmatic, Integer stateWeek, Integer endWeek, Integer page, Integer limit, HttpServletRequest request) {
59   - return temporaryBloodService.queryAll(key, bregmatic, stateWeek, endWeek, page, limit, getUserId(request));
  58 + public BaseResponse queryAll(String key, Integer age, Integer currentWeekEnd, Integer currentWeekStart, Integer page, Integer limit, HttpServletRequest request) {
  59 + return temporaryBloodService.queryAll(key, age, currentWeekEnd, currentWeekStart, page, limit, getUserId(request));
60 60 }
61 61  
62 62 @ResponseBody
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryBloodSugarController.java View file @ c8f0b26
... ... @@ -50,8 +50,8 @@
50 50 @RequestMapping(value = "/queryAll", method = RequestMethod.GET)
51 51 @TokenRequired
52 52 @ResponseBody
53   - public BaseResponse queryAll(String key, Integer bregmatic, Integer stateWeek, Integer endWeek, Integer page, Integer limit, HttpServletRequest request) {
54   - return bloodSugarService.queryAll(key, bregmatic, stateWeek, endWeek, page, limit, getUserId(request));
  53 + public BaseResponse queryAll(String key, Integer age, Integer currentWeekStart, Integer currentWeekEnd, Integer page, Integer limit, HttpServletRequest request) {
  54 + return bloodSugarService.queryAll(key, age, currentWeekStart, currentWeekEnd, page, limit, getUserId(request));
55 55 }
56 56  
57 57 @ResponseBody
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryWeightController.java View file @ c8f0b26
... ... @@ -54,8 +54,8 @@
54 54 @RequestMapping(value = "/queryAll", method = RequestMethod.GET)
55 55 @TokenRequired
56 56 @ResponseBody
57   - public BaseResponse queryAll(String key, Integer stateWeek, Integer endWeek, Integer age, Integer page, Integer limit, HttpServletRequest request) {
58   - return temporaryWeightService.queryAll(key, stateWeek, endWeek, age, page, limit, getUserId(request));
  57 + public BaseResponse queryAll(String key, Integer currentWeekStart, Integer currentWeekEnd, Integer age, Integer page, Integer limit, HttpServletRequest request) {
  58 + return temporaryWeightService.queryAll(key, currentWeekStart, currentWeekEnd, age, page, limit, getUserId(request));
59 59 }
60 60  
61 61 @ResponseBody
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/ITemporaryBloodService.java View file @ c8f0b26
... ... @@ -13,7 +13,7 @@
13 13  
14 14 BaseResponse queryOne(String id);
15 15  
16   - BaseResponse queryAll(String key, Integer bregmatic, Integer stateWeek, Integer endWeek, Integer page, Integer limit, Integer userId);
  16 + BaseResponse queryAll(String key, Integer age, Integer stateWeek, Integer endWeek, Integer page, Integer limit, Integer userId);
17 17  
18 18 BaseResponse info(String id, Date startDate);
19 19  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/ITemporaryBloodSugarService.java View file @ c8f0b26
... ... @@ -13,7 +13,7 @@
13 13  
14 14 BaseResponse queryOne(String id);
15 15  
16   - BaseResponse queryAll(String key, Integer bregmatic, Integer stateWeek, Integer endWeek, Integer page, Integer limit, Integer userId);
  16 + BaseResponse queryAll(String key, Integer age, Integer stateWeek, Integer endWeek, Integer page, Integer limit, Integer userId);
17 17  
18 18 BaseResponse info(String parentId, Integer type, Date time);
19 19  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java View file @ c8f0b26
... ... @@ -317,7 +317,7 @@
317 317 return df.format(tzzs);
318 318 }
319 319 return "";
320   -}
  320 + }
321 321  
322 322 @Override
323 323 public BaseResponse info(String id) {
... ... @@ -664,7 +664,7 @@
664 664 CollectionUtils.removeNullValue(map);
665 665  
666 666  
667   - healthChargeFacade.addHealthCharge(hospitalId,1,patientWeight.getPatientId(),1,1,userId);
  667 + healthChargeFacade.addHealthCharge(hospitalId, 1, patientWeight.getPatientId(), 1, 1, userId);
668 668 return RespBuilder.buildSuccess(map);
669 669 }
670 670 return RespBuilder.buildSuccess();
... ... @@ -2103,7 +2103,7 @@
2103 2103 datas.put("2", datas.get("8"));
2104 2104 }
2105 2105  
2106   - healthChargeFacade.addHealthCharge(patientWeight.getHospitalId(),1,patientWeight.getPatientId(),2,1,userId);
  2106 + healthChargeFacade.addHealthCharge(patientWeight.getHospitalId(), 1, patientWeight.getPatientId(), 2, 1, userId);
2107 2107 return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(this.getFirstOrNull(datas));
2108 2108 }
2109 2109  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodServiceImpl.java View file @ c8f0b26
... ... @@ -176,23 +176,23 @@
176 176 }
177 177  
178 178 @Override
179   - public BaseResponse queryAll(String key, Integer bregmatic, Integer stateWeek, Integer endWeek, Integer page, Integer limit, Integer userId) {
  179 + public BaseResponse queryAll(String key, Integer age, Integer stateWeek, Integer endWeek, Integer page, Integer limit, Integer userId) {
180 180 boolean flag = false;
181 181 List<String> hospital = groupsFacade.findGroupHospital(userId, false);
182   - Criteria criteria = Criteria.where("yn").ne("0").and("hospitalId").in(hospital);
183   - Criteria pCriteria = Criteria.where("yn").ne("0").and("hospitalId").in(hospital);
  182 + Criteria criteria = Criteria.where("yn").ne(0).and("hospitalId").in(hospital);
  183 + Criteria pCriteria = Criteria.where("yn").ne(0).and("hospitalId").in(hospital);
184 184 if (org.apache.commons.lang.StringUtils.isNotBlank(key)) {
185 185 pCriteria.orOperator(Criteria.where("phone").regex(key), Criteria.where("userName").regex(key));
186 186 flag = true;
187 187 }
188 188 if (stateWeek != null && endWeek != null) {
189   - Date start = DateUtil.getWeekStart(stateWeek);
190   - Date end = DateUtil.getWeekEnd(endWeek);
  189 + Date start = DateUtil.getWeekStart(endWeek);
  190 + Date end = DateUtil.getWeekEnd(stateWeek);
191 191 pCriteria.and("lastMenses").gt(start).lte(end);
192 192 flag = true;
193 193 }
194   - if (bregmatic != null) {
195   - pCriteria.and("bregmatic").is(bregmatic);
  194 + if (age != null) {
  195 + pCriteria.and("age").is(age);
196 196 flag = true;
197 197 }
198 198 if (flag) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodSugarServiceImpl.java View file @ c8f0b26
... ... @@ -78,7 +78,6 @@
78 78 Map<String, String> dayWeights = new LinkedHashMap<>();
79 79 dayWeights.put(DateUtil.getyyyy_MM_dd(new Date()), bloodSugar.getNowWeight());
80 80 bloodSugar.setDayWeights(dayWeights);
81   -
82 81 List<String> riskLevelIdList = new ArrayList<>();
83 82 if (CollectionUtils.isNotEmpty(bloodSugar.getRiskFactorId())) {
84 83 List<String> riskFactor = bloodSugar.getRiskFactorId();
85 84  
86 85  
... ... @@ -126,40 +125,41 @@
126 125  
127 126 @Override
128 127 public BaseResponse queryOne(String id) {
129   - TemporaryBloodSugar bloodModel = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(id)), TemporaryBloodSugar.class);
130   - if (bloodModel != null) {
131   - Map<String, Object> requestMap = new HashMap<>();
132   - List<String> rists = bloodModel.getRiskFactorId();
133   - List<Map> listMap = new ArrayList<>();
134   - Integer riskScore = 0;
135   - if (com.lyms.platform.operate.web.utils.CollectionUtils.isNotEmpty(rists)) {
136   - for (String rist : rists) {
137   - Map<String, Object> map = new HashMap();
138   - BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(rist);
139   - if (basicConfig != null) {
140   - riskScore += Integer.valueOf(basicConfig.getCode());
141   - if (StringUtils.isNotEmpty(basicConfig.getParentId())) {
142   - if (basicConfig.getParentId().equals(HisptialRiskTypeEnum.YBFX.getId())) {
143   - map.put("color", HisptialRiskTypeEnum.YBFX.getColor());
  128 + if (StringUtils.isNotEmpty(id)) {
  129 + TemporaryBloodSugar bloodModel = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(id)), TemporaryBloodSugar.class);
  130 + if (bloodModel != null) {
  131 + Map<String, Object> requestMap = new HashMap<>();
  132 + List<String> rists = bloodModel.getRiskFactorId();
  133 + List<Map> listMap = new ArrayList<>();
  134 + Integer riskScore = 0;
  135 + if (com.lyms.platform.operate.web.utils.CollectionUtils.isNotEmpty(rists)) {
  136 + for (String rist : rists) {
  137 + Map<String, Object> map = new HashMap();
  138 + BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(rist);
  139 + if (basicConfig != null) {
  140 + riskScore += Integer.valueOf(basicConfig.getCode());
  141 + if (StringUtils.isNotEmpty(basicConfig.getParentId())) {
  142 + if (basicConfig.getParentId().equals(HisptialRiskTypeEnum.YBFX.getId())) {
  143 + map.put("color", HisptialRiskTypeEnum.YBFX.getColor());
  144 + }
  145 + if (basicConfig.getParentId().equals(HisptialRiskTypeEnum.JGFX.getId())) {
  146 + map.put("color", HisptialRiskTypeEnum.JGFX.getColor());
  147 + }
  148 + if (basicConfig.getParentId().equals(HisptialRiskTypeEnum.GFX.getId())) {
  149 + map.put("color", HisptialRiskTypeEnum.GFX.getColor());
  150 + }
  151 + if (basicConfig.getParentId().equals(HisptialRiskTypeEnum.CRB.getId())) {
  152 + map.put("color", HisptialRiskTypeEnum.CRB.getColor());
  153 + }
  154 + if (basicConfig.getParentId().equals(HisptialRiskTypeEnum.JK.getId())) {
  155 + map.put("color", HisptialRiskTypeEnum.JK.getColor());
  156 + }
  157 + map.put("name", basicConfig.getName());
  158 + map.put("id", basicConfig.getId());
  159 + listMap.add(map);
144 160 }
145   - if (basicConfig.getParentId().equals(HisptialRiskTypeEnum.JGFX.getId())) {
146   - map.put("color", HisptialRiskTypeEnum.JGFX.getColor());
147   - }
148   - if (basicConfig.getParentId().equals(HisptialRiskTypeEnum.GFX.getId())) {
149   - map.put("color", HisptialRiskTypeEnum.GFX.getColor());
150   - }
151   - if (basicConfig.getParentId().equals(HisptialRiskTypeEnum.CRB.getId())) {
152   - map.put("color", HisptialRiskTypeEnum.CRB.getColor());
153   - }
154   - if (basicConfig.getParentId().equals(HisptialRiskTypeEnum.JK.getId())) {
155   - map.put("color", HisptialRiskTypeEnum.JK.getColor());
156   - }
157   - map.put("name", basicConfig.getName());
158   - map.put("id", basicConfig.getId());
159   - listMap.add(map);
160 161 }
161 162 }
162   -
163 163 }
164 164 requestMap.put("riskScore", riskScore);
165 165 requestMap.put("riskFactor", listMap);
... ... @@ -169,6 +169,7 @@
169 169 requestMap.put("phone", bloodModel.getPhone());
170 170 requestMap.put("id", bloodModel.getId());
171 171 return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(requestMap);
  172 +
172 173 }
173 174 }
174 175 return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.DEPT_NOT_EXISTS).setErrormsg("请选择一条记录");
175 176  
176 177  
177 178  
... ... @@ -176,23 +177,23 @@
176 177 }
177 178  
178 179 @Override
179   - public BaseResponse queryAll(String key, Integer bregmatic, Integer stateWeek, Integer endWeek, Integer page, Integer limit, Integer userId) {
  180 + public BaseResponse queryAll(String key, Integer age, Integer stateWeek, Integer endWeek, Integer page, Integer limit, Integer userId) {
180 181 boolean flag = false;
181 182 List<String> hospital = groupsFacade.findGroupHospital(userId, false);
182   - Criteria criteria = Criteria.where("yn").ne("0").and("hospitalId").in(hospital);
183   - Criteria pCriteria = Criteria.where("yn").ne("0").and("hospitalId").in(hospital);
  183 + Criteria criteria = Criteria.where("yn").ne(0).and("hospitalId").in(hospital);
  184 + Criteria pCriteria = Criteria.where("yn").ne(0).and("hospitalId").in(hospital);
184 185 if (org.apache.commons.lang.StringUtils.isNotBlank(key)) {
185 186 pCriteria.orOperator(Criteria.where("phone").regex(key), Criteria.where("userName").regex(key));
186 187 flag = true;
187 188 }
188 189 if (stateWeek != null && endWeek != null) {
189   - Date start = DateUtil.getWeekStart(stateWeek);
190   - Date end = DateUtil.getWeekEnd(endWeek);
  190 + Date start = DateUtil.getWeekStart(endWeek);
  191 + Date end = DateUtil.getWeekEnd(stateWeek);
191 192 pCriteria.and("lastMenses").gt(start).lte(end);
192 193 flag = true;
193 194 }
194   - if (bregmatic != null) {
195   - pCriteria.and("bregmatic").is(bregmatic);
  195 + if (age != null) {
  196 + pCriteria.and("age").is(age);
196 197 flag = true;
197 198 }
198 199 if (flag) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryWeightServiceImpl.java View file @ c8f0b26
... ... @@ -192,15 +192,15 @@
192 192 public BaseResponse queryAll(String key, Integer stateWeek, Integer endWeek, Integer age, Integer page, Integer limit, Integer userId) {
193 193 boolean flag = false;
194 194 List<String> hospital = groupsFacade.findGroupHospital(userId, false);
195   - Criteria criteria = Criteria.where("yn").ne("0").and("hospitalId").in(hospital);
196   - Criteria pCriteria = Criteria.where("yn").ne("0").and("hospitalId").in(hospital);
  195 + Criteria criteria = Criteria.where("yn").ne(0).and("hospitalId").in(hospital);
  196 + Criteria pCriteria = Criteria.where("yn").ne(0).and("hospitalId").in(hospital);
197 197 if (org.apache.commons.lang.StringUtils.isNotBlank(key)) {
198 198 pCriteria.orOperator(Criteria.where("phone").regex(key), Criteria.where("userName").regex(key));
199 199 flag = true;
200 200 }
201 201 if (stateWeek != null && endWeek != null) {
202   - Date start = DateUtil.getWeekStart(stateWeek);
203   - Date end = DateUtil.getWeekEnd(endWeek);
  202 + Date start = DateUtil.getWeekStart(endWeek);
  203 + Date end = DateUtil.getWeekEnd(stateWeek);
204 204 pCriteria.and("lastMenses").gt(start).lte(end);
205 205 flag = true;
206 206 }
... ... @@ -218,7 +218,6 @@
218 218 }
219 219 criteria.and("_id").in(ids);
220 220 }
221   - Users users = usersService.getUsers(userId);
222 221 PageResult pageResult = findMongoPage(TemporaryWeightModel.class, new Query(criteria).with(new Sort(Sort.Direction.DESC, "modified")), page, limit);
223 222 List<TemporaryWeightModel> patientWeights = (List<TemporaryWeightModel>) pageResult.getGrid();
224 223 List<Map<String, Object>> restMap = new ArrayList<>();