Commit 667e6bec4664e6d2e57e619a7d873b7030c5c141
1 parent
2a321e4ea1
Exists in
dev
#fix:优化大同高危指导书医生签名、指导信息隐藏等功能
Showing 3 changed files with 27 additions and 8 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java
View file @
667e6be
| ... | ... | @@ -2370,7 +2370,14 @@ |
| 2370 | 2370 | return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setData(null).setErrormsg("成功"); |
| 2371 | 2371 | } |
| 2372 | 2372 | List<Map<String,String>> list=new ArrayList<>(); |
| 2373 | - String height=antExChuModel.getHeight(); | |
| 2373 | + Map<String,String> chu=new HashMap<>(); | |
| 2374 | + chu.put("date",DateUtil.formatYMDDate(antExChuModel.getCheckTime())); | |
| 2375 | + chu.put("weight",antExChuModel.getWeight()); | |
| 2376 | + chu.put("bp",antExChuModel.getBp()); | |
| 2377 | + chu.put("height",antExChuModel.getHeight()); | |
| 2378 | + chu.put("bmi",patientWeightService.getBmi(antExChuModel.getWeight(), antExChuModel.getHeight())); | |
| 2379 | + list.add(chu); | |
| 2380 | + String height=antExChuModel.getHeight(); | |
| 2374 | 2381 | for (AntenatalExaminationModel model:examinationModelList) { |
| 2375 | 2382 | Map<String,String> params=new HashMap<>(); |
| 2376 | 2383 | String weight=model.getWeight().toString(); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
View file @
667e6be
| ... | ... | @@ -467,6 +467,10 @@ |
| 467 | 467 | model.setDoctorSign(antExAddRequest.getDoctorSign()); |
| 468 | 468 | model.setPatientSign(antExAddRequest.getPatientSign()); |
| 469 | 469 | |
| 470 | + if ("2100002419".equals(hospitalId)){ | |
| 471 | + model.setGuide(" "); | |
| 472 | + } | |
| 473 | + | |
| 470 | 474 | //大同特殊处理 |
| 471 | 475 | if (antExAddRequest.getDoctorType()!=null && antExAddRequest.getDoctorType()==0){ |
| 472 | 476 | //准备添加数据 |
| ... | ... | @@ -930,6 +934,11 @@ |
| 930 | 934 | } |
| 931 | 935 | antExChuModel.setOperator(userId); |
| 932 | 936 | antExChuModel.setHospitalId(hospitalId); |
| 937 | + | |
| 938 | + if ("2100002419".equals(hospitalId)){ | |
| 939 | + antExChuModel.setDirOpinion(" "); | |
| 940 | + } | |
| 941 | + | |
| 933 | 942 | //大同特殊处理 |
| 934 | 943 | if (excAddRequest.getDoctorType()!=null && excAddRequest.getDoctorType()==0){ |
| 935 | 944 | //准备添加数据 |
platform-sync-data/src/main/java/com/lyms/platform/sync/data/service/SyncDataService.java
View file @
667e6be
| ... | ... | @@ -871,16 +871,19 @@ |
| 871 | 871 | Date nextDate = DataUtil.getDate(map.get("NEXTCHECKTIME")); |
| 872 | 872 | antxModel.setcDueWeek(String.valueOf(DateUtil.getDays(lastMenses, nextDate) / 7)); |
| 873 | 873 | } |
| 874 | - | |
| 875 | - String content = ""; | |
| 876 | - for(Map<String,Object> guide : patientGuides) | |
| 877 | - { | |
| 878 | - if (guide.get("ES_PREGNANCYWEEK") != null && DataUtil.getString(guide.get("ES_PREGNANCYWEEK")).equals(String.valueOf(weeks)) ) | |
| 874 | + //大同医院不增加指导 20260127需求 | |
| 875 | + if (!"2100002419".equals(antxModel.getHospitalId())){ | |
| 876 | + String content = ""; | |
| 877 | + for(Map<String,Object> guide : patientGuides) | |
| 879 | 878 | { |
| 880 | - content+=guide.get("CONTENT")+"\n"; | |
| 879 | + if (guide.get("ES_PREGNANCYWEEK") != null && DataUtil.getString(guide.get("ES_PREGNANCYWEEK")).equals(String.valueOf(weeks)) ) | |
| 880 | + { | |
| 881 | + content+=guide.get("CONTENT")+"\n"; | |
| 882 | + } | |
| 881 | 883 | } |
| 884 | + antxModel.setGuide(content); | |
| 882 | 885 | } |
| 883 | - antxModel.setGuide(content); | |
| 886 | + | |
| 884 | 887 | |
| 885 | 888 | Patients pat = new Patients(); |
| 886 | 889 |