Commit 79bad1a11f795a8e1961a5b3e4b9e49ed19a7073
1 parent
047bd607e4
Exists in
master
and in
6 other branches
出院小结和自动诊断
Showing 3 changed files with 18 additions and 12 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
View file @
79bad1a
| ... | ... | @@ -5862,6 +5862,9 @@ |
| 5862 | 5862 | map.put("name", pat.getUsername()); |
| 5863 | 5863 | map.put("cardNo", pat.getCardNo()); |
| 5864 | 5864 | map.put("phone", pat.getPhone()); |
| 5865 | + | |
| 5866 | + map.put("fid", model.getFid() == null ? "" : model.getFid()); | |
| 5867 | + | |
| 5865 | 5868 | map.put("autoTime", DateUtil.getyyyy_MM_dd(model.getCreated())); |
| 5866 | 5869 | map.put("week", DateUtil.getWeekDesc(pat.getLastMenses(), model.getCreated())); |
| 5867 | 5870 | map.put("riskLevel", commonService.findRiskLevel(model.gethLevel())); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java
View file @
79bad1a
| ... | ... | @@ -400,9 +400,12 @@ |
| 400 | 400 | } |
| 401 | 401 | |
| 402 | 402 | public BaseResponse list(Integer page, Integer limit, Integer userId, String leaveHospitalDate, Integer postpartumDays, Integer endPostpartumDays, String fmDate, String queryNo) { |
| 403 | - List<String> hospital = groupsFacade.findGroupHospital(userId, false); | |
| 404 | - Criteria criteria = Criteria.where("yn").ne("0").and("hospitalId").in(hospital); | |
| 405 | - Criteria pCriteria = Criteria.where("yn").ne("0").and("hospitalId").in(hospital); | |
| 403 | + //List<String> hospital = groupsFacade.findGroupHospital(userId, false); | |
| 404 | +// Criteria criteria = Criteria.where("yn").ne("0").and("hospitalId").in(hospital); | |
| 405 | +// Criteria pCriteria = Criteria.where("yn").ne("0").and("hospitalId").in(hospital); | |
| 406 | + String hospitalId = autoMatchFacade.getHospitalId(userId); | |
| 407 | + Criteria criteria = Criteria.where("yn").is("1").and("hospitalId").is(hospitalId); | |
| 408 | + Criteria pCriteria = Criteria.where("yn").is("1"); | |
| 406 | 409 | boolean flag = false; |
| 407 | 410 | if (StringUtils.isNotEmpty(queryNo)) { |
| 408 | 411 | pCriteria.orOperator(Criteria.where("cardNo").regex(queryNo), |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
View file @
79bad1a
| ... | ... | @@ -4988,15 +4988,15 @@ |
| 4988 | 4988 | if (temp.getpId() == null) { |
| 4989 | 4989 | continue; |
| 4990 | 4990 | } |
| 4991 | - BabyModelQuery babyModelQuery = new BabyModelQuery(); | |
| 4992 | - babyModelQuery.setDataStatus(false); | |
| 4993 | - //babyModelQuery.setYn(YnEnums.YES.getId()); | |
| 4994 | - babyModelQuery.setPid(temp.getpId()); | |
| 4995 | - babyModelQuery.setPregnancyOut(RenShenJieJuEnums.O.getId()); | |
| 4996 | - List <BabyModel> babyModels = babyService.queryBabyWithQuery(babyModelQuery); | |
| 4997 | - if (CollectionUtils.isEmpty(babyModels)) { | |
| 4998 | - continue; | |
| 4999 | - } | |
| 4991 | +// BabyModelQuery babyModelQuery = new BabyModelQuery(); | |
| 4992 | +// babyModelQuery.setDataStatus(false); | |
| 4993 | +// //babyModelQuery.setYn(YnEnums.YES.getId()); | |
| 4994 | +// babyModelQuery.setPid(temp.getpId()); | |
| 4995 | +// babyModelQuery.setPregnancyOut(RenShenJieJuEnums.O.getId()); | |
| 4996 | +// List <BabyModel> babyModels = babyService.queryBabyWithQuery(babyModelQuery); | |
| 4997 | +// if (CollectionUtils.isEmpty(babyModels)) { | |
| 4998 | +// continue; | |
| 4999 | +// } | |
| 5000 | 5000 | |
| 5001 | 5001 | Map <String, Object> babyMap = new HashMap <>(); |
| 5002 | 5002 |