Commit 07fa12376132ff7df3543fde7530249d978bd2b1
1 parent
1a053bd452
Exists in
dev
#fix:新增网络中心确认档案功能，优化血糖提醒
Showing 3 changed files with 14 additions and 3 deletions
platform-dal/src/main/java/com/lyms/platform/query/ArchiveDataQuery.java
View file @
07fa123
| ... | ... | @@ -157,7 +157,12 @@ |
| 157 | 157 | condition= condition.and("phone",phone, MongoOper.IS); |
| 158 | 158 | } |
| 159 | 159 | if (StringUtils.isNotEmpty(type)){ |
| 160 | - condition= condition.and("type","1", MongoOper.NE); | |
| 160 | + if ("true".equals(type)){ | |
| 161 | + condition= condition.and("type","1", MongoOper.NE); | |
| 162 | + }else { | |
| 163 | + condition= condition.and("type","1", MongoOper.IS); | |
| 164 | + } | |
| 165 | + | |
| 161 | 166 | } |
| 162 | 167 | |
| 163 | 168 | Criteria c = null; |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RemoteController.java
View file @
07fa123
| ... | ... | @@ -218,6 +218,7 @@ |
| 218 | 218 | @ResponseBody |
| 219 | 219 | @TokenRequired |
| 220 | 220 | public BaseListResponse queryTodayArchiveList(HttpServletRequest request, |
| 221 | + @RequestParam(required = false) Integer type, | |
| 221 | 222 | @RequestParam(required = false) Integer assistUserId, |
| 222 | 223 | @RequestParam(required = false) String created, |
| 223 | 224 | @RequestParam(required = false) Integer page, |
| ... | ... | @@ -241,7 +242,12 @@ |
| 241 | 242 | } |
| 242 | 243 | //大同做特殊处理只查询type为1的 |
| 243 | 244 | if ("2100002419".equals(hospitalId)){ |
| 244 | - query.setType("true"); | |
| 245 | + if (type!=null){ | |
| 246 | + query.setType("false"); | |
| 247 | + }else { | |
| 248 | + query.setType("true"); | |
| 249 | + } | |
| 250 | + | |
| 245 | 251 | } |
| 246 | 252 | |
| 247 | 253 | query.setNeed("true"); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java
View file @
07fa123
| ... | ... | @@ -165,7 +165,7 @@ |
| 165 | 165 | |
| 166 | 166 | report.setStatus(0); |
| 167 | 167 | report.setType(bpCountType + countType); |
| 168 | - report.setGuide(bp.getInfos().size() >= 5 ? typeGuideMap.get(report.getType()) : "在这周你的血压测量次数没有达到可以出报告的标准，但是根据你的孕周这份报告可以给你提供相应的膳食指导。"); | |
| 168 | + report.setGuide(bp.getInfos().size() >= 5 ? typeGuideMap.get(report.getType()) : "本周您的血压测量次数未达到出报告的标准（测量次数需满5次），但根据您当前的孕周，我们仍能为您定制一份适合当前阶段的膳食指导报告。"); | |
| 169 | 169 | report.setBpWaveCount(String.valueOf(bpcount)); |
| 170 | 170 | report.setBpValExp(String.valueOf(count)); |
| 171 | 171 | report.setYn(YnEnums.YES.getId()); |