diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientDtController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientDtController.java index 3861829..15d2dca 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientDtController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientDtController.java @@ -63,11 +63,13 @@ public class PatientDtController { private AppointmentService appointmentService; @Autowired private PatientServiceService patientServiceService; + public static final String MEMBER_BABY_URL= PropertiesUtils.getPropertyValue("member_baby_url"); final static Integer userId=2100013059;//默认为客服ID final static String hospitalId="2100002419";//大同医院ID final static String Authorization="492$2&Y34sl0adJLTsbm4aim78"; + /** * 大同his获取孕妇小程序预建档信息——末次月经、血压、体重、既往史、个人史、家族史、传染病史、手术史数据 * @param idCard @@ -585,4 +587,31 @@ public class PatientDtController { //System.out.println(str); return new BaseResponse(); } + + + @RequestMapping(method = RequestMethod.GET, value = "/pc/pregnancy") + @ResponseBody + public String getPregnancyList( String page, + String limit, + String phone, + String days, + String type, + String categoryId){ + + Map params=new HashMap<>(); + params.put("page",page); + params.put("limit",limit); + params.put("phone",phone); + params.put("days",days); + String str; + if ("4312".equals(categoryId) ){ + str= HttpClientUtil.doGet(MEMBER_BABY_URL+"/wx/pc/riskGuide" ,params,"utf-8",null); + }else { + params.put("categoryId",categoryId); + params.put("type",type); + str= HttpClientUtil.doGet(MEMBER_BABY_URL+"/wx/pc/articles/precise" ,params,"utf-8",null); + } + //System.out.println(str); + return str; + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java index 63538c7..1ed2598 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java @@ -696,7 +696,7 @@ public class RiskReportFacade { } } //产检医生 - patientsQuery.setLastCheckEmployeeId(patientsQuery.getLastCheckEmployeeId()); + patientsQuery.setLastCheckEmployeeId(riskPatientsQueryRequest.getLastCheckDoctorId()); //最后一次检查时间 if (StringUtils.isNotEmpty(riskPatientsQueryRequest.getLastCTime())) { String nextDateStr = riskPatientsQueryRequest.getLastCTime(); diff --git a/platform-operate-api/src/main/resources/config.properties b/platform-operate-api/src/main/resources/config.properties index 04dfea2..d7d17ab 100644 --- a/platform-operate-api/src/main/resources/config.properties +++ b/platform-operate-api/src/main/resources/config.properties @@ -58,4 +58,6 @@ lhfy_lis_url=https://lhfy-chengde-api.healthbaby.com.cn:12356/lis/getLhLisById #redis.servers=119.90.57.26:6379:Lyms123456 # 测试环境 118.193.124.187:6379:Lyms123456 -redis_servers=118.193.124.187:6379:Lyms123456 \ No newline at end of file +redis_servers=118.193.124.187:6379:Lyms123456 +#正式https://app-member-api.healthbaby.com.cn/ +member_baby_url=https://dev-app-member-api.healthbaby.com.cn \ No newline at end of file