jiangjiazhi / regional-platform

Authored by zhangchao over 1 year ago

Exists in dev

Showing 5 changed files with 23 additions and 2 deletions

...	...	@@ -452,6 +452,16 @@
452	452	//大同his同步分娩建档数据不给护士及门诊展示住院用
453	453	private boolean dtFm=false;
454	454
	455	+ private String allPats;
	456	+
	457	+ public String getAllPats() {
	458	+ return allPats;
	459	+ }
	460	+
	461	+ public void setAllPats(String allPats) {
	462	+ this.allPats = allPats;
	463	+ }
	464	+
455	465	public boolean isDtFm() {
456	466	return dtFm;
457	467	}
...	...	@@ -1118,7 +1128,7 @@
1118	1128
1119	1129	if (StringUtils.isNotEmpty(rLevel)) {
1120	1130	//大同特殊处理按颜色等于查询
1121		- if("2100002419".equals(hospitalId)){
	1131	+ if("2100002419".equals(hospitalId)&&StringUtils.isEmpty(allPats)){
1122	1132	List<String> levelList= StringUtils.covertToList(rLevel, String.class);
1123	1133	if (CollectionUtils.isNotEmpty(levelList)){
1124	1134	if (levelList.size()>1){

...	...	@@ -113,6 +113,7 @@
113	113	@TokenRequired
114	114	public BaseResponse queryAllPatPuerpera(@Valid RiskPatientsQueryRequest patientsQueryRequest, HttpServletRequest request) {
115	115	LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
	116	+ patientsQueryRequest.setAllPats("allPats");
116	117	return patientFacade.queryHighRisk1(patientsQueryRequest, null, null, loginState.getId(), null, Boolean.FALSE);
117	118	}
118	119

...	...	@@ -258,6 +258,7 @@
258	258
259	259	private PatientsQuery complayRequest(RiskPatientsQueryRequest riskPatientsQueryRequest, Boolean isHighRisk, Integer type, Integer userId, String needPage, boolean isRegion,String hospitalId) {
260	260	PatientsQuery patientsQuery = new PatientsQuery();
	261	+ patientsQuery.setAllPats(riskPatientsQueryRequest.getAllPats());
261	262	patientsQuery.setPhone(riskPatientsQueryRequest.getPhone());
262	263	patientsQuery.setCardNo(riskPatientsQueryRequest.getCardNo());
263	264	patientsQuery.setNotEnable(riskPatientsQueryRequest.getNotEnable());

...	...	@@ -196,6 +196,15 @@
196	196	//大同高危专号
197	197	private String highRiskFileCode;
198	198
	199	+ private String allPats;//用于区分是那个来的
	200	+
	201	+ public String getAllPats() {
	202	+ return allPats;
	203	+ }
	204	+
	205	+ public void setAllPats(String allPats) {
	206	+ this.allPats = allPats;
	207	+ }
199	208
200	209	public String getHighRiskFileCode() {
201	210	return highRiskFileCode;

...	...	@@ -60,7 +60,7 @@
60	60	//urls.put("area-zhucheng-api.healthbaby.com.cn:12356","诸城市妇幼保健院");
61	61	//urls.put("area-weihai-api.healthbaby.com.cn:12356","威海市妇幼");
62	62	//urls.put("area-chengde-api.healthbaby.com.cn:12356","承德");
63		- urls.put("area-nanhe-api.healthbaby.com.cn:1236","南和");
	63	+ urls.put("area-nanhe-api.healthbaby.com.cn:12356","南和");
64	64	urls.put("area-dt-api.healthbaby.com.cn:12356","大同");
65	65	//urls.put("area-lingcheng-api.healthbaby.com.cn:12356","陵城");
66	66	}