jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 7b17e1e9de4d66790b4817523d90f2a0135c9e51

Authored by jiangjiazhi
2 parents 34efd0e9be 3ea8d6ed01
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/enums/BloodSugarEnums.java View file @ 7b17e1e
... ... @@ -5,7 +5,7 @@
5 5 */
6 6 public enum BloodSugarEnums {
7 7  
8   - A(1, "空腹"), B(2, "早餐前"), C(3, "早餐后2h"), D(4, "午餐前"), E(5, "午餐后2h"), F(6, "晚餐前"), G(7, "晚餐后2h"), I(9, "睡前") ,H(8, "夜间");
  8 + A(1, "空腹"), B(2, "早餐前"), C(3, "早餐后"), D(4, "午餐前"), E(5, "午餐后"), F(6, "晚餐前"), G(7, "晚餐后"), I(9, "睡前") ,H(8, "夜间");
9 9  
10 10 BloodSugarEnums(Integer id, String name) {
11 11 this.id = id;
platform-common/src/main/java/com/lyms/platform/common/enums/BloodSugarEnums2.java View file @ 7b17e1e
... ... @@ -5,7 +5,7 @@
5 5 */
6 6 public enum BloodSugarEnums2 {
7 7  
8   - A(1, "空腹"), B(2, "早餐前"), C(3, "早餐后2h"), D(4, "午餐前"), E(5, "午餐后2h"), F(6, "晚餐前"), G(7, "晚餐后2h") ,H(8, "夜间"), I(9, "睡前");
  8 + A(1, "空腹"), B(2, "早餐前"), C(3, "早餐后"), D(4, "午餐前"), E(5, "午餐后"), F(6, "晚餐前"), G(7, "晚餐后") ,H(8, "夜间"), I(9, "睡前");
9 9  
10 10 BloodSugarEnums2(Integer id, String name) {
11 11 this.id = id;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RemoteFacade.java View file @ 7b17e1e
... ... @@ -56,7 +56,7 @@
56 56 }
57 57 }
58 58 }
59   - if(temp != null) {
  59 + if(MapUtils.isNotEmpty(temp)) {
60 60 restList.add(temp);
61 61 }
62 62 }
63 63  
... ... @@ -170,9 +170,9 @@
170 170 status = "低血压";
171 171 } else if(Double.parseDouble(ssy) > 140) {
172 172 status = "高血压";
173   - } else {
  173 + }/* else {
174 174 status = "正常";
175   - }
  175 + }*/
176 176 }
177 177 return status;
178 178 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java View file @ 7b17e1e
... ... @@ -250,7 +250,7 @@
250 250 infos.put(DateUtil.getyyyy_MM_dd(new Date()), temp);
251 251 bloodPressure.setInfos(infos);
252 252 bloodPressure.setPid(mongoUtil.getPid(parentId));
253   - if(flag) {
  253 + if(!flag) {
254 254 bloodPressureService.add(bloodPressure);
255 255 } else {
256 256 mongoTemplate.save(bloodPressure);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java View file @ 7b17e1e
... ... @@ -231,7 +231,7 @@
231 231 one.setYn(YnEnums.YES.getId());
232 232 one.setModified(new Date());
233 233 one.setCreatYmdDate(DateUtil.getyyyy_MM_dd(new Date()));
234   - if(flag) {
  234 + if(!flag) {
235 235 bloodSugarService.add(one);
236 236 } else {
237 237 mongoTemplate.save(one);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java View file @ 7b17e1e
... ... @@ -201,6 +201,7 @@
201 201 @Override
202 202 public BaseResponse list(String key, String vcCardNo, Integer currentWeekStart, Integer currentWeekEnd, Integer age, Integer page, Integer limit, Integer userId) {
203 203 List<String> hospital = groupsFacade.findGroupHospital(userId, true) ;
  204 + System.out.println("hospital>>> " + hospital);
204 205 Criteria criteria = Criteria.where("yn").ne("0").and("hospitalId").in(hospital);
205 206 Criteria pCriteria = Criteria.where("yn").ne("0").and("hospitalId").in(hospital);
206 207 if(StringUtils.isNotBlank(key)) {
207 208  
... ... @@ -225,8 +226,9 @@
225 226 for (Patients patient : patients) {
226 227 ids.add(patient.getId());
227 228 }
  229 + criteria.and("patientId").in(ids);
228 230 }
229   - criteria.and("patientId").in(ids);
  231 + System.out.println("ids>>> " + ids);
230 232  
231 233 PageResult pageResult = findMongoPage(PatientWeight.class, new Query(criteria).with(new Sort(Sort.Direction.DESC, "created")), page, limit);
232 234 List<PatientWeight> patientWeights = (List<PatientWeight>) pageResult.getGrid();