jiangjiazhi / regional-platform

Commit c93d07bffb3d9023a363f83ba462d753a2e003a5

Authored by wtt over 4 years ago

Exists in master and in 6 other branches

滦平建档

Showing 6 changed files with 117 additions and 0 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PregnantBuildController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java

...	...	@@ -18,6 +18,9 @@
18	18
19	19	private static final long serialVersionUID = SerialIdEnum.Patients.getCid();
20	20
	21	+ //预约住院分娩医院(滦平定制)
	22	+ private String yyzyfmHospitalId;
	23	+
21	24	private String shortCode;
22	25
23	26	//筛查结果
...	...	@@ -569,6 +572,14 @@
569	572
570	573	public void setFollowupTime(Date followupTime) {
571	574	this.followupTime = followupTime;
	575	+ }
	576	+
	577	+ public String getYyzyfmHospitalId() {
	578	+ return yyzyfmHospitalId;
	579	+ }
	580	+
	581	+ public void setYyzyfmHospitalId(String yyzyfmHospitalId) {
	582	+ this.yyzyfmHospitalId = yyzyfmHospitalId;
572	583	}
573	584
574	585	public String getStop() {

...	...	@@ -287,6 +287,29 @@
287	287	BaseObjectResponse objectResponse = bookbuildingFacade.queryHospitals(keyWord, page, limit);
288	288	return objectResponse;
289	289	}
	290	+
	291	+ /**
	292	+ * 滦平定制，第一个是滦平医院+最后是其它
	293	+ *
	294	+ * @param request
	295	+ * @param keyWord
	296	+ * @param page
	297	+ * @param limit
	298	+ * @Author: 武涛涛
	299	+ * @Date: 2020/11/5 16:01
	300	+ */
	301	+ @RequestMapping(value = "/queryHospitalsLp", method = RequestMethod.GET)
	302	+ @ResponseBody
	303	+ @TokenRequired
	304	+ public BaseObjectResponse queryHospitalsLp(HttpServletRequest request,
	305	+ @RequestParam(required = false) String keyWord,
	306	+ @RequestParam(required = false) Integer page,
	307	+ @RequestParam(required = false) Integer limit) {
	308	+ LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
	309	+ BaseObjectResponse objectResponse = bookbuildingFacade.queryHospitalsLp(loginState.getId(),keyWord, page, limit);
	310	+ return objectResponse;
	311	+ }
	312	+
