From c93d07bffb3d9023a363f83ba462d753a2e003a5 Mon Sep 17 00:00:00 2001 From: wtt Date: Fri, 6 Nov 2020 15:36:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=BB=A6=E5=B9=B3=E5=BB=BA=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/lyms/platform/pojo/Patients.java | 11 ++++ .../web/controller/PregnantBuildController.java | 23 ++++++++ .../operate/web/facade/BookbuildingFacade.java | 62 ++++++++++++++++++++++ .../platform/operate/web/facade/ViewFacade.java | 2 + .../web/request/YunBookbuildingAddRequest.java | 10 ++++ .../operate/web/result/PregnantInfoResult.java | 9 ++++ 6 files changed, 117 insertions(+) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java index 8100352..d9e6e37 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java @@ -18,6 +18,9 @@ public class Patients extends BaseModel { private static final long serialVersionUID = SerialIdEnum.Patients.getCid(); + //预约住院分娩医院(滦平定制) + private String yyzyfmHospitalId; + private String shortCode; //筛查结果 @@ -571,6 +574,14 @@ public class Patients extends BaseModel { this.followupTime = followupTime; } + public String getYyzyfmHospitalId() { + return yyzyfmHospitalId; + } + + public void setYyzyfmHospitalId(String yyzyfmHospitalId) { + this.yyzyfmHospitalId = yyzyfmHospitalId; + } + public String getStop() { return stop; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PregnantBuildController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PregnantBuildController.java index 1f0a739..9f0e8ca 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PregnantBuildController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PregnantBuildController.java @@ -287,6 +287,29 @@ public class PregnantBuildController extends BaseController { BaseObjectResponse objectResponse = bookbuildingFacade.queryHospitals(keyWord, page, limit); return objectResponse; } + + /** + * 滦平定制，第一个是滦平医院+最后是其它 + * + * @param request + * @param keyWord + * @param page + * @param limit + * @Author: 武涛涛 + * @Date: 2020/11/5 16:01 + */ + @RequestMapping(value = "/queryHospitalsLp", method = RequestMethod.GET) + @ResponseBody + @TokenRequired + public BaseObjectResponse queryHospitalsLp(HttpServletRequest request, + @RequestParam(required = false) String keyWord, + @RequestParam(required = false) Integer page, + @RequestParam(required = false) Integer limit) { + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + BaseObjectResponse objectResponse = bookbuildingFacade.queryHospitalsLp(loginState.getId(),keyWord, page, limit); + return objectResponse; + } + /** * 衡水产筛区域统计查询申请医院下拉框，权限限制 * diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index 4b913cf..a474c22 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -1938,6 +1938,12 @@ public class BookbuildingFacade { FilePathModel filePath = yunBookbuildingService.findFilePath(p.getId()); result = getResult(p); + if(StringUtils.isNotEmpty(p.getYyzyfmHospitalId())){ + Map doctorObj = new HashMap<>(); + doctorObj.put("id", p.getYyzyfmHospitalId()); + doctorObj.put("name", StringUtils.isNotEmpty(p.getYyzyfmHospitalId()) ? organizationService.getOrganizationName(p.getYyzyfmHospitalId()) : ""); + result.setYyzyfmHospitalId(doctorObj); + } result.setFilePath(filePath); /** 末次月经和纠正末次月经反起来返回 */ if (p.getFuckLastMens() != null) { @@ -2276,6 +2282,62 @@ public class BookbuildingFacade { return objectResponse; } /** + * 滦平定制 + * + * @param keyWord + * @param page + * @param limit + * @Author: 武涛涛 + * @Date: 2020/11/5 16:02 + */ + public BaseObjectResponse queryHospitalsLp(Integer userId,String keyWord, Integer page, Integer limit) { + String hospitalId = autoMatchFacade.getHospitalId(userId); + + OrganizationQuery organizationQuery = new OrganizationQuery(); + if (null != page && limit != null) { + organizationQuery.setNeed("true"); + organizationQuery.setPage(page); + organizationQuery.setLimit(limit); + organizationQuery.setSort("modified desc"); + } + + organizationQuery.setYn(YnEnums.YES.getId()); + organizationQuery.setKeyword(keyWord); + + + List> mapList = new ArrayList<>(); + List orgs = organizationService.queryHospitals(organizationQuery); + if (CollectionUtils.isNotEmpty(orgs)) { + Map maplp = new HashMap<>(); + for (Organization org : orgs) { + if(org.getId()!=null && org.getId().toString().equals(hospitalId)){ + maplp.put("id", org.getId() + ""); + maplp.put("name", org.getName()); + } + Map map = new HashMap<>(); + map.put("id", org.getId() + ""); + map.put("name", org.getName()); + mapList.add(map); + } + mapList.add(maplp); + if(CollectionUtils.isNotEmpty(mapList)){ + Collections.swap(mapList, mapList.size()-1, 0); + Map mapqt = new HashMap<>(); + mapqt.put("id","21000013770000001"+ ""); + mapqt.put("name", "其他"); + mapList.add(mapqt); + } + + } + + BaseObjectResponse objectResponse = new BaseObjectResponse(); + objectResponse.setData(mapList); + + objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); + objectResponse.setErrormsg("成功"); + return objectResponse; + } + /** * 获取医院列表，授权限限制 * * @param keyWord diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index efb66a6..e7e2e3a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -436,6 +436,8 @@ public class ViewFacade { public Map getPatientViewData(Patients data, String id) { Map map = new HashMap <>(); + map.put("yyzyfmHospitalId", StringUtils.isNotEmpty(data.getYyzyfmHospitalId()) ? organizationService.getOrganizationName(data.getYyzyfmHospitalId()) : ""); + map.put("lastMenstrualPeriodBasis", BasisEnums.getName(data.getLastMenstrualPeriodBasis())); map.put("lastMenstrualPeriodBasisDoctorId", couponMapper.findUserName(data.getLastMenstrualPeriodBasis())); map.put("lastMenstrualPeriodBasisDate", data.getLastMenstrualPeriodBasisDate()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java index 457c290..2d6c075 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java @@ -13,6 +13,8 @@ import java.util.Map; */ @Form public class YunBookbuildingAddRequest { + //预约住院分娩医院(滦平定制) + private String yyzyfmHospitalId; // 纠正末次月经 (和末次月经反起存) private String fuckLastMens; @@ -1071,6 +1073,14 @@ public class YunBookbuildingAddRequest { this.pregnantLiveStreetId = pregnantLiveStreetId; } + public String getYyzyfmHospitalId() { + return yyzyfmHospitalId; + } + + public void setYyzyfmHospitalId(String yyzyfmHospitalId) { + this.yyzyfmHospitalId = yyzyfmHospitalId; + } + public String getChildbirthStreetId() { return childbirthStreetId; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java index b5e1ff0..5631cff 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java @@ -9,6 +9,7 @@ import java.util.Map; * Created by Administrator on 2016/6/15. */ public class PregnantInfoResult { + private Map yyzyfmHospitalId; // 纠正末次月经 private String fuckLastMens; @@ -992,6 +993,14 @@ public class PregnantInfoResult { return serviceStatus; } + public Map getYyzyfmHospitalId() { + return yyzyfmHospitalId; + } + + public void setYyzyfmHospitalId(Map yyzyfmHospitalId) { + this.yyzyfmHospitalId = yyzyfmHospitalId; + } + public void setServiceStatus(String serviceStatus) { this.serviceStatus = serviceStatus; } -- 1.8.3.1