Commit 0aa855fe4a5310f91846d6c157bb74fae24f3f29
1 parent
9e285f2332
Exists in
dev
#fix:新增五色管理小程序文章查询逻辑
Showing 3 changed files with 33 additions and 2 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientDtController.java
View file @
0aa855f
| ... | ... | @@ -63,11 +63,13 @@ |
| 63 | 63 | private AppointmentService appointmentService; |
| 64 | 64 | @Autowired |
| 65 | 65 | private PatientServiceService patientServiceService; |
| 66 | + public static final String MEMBER_BABY_URL= PropertiesUtils.getPropertyValue("member_baby_url"); | |
| 66 | 67 | |
| 67 | 68 | final static Integer userId=2100013059;//默认为客服ID |
| 68 | 69 | final static String hospitalId="2100002419";//大同医院ID |
| 69 | 70 | final static String Authorization="492$2&Y34sl0adJLTsbm4aim78"; |
| 70 | 71 | |
| 72 | + | |
| 71 | 73 | /** |
| 72 | 74 | * 大同his获取孕妇小程序预建档信息——末次月经、血压、体重、既往史、个人史、家族史、传染病史、手术史数据 |
| 73 | 75 | * @param idCard |
| ... | ... | @@ -584,6 +586,33 @@ |
| 584 | 586 | HttpClientUtil.doGet("http://192.168.5.23:9090/dtdyrm/getdtAppointment" ,params,"utf-8",null); |
| 585 | 587 | //System.out.println(str); |
| 586 | 588 | return new BaseResponse(); |
| 589 | + } | |
| 590 | + | |
| 591 | + | |
| 592 | + @RequestMapping(method = RequestMethod.GET, value = "/pc/pregnancy") | |
| 593 | + @ResponseBody | |
| 594 | + public String getPregnancyList( String page, | |
| 595 | + String limit, | |
| 596 | + String phone, | |
| 597 | + String days, | |
| 598 | + String type, | |
| 599 | + String categoryId){ | |
| 600 | + | |
| 601 | + Map<String,String> params=new HashMap<>(); | |
| 602 | + params.put("page",page); | |
| 603 | + params.put("limit",limit); | |
| 604 | + params.put("phone",phone); | |
| 605 | + params.put("days",days); | |
| 606 | + String str; | |
| 607 | + if ("4312".equals(categoryId) ){ | |
| 608 | + str= HttpClientUtil.doGet(MEMBER_BABY_URL+"/wx/pc/riskGuide" ,params,"utf-8",null); | |
| 609 | + }else { | |
| 610 | + params.put("categoryId",categoryId); | |
| 611 | + params.put("type",type); | |
| 612 | + str= HttpClientUtil.doGet(MEMBER_BABY_URL+"/wx/pc/articles/precise" ,params,"utf-8",null); | |
| 613 | + } | |
| 614 | + //System.out.println(str); | |
| 615 | + return str; | |
| 587 | 616 | } |
| 588 | 617 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java
View file @
0aa855f
| ... | ... | @@ -696,7 +696,7 @@ |
| 696 | 696 | } |
| 697 | 697 | } |
| 698 | 698 | //产检医生 |
| 699 | - patientsQuery.setLastCheckEmployeeId(patientsQuery.getLastCheckEmployeeId()); | |
| 699 | + patientsQuery.setLastCheckEmployeeId(riskPatientsQueryRequest.getLastCheckDoctorId()); | |
| 700 | 700 | //最后一次检查时间 |
| 701 | 701 | if (StringUtils.isNotEmpty(riskPatientsQueryRequest.getLastCTime())) { |
| 702 | 702 | String nextDateStr = riskPatientsQueryRequest.getLastCTime(); |
platform-operate-api/src/main/resources/config.properties
View file @
0aa855f