jiangjiazhi / regional-platform

Authored by liquanyu over 4 years ago

Exists in master and in 6 other branches

Showing 6 changed files with 28 additions and 1 deletions

...	...	@@ -122,6 +122,8 @@
122	122
123	123	AntExRecordQuery antExRecordQuery = new AntExRecordQuery();
124	124
	125	+ antExRecordQuery.setStatus(antExManagerQueryRequest.getDeuStatus());
	126	+
125	127	antExRecordQuery.setZyzlState(antExManagerQueryRequest.getZyzlState());
126	128	antExRecordQuery.setZywzzlState(antExManagerQueryRequest.getZywzzlState());
127	129	antExRecordQuery.setZyatzlState(antExManagerQueryRequest.getZyatzlState());

...	...	@@ -102,6 +102,9 @@
102	102
103	103	public static ExpiryMap<String, BaseResponse> cacheGetServiceList = new ExpiryMap<>(1000 * 60 * 3);
104	104
	105	+ @Autowired
	106	+ private AutoMatchFacade autoMatchFacade;
	107	+
105	108	/**
106	109	* 获取当前用户拥有的医院权限列表并和查询条件取交集
107	110	*
...	...	@@ -303,6 +306,8 @@
303	306	Date startTime = null;
304	307	Date endTime = null;
305	308
	309	+ String currentHospitalId = autoMatchFacade.getHospitalId(userId);
	310	+
306	311	Date checkStartTime = null;
307	312	Date checkEndTime = null;
308	313	if (StringUtils.isNotEmpty(time)) {
...	...	@@ -327,6 +332,14 @@
327	332	List<Integer> num27 = new ArrayList<>();
328	333	List<Integer> num36 = new ArrayList<>();
329	334	List<Integer> num40 = new ArrayList<>();
	335	+
	336	+
	337	+
	338	+ //衡水区域并且不是衡水市第六人民医院
	339	+ if(!"2100002324".equals(currentHospitalId))
	340	+ {
	341	+ hospitalIds.remove("2100002324");//衡水市第六人民医院
	342	+ }
330	343
331	344	List<Map<String, Object>> checkPointtList = new ArrayList<>();
332	345	if (CollectionUtils.isNotEmpty(hospitalIds)) {

...	...	@@ -112,6 +112,16 @@
112	112	private boolean isCurrent;
113	113
114	114	private String nextTime;
	115	+ //状态 1 已分娩 2未分娩
	116	+ private Integer deuStatus;
	117	+
	118	+ public Integer getDeuStatus() {
	119	+ return deuStatus;
	120	+ }
	121	+
	122	+ public void setDeuStatus(Integer deuStatus) {
	123	+ this.deuStatus = deuStatus;
	124	+ }
115	125
116	126	public String getNextTime() {
117	127	return nextTime;

...	...	@@ -595,6 +595,7 @@
595	595	areaQueryMap.put("tireNumber", "胎数");
596	596	areaQueryMap.put("livingNumber", "活产数");
597	597	areaQueryMap.put("address", "居住地");
	598	+ areaQueryMap.put("registerAddress", "户籍地址");
598	599	areaQueryMap.put("fmHospital", "分娩机构");
599	600	areaQueryMap.put("gcStatus", "产后观察");
600	601	areaQueryMap.put("recordsNum", "记录条数");

...	...	@@ -341,7 +341,7 @@
341	341	List<Map<String, Object>> infos = new ArrayList<>();
342	342	for (Patients patient : patients) {
343	343	for (Map<String, Object> map : hospitals) {
344		- if (patient.getHospitalId().equals(map.get("id").toString())) {
	344	+ if (patient.getHospitalId().equals(map.get("id").toString()) && !"2100002324".equals(patient.getHospitalId())) {
345	345	boolean flag = true;
346	346	for (Map<String, Object> info : infos) {
347	347	if (map.get((StringUtils.isNotEmpty(cityId) ? "areaId" : "cityId")).equals(info.get("id"))) {