290	313	/**
291	314	* 衡水产筛区域统计查询申请医院下拉框，权限限制
292	315	*

...	...	@@ -1938,6 +1938,12 @@
1938	1938	FilePathModel filePath = yunBookbuildingService.findFilePath(p.getId());
1939	1939
1940	1940	result = getResult(p);
	1941	+ if(StringUtils.isNotEmpty(p.getYyzyfmHospitalId())){
	1942	+ Map<String, String> doctorObj = new HashMap<>();
	1943	+ doctorObj.put("id", p.getYyzyfmHospitalId());
	1944	+ doctorObj.put("name", StringUtils.isNotEmpty(p.getYyzyfmHospitalId()) ? organizationService.getOrganizationName(p.getYyzyfmHospitalId()) : "");
	1945	+ result.setYyzyfmHospitalId(doctorObj);
	1946	+ }
1941	1947	result.setFilePath(filePath);
1942	1948	/** 末次月经和纠正末次月经反起来返回 */
1943	1949	if (p.getFuckLastMens() != null) {
...	...	@@ -2266,6 +2272,62 @@
2266	2272	map.put("name", org.getName());
2267	2273	mapList.add(map);
2268	2274	}
	2275	+ }
	2276	+
	2277	+ BaseObjectResponse objectResponse = new BaseObjectResponse();
	2278	+ objectResponse.setData(mapList);
	2279	+
	2280	+ objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
	2281	+ objectResponse.setErrormsg("成功");
	2282	+ return objectResponse;
	2283	+ }
	2284	+ /**
	2285	+ * 滦平定制
	2286	+ *
	2287	+ * @param keyWord
	2288	+ * @param page
	2289	+ * @param limit
	2290	+ * @Author: 武涛涛
	2291	+ * @Date: 2020/11/5 16:02
	2292	+ */
	2293	+ public BaseObjectResponse queryHospitalsLp(Integer userId,String keyWord, Integer page, Integer limit) {
	2294	+ String hospitalId = autoMatchFacade.getHospitalId(userId);
	2295	+
	2296	+ OrganizationQuery organizationQuery = new OrganizationQuery();
	2297	+ if (null != page && limit != null) {
	2298	+ organizationQuery.setNeed("true");
	2299	+ organizationQuery.setPage(page);
	2300	+ organizationQuery.setLimit(limit);
	2301	+ organizationQuery.setSort("modified desc");
	2302	+ }
	2303	+
	2304	+ organizationQuery.setYn(YnEnums.YES.getId());
	2305	+ organizationQuery.setKeyword(keyWord);
	2306	+
	2307	+
	2308	+ List<Map<String, String>> mapList = new ArrayList<>();
	2309	+ List<Organization> orgs = organizationService.queryHospitals(organizationQuery);
	2310	+ if (CollectionUtils.isNotEmpty(orgs)) {
	2311	+ Map<String, String> maplp = new HashMap<>();
	2312	+ for (Organization org : orgs) {
	2313	+ if(org.getId()!=null && org.getId().toString().equals(hospitalId)){
	2314	+ maplp.put("id", org.getId() + "");
	2315	+ maplp.put("name", org.getName());
	2316	+ }
	2317	+ Map<String, String> map = new HashMap<>();
	2318	+ map.put("id", org.getId() + "");
	2319	+ map.put("name", org.getName());
	2320	+ mapList.add(map);
	2321	+ }
	2322	+ mapList.add(maplp);
	2323	+ if(CollectionUtils.isNotEmpty(mapList)){
	2324	+ Collections.swap(mapList, mapList.size()-1, 0);
	2325	+ Map<String, String> mapqt = new HashMap<>();
	2326	+ mapqt.put("id","21000013770000001"+ "");
	2327	+ mapqt.put("name", "其他");
	2328	+ mapList.add(mapqt);
	2329	+ }
	2330	+
2269	2331	}
2270	2332
2271	2333	BaseObjectResponse objectResponse = new BaseObjectResponse();

...	...	@@ -436,6 +436,8 @@
436	436
437	437	public Map <String, Object> getPatientViewData(Patients data, String id) {
438	438	Map <String, Object> map = new HashMap <>();
	439	+ map.put("yyzyfmHospitalId", StringUtils.isNotEmpty(data.getYyzyfmHospitalId()) ? organizationService.getOrganizationName(data.getYyzyfmHospitalId()) : "");
	440	+
439	441	map.put("lastMenstrualPeriodBasis", BasisEnums.getName(data.getLastMenstrualPeriodBasis()));
440	442	map.put("lastMenstrualPeriodBasisDoctorId", couponMapper.findUserName(data.getLastMenstrualPeriodBasis()));
441	443	map.put("lastMenstrualPeriodBasisDate", data.getLastMenstrualPeriodBasisDate());

...	...	@@ -13,6 +13,8 @@
13	13	*/
14	14	@Form
15	15	public class YunBookbuildingAddRequest {
	16	+ //预约住院分娩医院(滦平定制)
	17	+ private String yyzyfmHospitalId;
16	18
17	19	// 纠正末次月经 (和末次月经反起存)
18	20	private String fuckLastMens;
...	...	@@ -1069,6 +1071,14 @@
1069	1071
1070	1072	public void setPregnantLiveStreetId(String pregnantLiveStreetId) {
1071	1073	this.pregnantLiveStreetId = pregnantLiveStreetId;
	1074	+ }
	1075	+
	1076	+ public String getYyzyfmHospitalId() {
	1077	+ return yyzyfmHospitalId;
	1078	+ }
	1079	+
	1080	+ public void setYyzyfmHospitalId(String yyzyfmHospitalId) {
	1081	+ this.yyzyfmHospitalId = yyzyfmHospitalId;
1072	1082	}
1073	1083
1074	1084	public String getChildbirthStreetId() {

...	...	@@ -9,6 +9,7 @@
9	9	* Created by Administrator on 2016/6/15.
10	10	*/
11	11	public class PregnantInfoResult {
	12	+ private Map<String, String> yyzyfmHospitalId;
12	13
13	14	// 纠正末次月经
14	15	private String fuckLastMens;
...	...	@@ -990,6 +991,14 @@
990	991
991	992	public String getServiceStatus() {
992	993	return serviceStatus;
	994	+ }
	995	+
	996	+ public Map <String, String> getYyzyfmHospitalId() {
	997	+ return yyzyfmHospitalId;
	998	+ }
	999	+
	1000	+ public void setYyzyfmHospitalId(Map <String, String> yyzyfmHospitalId) {
	1001	+ this.yyzyfmHospitalId = yyzyfmHospitalId;
993	1002	}
994	1003
995	1004	public void setServiceStatus(String serviceStatus) {