jiangjiazhi / regional-platform

Commit b6f62657584730ea9ac6fbbda7271fb7ca07c111

Authored by jiangjiazhi almost 9 years ago

Exists in master and in 6 other branches

Merge remote-tracking branch 'origin/master'

Showing 4 changed files

platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/CheckByDate.java
platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java
platform-operate-api/src/main/java/com/lyms/hospitalapi/v1/HisService.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java

...	...	@@ -9,26 +9,25 @@
9	9	*/
10	10
11	11	public class CheckByDate {
12		-
13		- private String time;
14		- private List<CheckType> types;
15		-
16		-
17		-
18		- public String getTime() {
19		- return time;
20		- }
21		- public void setTime(String time) {
22		- this.time = time;
23		- }
24		- public List<CheckType> getTypes() {
25		- return types;
26		- }
27		- public void setTypes(List<CheckType> types) {
28		- this.types = types;
29		- }
30		-
31		-
32		-
	12	+
	13	+
	14	+ private String time;
	15	+ private List<CheckType> types;
	16	+
	17	+ public String getTime() {
	18	+ return time;
	19	+ }
	20	+
	21	+ public void setTime(String time) {
	22	+ this.time = time;
	23	+ }
	24	+
	25	+ public List<CheckType> getTypes() {
	26	+ return types;
	27	+ }
	28	+
	29	+ public void setTypes(List<CheckType> types) {
	30	+ this.types = types;
	31	+ }
33	32	}

...	...	@@ -55,7 +55,7 @@
55	55
56	56
57	57	public void syncLisReportTimer() {
58		- Date date = new Date();
	58	+ Date date = new Date();
59	59	queryLisReport(new Date(date.getTime()-10006060));
60	60	}
61	61
...	...	@@ -274,8 +274,8 @@
274	274
275	275	return resultList;
276	276	}
277		-
278		-
	277	+
	278	+
279	279	/**
280	280	* gxk 新建接口(与queryCheckList接口显示格式不同)
281	281	* 根据日期或检查项目分类调用的方法
...	...	@@ -284,9 +284,9 @@
284	284	* @return
285	285	*/
286	286	public List<CheckByDate> queryCheckListupdate(String cardNo,int ftype){
287		-
288		- CheckResponse check1=new CheckResponse();
289		- check1.setModified(DateUtil.parseYMDHMS("2017-3-31"));
	287	+
	288	+ CheckResponse check1=new CheckResponse();
	289	+ check1.setModified(DateUtil.parseYMDHMS("2017-3-31 10:20:58"));
290	290	check1.setType(1);
291	291	check1.setName("张三");
292	292	check1.setTitle("血常规");
293	293
...	...	@@ -295,9 +295,9 @@
295	295	check1.setApplyDateStr(DateUtil.getyyyy_MM_dd(DateUtil.parseYMDHMS("2017-3-31")));
296	296	check1.setCheckDept("血科");
297	297	check1.setDoctor("王医生");
298		-
	298	+
299	299	CheckResponse check10=new CheckResponse();
300		- check10.setModified(DateUtil.parseYMDHMS("2017-3-31"));
	300	+ check10.setModified(DateUtil.parseYMDHMS("2017-3-31 10:20:58"));
301	301	check10.setType(1);
302	302	check10.setName("张三");
303	303	check10.setTitle("肝功能");
304	304
...	...	@@ -306,9 +306,9 @@
306	306	check10.setApplyDateStr(DateUtil.getyyyy_MM_dd(DateUtil.parseYMDHMS("2017-3-31")));
307	307	check10.setCheckDept("肝科");
308	308	check10.setDoctor("刘医生");
309		-
	309	+
310	310	CheckResponse check9=new CheckResponse();
311		- check9.setModified(DateUtil.parseYMDHMS("2017-3-31"));
	311	+ check9.setModified(DateUtil.parseYMDHMS("2017-3-31 10:20:58"));
312	312	check9.setType(2);
313	313	check9.setName("张三");
314	314	check9.setTitle("肝功能");
315	315
316	316
317	317
...	...	@@ -317,23 +317,23 @@
317	317	check9.setApplyDateStr(DateUtil.getyyyy_MM_dd(DateUtil.parseYMDHMS("2017-3-31")));
318	318	check9.setCheckDept("肝科");
319	319	check9.setDoctor("刘医生");
320		-
	320	+
321	321	CheckItemResponse check2=new CheckItemResponse();
322	322	check2.setName("白细胞");
323	323	check2.setCode("0101001");
324	324	check2.setRefer("4.00--10.00");
325	325	check2.setResult("13.68");
326	326	check2.setSpecial("H");
327		-
	327	+
328	328	CheckItemResponse check3=new CheckItemResponse();
329		-
	329	+
330	330	check3.setName("超敏 C反应蛋白");
331	331	check3.setCode("0101501");
332	332	check3.setRefer("0--5");
333	333	check3.setResult("3.2");
334	334	check3.setSpecial("M");
335	335	check3.setUnit("mg/L");
336		-
	336	+
337	337	CheckItemResponse check4=new CheckItemResponse();
338	338	check4.setName("大便性状");
339	339	check4.setCode("0103003");
...	...	@@ -341,7 +341,7 @@
341	341	check4.setResult("稀便");
342	342	check4.setSpecial("M");
343	343	check4.setUnit("");
344		-
	344	+
345	345	CheckItemResponse check5=new CheckItemResponse();
346	346	check5.setName("大便颜色");
347	347	check5.setCode("0103002");
...	...	@@ -349,7 +349,7 @@
349	349	check5.setResult("黄色");
350	350	check5.setSpecial("M");
351	351	check5.setUnit("");
352		-
	352	+
353	353	List<CheckItemResponse> listc=new ArrayList<CheckItemResponse>();
354	354	listc.add(check2);
355	355	listc.add(check3);
356	356
357	357
358	358
359	359
...	...	@@ -359,200 +359,201 @@
359	359	check1.setItemList(listc);
360	360	check10.setItemList(listc2);
361	361	check9.setItemList(listc2);
362		- List<CheckResponse> l=new ArrayList<CheckResponse>();
	362	+ List<CheckResponse> l=new ArrayList<CheckResponse>();
363	363	l.add(check1);
364	364	l.add(check10);
365	365	l.add(check9);
366		-
367		- if(1==ftype){
368		- List<CheckResponse> result = new ArrayList<>();
369		-
370		- List<CheckByDate> CheckByDate=new ArrayList<CheckByDate>();
371		- List<CheckType> CheckType=new ArrayList<CheckType>();
372		- result.addAll(l);
373		- //result.addAll(queryLisCheckList(cardNo));解开
374		- //result.addAll(queryPacsCheckList(cardNo));
375		- List<String> keyList = new ArrayList<>();
376		- // 去重
377		- List<CheckResponse> list = new ArrayList<>();
378		- Date tempDate = null;
379		- for (CheckResponse check:result) {
380		- if (check.getModified() != null && check.getModified().equals(tempDate)) {
381		- continue;
382		- }
383		- list.add(check);
384		- tempDate = check.getModified();
385		- }
386		- // 排序
387		- Collections.sort(list, new Comparator() {
388		- public int compare(Object a, Object b) {
389		- if (((CheckResponse)a).getModified() == null) {
390		- return -1;
391		- }
392		- if (((CheckResponse)b).getModified() == null) {
393		- return -1;
394		- }
395		- if (((CheckResponse)a).getModified().before(((CheckResponse)a).getModified())) {
396		- return 1;
397		- }
398		- return -1;
399		- }
400		- });
401		-
402		- for (CheckResponse check:list) {
403		- String ymd = DateUtil.getyyyy_MM_dd(check.getModified());
404		- if (!keyList.contains(ymd)) {
405		- keyList.add(ymd);
406		- }
407		-
408		- }
409		-
410		- for(String time:keyList){
411		- List<CheckResponse> result2=new ArrayList<>();
412		- CheckType jianyan=new CheckType();
413		- jianyan.setType("检验报告");
414		- CheckType yingxiang=new CheckType();
415		- yingxiang.setType("影像报告");
416		- CheckType other=new CheckType();
417		- other.setType("其它报告");
418		- for(CheckResponse chre:result){
419		- if(time.equals(DateUtil.getyyyy_MM_dd(chre.getModified()))){
420		- if(chre.getType() == 1){
421		- result2.add(chre);
422		- jianyan.setTypeName(result2);
423		- CheckType.add(jianyan);
424		- }else if(chre.getType() == 2){
425		- result2.add(chre);
426		- yingxiang.setTypeName(result2);
427		- CheckType.add(yingxiang);
428		- }else{
429		- result2.add(chre);
430		- other.setTypeName(result2);
431		- CheckType.add(other);
432		- }
433		- }
434		- }
435		-
436		- CheckByDate CheckByDate1=new CheckByDate();
437		- CheckByDate1.setTime(time);
438		- CheckByDate1.setTypes(CheckType);
439		- CheckByDate.add(CheckByDate1);
440		- }
441	366
442		- return CheckByDate;
443		-
444		- }else{
445		- List<CheckResponse> result = new ArrayList<>();
446		- List<CheckByDate> CheckByDate=new ArrayList<CheckByDate>();
447		- List<CheckType> CheckType=new ArrayList<CheckType>();
448		- result.addAll(l);
449		- //result.addAll(queryLisCheckList(cardNo));解开
450		- //result.addAll(queryPacsCheckList(cardNo));
451		- List<String> keyList = new ArrayList<>();
452		- List<String> listtype=new ArrayList<>();
453		- List<CheckResponse> listt = new ArrayList<>();
454		- // 去重
455		- List<CheckResponse> list = new ArrayList<>();
456		- Integer num=0;
457		- for(CheckResponse check:result){
458		- if(check.getType()!=null && check.getType()==num){
459		- continue;
460		- }
461		- list.add(check);
462		- num=check.getType();
463		- }
464		- String t=null;
465		- for(CheckResponse check:result){
466		- if(check.getTitle()!=null && check.getTitle().equals(t)){
467		- continue;
468		- }
469		- listt.add(check);
470		- t=check.getTitle();
471		- }
472		-
473		-
474		- // 排序
475		- Collections.sort(list, new Comparator() {
476		- public int compare(Object a, Object b) {
477		- if (((CheckResponse)a).getModified() == null) {
478		- return -1;
479		- }
480		- if (((CheckResponse)b).getModified() == null) {
481		- return -1;
482		- }
483		- if (((CheckResponse)a).getModified().before(((CheckResponse)a).getModified())) {
484		- return 1;
485		- }
486		- return -1;
487		- }
488		- });
489		-
490		- for (CheckResponse check:list) {
491		- Integer ymd = check.getType();
492		- if (!keyList.contains(ymd.toString())) {
493		- keyList.add(ymd.toString());
494		- }
495		-
496		- }
497		- for(CheckResponse check:listt){
498		- String ty=check.getTitle();
499		- if(!listtype.contains(ty)){
500		- listtype.add(ty);
501		- }
502		- }
503		-
504		-
505		-
506		-
507		- for(String type:keyList){
508		-
509		-
510		-
511		- for(String typ:listtype){
512		- List<CheckResponse> result2=new ArrayList<>();
513		- CheckType CheckType1=new CheckType();
514		- CheckType1.setType(typ);
515		- for(CheckResponse chre:result){
516		- if(type.equals(chre.getType().toString()) && typ.equals(chre.getTitle())){
517		- chre.setTitle(DateUtil.getyyyy_MM_dd(chre.getModified())+" "+chre.getTitle());
518		- result2.add(chre);
519		- CheckType1.setTypeName(result2);
520		- CheckType.add(CheckType1);
521		- }
522		-
523		- }
524		- }
525		-
526		-
527		- CheckByDate CheckByDate1=new CheckByDate();
528		- if("1".equals(type)){
529		- CheckByDate1.setTime("检验报告");
530		- CheckByDate1.setTypes(CheckType);
531		- CheckByDate.add(CheckByDate1);
532		- }else if("2".equals(type)){
533		- CheckByDate1.setTime("影像报告");
534		- CheckByDate1.setTypes(CheckType);
535		- CheckByDate.add(CheckByDate1);
536		- }else{
537		- CheckByDate1.setTime("其它报告");
538		- CheckByDate1.setTypes(CheckType);
539		- CheckByDate.add(CheckByDate1);
540		- }
541		-
542		- }
543		-
544		-
545		- return CheckByDate;
546		- }
547		-
	367	+ if(1==ftype){
	368	+ List<CheckResponse> result = new ArrayList<>();
	369	+
	370	+ List<CheckByDate> CheckByDate=new ArrayList<CheckByDate>();
	371	+ List<CheckType> CheckType=new ArrayList<CheckType>();
	372	+ result.addAll(l);
	373	+ //result.addAll(queryLisCheckList(cardNo));解开
	374	+ //result.addAll(queryPacsCheckList(cardNo));
	375	+ List<String> keyList = new ArrayList<>();
	376	+ // 去重
	377	+ List<CheckResponse> list = new ArrayList<>();
	378	+ Date tempDate = null;
	379	+ for (CheckResponse check:result) {
	380	+ if (check.getModified() != null && check.getModified().equals(tempDate)) {
	381	+ continue;
	382	+ }
	383	+ list.add(check);
	384	+ tempDate = check.getModified();
	385	+ }
	386	+ // 排序
	387	+ Collections.sort(list, new Comparator() {
	388	+ public int compare(Object a, Object b) {
	389	+ if (((CheckResponse)a).getModified() == null) {
	390	+ return -1;
	391	+ }
	392	+ if (((CheckResponse)b).getModified() == null) {
	393	+ return -1;
	394	+ }
	395	+ if (((CheckResponse)a).getModified().before(((CheckResponse)a).getModified())) {
	396	+ return 1;
	397	+ }
	398	+ return -1;
	399	+ }
	400	+ });
	401	+
	402	+ for (CheckResponse check:list) {
	403	+ String ymd = DateUtil.getyyyy_MM_dd(check.getModified());
	404	+ if (!keyList.contains(ymd)) {
	405	+ keyList.add(ymd);
	406	+ }
	407	+
	408	+ }
	409	+
	410	+ for(String time:keyList){
	411	+ List<CheckResponse> result2=new ArrayList<>();
	412	+ CheckType jianyan=new CheckType();
	413	+ jianyan.setType("检验报告");
	414	+ CheckType yingxiang=new CheckType();
	415	+ yingxiang.setType("影像报告");
	416	+ CheckType other=new CheckType();
	417	+ other.setType("其它报告");
	418	+ for(CheckResponse chre:result){
	419	+ if(time.equals(DateUtil.getyyyy_MM_dd(chre.getModified()))){
	420	+ if(chre.getType() == 1){
	421	+ result2.add(chre);
	422	+ jianyan.setTypeName(result2);
	423	+ CheckType.add(jianyan);
	424	+ }else if(chre.getType() == 2){
	425	+ result2.add(chre);
	426	+ yingxiang.setTypeName(result2);
	427	+ CheckType.add(yingxiang);
	428	+ }else{
	429	+ result2.add(chre);
	430	+ other.setTypeName(result2);
	431	+ CheckType.add(other);
	432	+ }
	433	+
	434	+ }
	435	+ }
	436	+
	437	+ CheckByDate CheckByDate1=new CheckByDate();
	438	+ CheckByDate1.setTime(time);
	439	+ CheckByDate1.setTypes(CheckType);
	440	+ CheckByDate.add(CheckByDate1);
	441	+ }
	442	+
	443	+ return CheckByDate;
	444	+
	445	+ }else{
	446	+ List<CheckResponse> result = new ArrayList<>();
	447	+ List<CheckByDate> CheckByDate=new ArrayList<CheckByDate>();
	448	+ List<CheckType> CheckType=new ArrayList<CheckType>();
	449	+ result.addAll(l);
	450	+ //result.addAll(queryLisCheckList(cardNo));解开
	451	+ //result.addAll(queryPacsCheckList(cardNo));
	452	+ List<String> keyList = new ArrayList<>();
	453	+ List<String> listtype=new ArrayList<>();
	454	+ List<CheckResponse> listt = new ArrayList<>();
	455	+ // 去重
	456	+ List<CheckResponse> list = new ArrayList<>();
	457	+ Integer num=0;
	458	+ for(CheckResponse check:result){
	459	+ if(check.getType()!=null && check.getType()==num){
	460	+ continue;
	461	+ }
	462	+ list.add(check);
	463	+ num=check.getType();
	464	+ }
	465	+ String t=null;
	466	+ for(CheckResponse check:result){
	467	+ if(check.getTitle()!=null && check.getTitle().equals(t)){
	468	+ continue;
	469	+ }
	470	+ listt.add(check);
	471	+ t=check.getTitle();
	472	+ }
	473	+
	474	+
	475	+ // 排序
	476	+ Collections.sort(list, new Comparator() {
	477	+ public int compare(Object a, Object b) {
	478	+ if (((CheckResponse)a).getModified() == null) {
	479	+ return -1;
	480	+ }
	481	+ if (((CheckResponse)b).getModified() == null) {
	482	+ return -1;
	483	+ }
	484	+ if (((CheckResponse)a).getModified().before(((CheckResponse)a).getModified())) {
	485	+ return 1;
	486	+ }
	487	+ return -1;
	488	+ }
	489	+ });
	490	+
	491	+ for (CheckResponse check:list) {
	492	+ Integer ymd = check.getType();
	493	+ if (!keyList.contains(ymd.toString())) {
	494	+ keyList.add(ymd.toString());
	495	+ }
	496	+
	497	+ }
	498	+ for(CheckResponse check:listt){
	499	+ String ty=check.getTitle();
	500	+ if(!listtype.contains(ty)){
	501	+ listtype.add(ty);
	502	+ }
	503	+ }
	504	+
	505	+
	506	+
	507	+
	508	+ for(String type:keyList){
	509	+
	510	+
	511	+
	512	+ for(String typ:listtype){
	513	+ List<CheckResponse> result2=new ArrayList<>();
	514	+ CheckType CheckType1=new CheckType();
	515	+ CheckType1.setType(typ);
	516	+ for(CheckResponse chre:result){
	517	+ if(type.equals(chre.getType().toString()) && typ.equals(chre.getTitle())){
	518	+ chre.setTitle(DateUtil.getyyyy_MM_dd(chre.getModified())+" "+chre.getTitle());
	519	+ result2.add(chre);
	520	+ CheckType1.setTypeName(result2);
	521	+ CheckType.add(CheckType1);
	522	+ }
	523	+
	524	+ }
	525	+ }
	526	+
	527	+
	528	+ CheckByDate CheckByDate1=new CheckByDate();
	529	+ if("1".equals(type)){
	530	+ CheckByDate1.setTime("检验报告");
	531	+ CheckByDate1.setTypes(CheckType);
	532	+ CheckByDate.add(CheckByDate1);
	533	+ }else if("2".equals(type)){
	534	+ CheckByDate1.setTime("影像报告");
	535	+ CheckByDate1.setTypes(CheckType);
	536	+ CheckByDate.add(CheckByDate1);
	537	+ }else{
	538	+ CheckByDate1.setTime("其它报告");
	539	+ CheckByDate1.setTypes(CheckType);
	540	+ CheckByDate.add(CheckByDate1);
	541	+ }
	542	+
	543	+ }
	544	+
	545	+
	546	+ return CheckByDate;
	547	+ }
	548	+
548	549	}
549		-
550		-
551		-
552		-
553		-
554		-
555	550
	551	+
	552	+
	553	+
	554	+
	555	+
	556	+
556	557	public List<CheckResponse> queryLisCheckList(String cardNo) {
557	558	List<CheckResponse> result = new ArrayList<>();
558	559	if (StringUtils.isNotBlank(cardNo)) {
...	...	@@ -684,7 +685,7 @@
684	685	QueryRunner queryRunner = new QueryRunner();
685	686
686	687	try {
687		- // List<DiagnosisInfo> list = queryRunner.query(conn, "select cyzdmc as diagnosisItem from ZY_BRSYK where blh= '"+blNo+"'", new BeanListHandler<DiagnosisInfo>(DiagnosisInfo.class));
	688	+ // List<DiagnosisInfo> list = queryRunner.query(conn, "select cyzdmc as diagnosisItem from ZY_BRSYK where blh= '"+blNo+"'", new BeanListHandler<DiagnosisInfo>(DiagnosisInfo.class));
688	689	List<DiagnosisInfo> list = queryRunner.query(conn, "select ZDMC as diagnosisItem from JHMK_BRZDQK where ZYHM = '"+blNo+"'", new BeanListHandler<DiagnosisInfo>(DiagnosisInfo.class));
689	690	if (CollectionUtils.isNotEmpty(list)) {
690	691	// for (DiagnosisInfo info:list) {

...	...	@@ -125,6 +125,7 @@
125	125	check10.setApplyDateStr(DateUtil.getyyyy_MM_dd(DateUtil.parseYMDHMS("2017-3-31")));
126	126	check10.setCheckDept("肝科");
127	127	check10.setDoctor("刘医生");
	128	+
128	129
129	130	CheckResponse check9=new CheckResponse();
130	131	check9.setModified(DateUtil.parseYMDHMS("2017-3-31"));

...	...	@@ -84,15 +84,15 @@
84	84	String areaId, Integer userId) {
85	85
86	86	String sql1 = "SELECT " +
87		- " AA.PROVINCE," +
88		- " AA.PROVINCE_ID," +
89		- " AA.CITY," +
90		- " AA.CITY_ID," +
91		- " AA.AREA_COUNTY," +
92		- " AA.AREA_COUNTY_ID ," +
93		- " AA.HOSPITAL_NAME," +
94		- " AA.HOSPITAL_NO," +
95		- " AA.YCY_STSTEM_ID, " +
	87	+ " AAA.PROVINCE," +
	88	+ " AAA.PROVINCE_ID," +
	89	+ " AAA.CITY," +
	90	+ " AAA.CITY_ID," +
	91	+ " AAA.AREA_COUNTY," +
	92	+ " AAA.AREA_COUNTY_ID ," +
	93	+ " AAA.HOSPITAL_NAME," +
	94	+ " AAA.HOSPITAL_NO," +
	95	+ " AAA.YCY_STSTEM_ID, " +
96	96	" AA.FF_RS AS FF_RS, " +
97	97	" AA.FF_JS AS FF_JS, " +
98	98	" (CASE WHEN SY_RS IS NULL THEN 0 ELSE SY_RS END) AS SY_RS," +
...	...	@@ -102,7 +102,7 @@
102	102	" (CASE WHEN TICKET_3 IS NULL THEN 0 ELSE TICKET_3 END) AS TICKET_3, " +
103	103	" (CASE WHEN TICKET_4 IS NULL THEN 0 ELSE TICKET_4 END) AS TICKET_4, " +
104	104	" (CASE WHEN TICKET_5 IS NULL THEN 0 ELSE TICKET_5 END) AS TICKET_5" +
105		- " FROM (SELECT A.PROVINCE_ID, " +
	105	+ " FROM ODS_D_HOSPITAL AAA LEFT JOIN (SELECT A.PROVINCE_ID, " +
106	106	" A.PROVINCE, " +
107	107	" A.CITY_ID, " +
108	108	" A.CITY, " +
...	...	@@ -114,7 +114,8 @@
114	114	" COUNT(DISTINCT B.RECORD_ID) AS FF_RS, " +
115	115	" COUNT(B.TICKETS_NO) AS FF_JS " +
116	116	" FROM ODS_D_HOSPITAL A " +
117		- " LEFT JOIN ODS_F_EXAMINE_TICKET B ON A.HOSPITAL_NO=B.HOSPITAL_NO " +
	117	+ " LEFT JOIN ODS_F_EXAMINE_TICKET B ON A.HOSPITAL_NO=B.HOSPITAL_NO" +
	118	+ " INNER JOIN ODS_F_GRAVIDA_RECORD C ON B.RECORD_ID=C.RECORD_ID " +
118	119	" WHERE 1=1 ";
119	120	String issueSql = "";
120	121	if (StringUtils.isNotEmpty(time))
...	...	@@ -159,7 +160,7 @@
159	160	" A.AREA_COUNTY, " +
160	161	" A.HOSPITAL_NO, " +
161	162	" A.HOSPITAL_NAME, " +
162		- " A.YCY_STSTEM_ID) AA " +
	163	+ " A.YCY_STSTEM_ID) AA ON AAA.HOSPITAL_NO=AA.HOSPITAL_NO" +
163	164	" LEFT JOIN ( " +
164	165	" SELECT A.PROVINCE_ID, " +
165	166	" A.PROVINCE, " +
...	...	@@ -179,6 +180,7 @@
179	180	" SUM((CASE WHEN CC.TICKETS_ORDER=5 THEN 1 END)) AS TICKET_5 " +
180	181	" FROM ODS_F_EXAMINE_HISTORY_ASC CC " +
181	182	" LEFT JOIN ODS_D_HOSPITAL A ON A.HOSPITAL_NO=CC.HOSPITAL_NO " +
	183	+ " INNER JOIN ODS_F_GRAVIDA_RECORD B ON CC.RECORD_ID=B.RECORD_ID " +
182	184	" WHERE CC.TICKETS_NO IS NOT NULL ";
183	185	String examineSql = "";
184	186	if (StringUtils.isNotEmpty(time))
185	187
186	188
187	189
188	190
189	191
190	192
...	...	@@ -224,51 +226,65 @@
224	226	" A.HOSPITAL_NO, " +
225	227	" A.HOSPITAL_NAME, " +
226	228	" A.YCY_STSTEM_ID " +
227		- " ) BB ON AA.HOSPITAL_NO=BB.HOSPITAL_NO " +
228		- " ORDER BY 1,2,3";
	229	+ " ) BB ON AAA.HOSPITAL_NO=BB.HOSPITAL_NO ";
	230	+ if (StringUtils.isNotEmpty(hospitalId))
	231	+ {
	232	+ sql1+=" WHERE AAA.YCY_STSTEM_ID= '" +hospitalId+"'";
	233	+ }
	234	+ else
	235	+ {
	236	+ String hospitals = getPermissionStr(userId,provinceId,cityId,areaId);
	237	+ if (StringUtils.isNotEmpty(hospitals))
	238	+ {
	239	+ sql1+=" WHERE AAA.YCY_STSTEM_ID IN " +hospitals;
	240	+ }
229	241
	242	+ }
	243	+ sql1+=" ORDER BY 1,2,3";
	244	+
230	245	String groupBySql = "";
231	246	String groupBySql1 = "";
232	247
233	248	if (StringUtils.isNotEmpty(hospitalId) \|\| StringUtils.isNotEmpty(areaId))
234	249	{
235		- groupBySql=" AA.PROVINCE\|\|';'\|\|AA.PROVINCE_ID AS PROVINCE," +
236		- " AA.CITY\|\|';'\|\|AA.CITY_ID AS CITY," +
237		- " AA.AREA_COUNTY\|\|';'\|\|AA.AREA_COUNTY_ID AS AREA_COUNTY," +
238		- " AA.HOSPITAL_NAME\|\|';'\|\|AA.YCY_STSTEM_ID AS HNAME," ;
239		- groupBySql1="AA.PROVINCE\|\|';'\|\|AA.PROVINCE_ID, " +
240		- " AA.CITY\|\|';'\|\|AA.CITY_ID, " +
241		- " AA.AREA_COUNTY\|\|';'\|\|AA.AREA_COUNTY_ID, " +
242		- " AA.HOSPITAL_NAME\|\|';'\|\|AA.YCY_STSTEM_ID";
	250	+ groupBySql=" AAA.PROVINCE\|\|';'\|\|AAA.PROVINCE_ID AS PROVINCE," +
	251	+ " AAA.CITY\|\|';'\|\|AAA.CITY_ID AS CITY," +
	252	+ " AAA.AREA_COUNTY\|\|';'\|\|AAA.AREA_COUNTY_ID AS AREA_COUNTY," +
	253	+ " AAA.HOSPITAL_NAME\|\|';'\|\|AAA.YCY_STSTEM_ID AS HNAME," ;
	254	+ groupBySql1="AAA.PROVINCE\|\|';'\|\|AAA.PROVINCE_ID, " +
	255	+ " AAA.CITY\|\|';'\|\|AAA.CITY_ID, " +
	256	+ " AAA.AREA_COUNTY\|\|';'\|\|AAA.AREA_COUNTY_ID, " +
	257	+ " AAA.HOSPITAL_NAME\|\|';'\|\|AAA.YCY_STSTEM_ID";
243	258	}
244	259
245	260	else if (StringUtils.isNotEmpty(cityId))
246	261	{
247		- groupBySql=" AA.PROVINCE\|\|';'\|\|AA.PROVINCE_ID AS PROVINCE," +
248		- " AA.CITY\|\|';'\|\|AA.CITY_ID AS CITY," +
249		- " AA.AREA_COUNTY\|\|';'\|\|AA.AREA_COUNTY_ID AS AREA_COUNTY," ;
250		- groupBySql1="AA.PROVINCE\|\|';'\|\|AA.PROVINCE_ID, " +
251		- " AA.CITY\|\|';'\|\|AA.CITY_ID, " +
252		- " AA.AREA_COUNTY\|\|';'\|\|AA.AREA_COUNTY_ID";
	262	+ groupBySql=" AAA.PROVINCE\|\|';'\|\|AAA.PROVINCE_ID AS PROVINCE," +
	263	+ " AAA.CITY\|\|';'\|\|AAA.CITY_ID AS CITY," +
	264	+ " AAA.AREA_COUNTY\|\|';'\|\|AAA.AREA_COUNTY_ID AS AREA_COUNTY," ;
	265	+ groupBySql1=" AAA.PROVINCE\|\|';'\|\|AAA.PROVINCE_ID, " +
	266	+ " AAA.CITY\|\|';'\|\|AAA.CITY_ID, " +
	267	+ " AAA.AREA_COUNTY\|\|';'\|\|AAA.AREA_COUNTY_ID";
253	268	}
254	269	else if (StringUtils.isNotEmpty(provinceId))
255	270	{
256		- groupBySql=" AA.PROVINCE\|\|';'\|\|AA.PROVINCE_ID AS PROVINCE," +
257		- " AA.CITY\|\|';'\|\|AA.CITY_ID AS CITY,";
258		- groupBySql1="AA.PROVINCE\|\|';'\|\|AA.PROVINCE_ID, " +
259		- " AA.CITY\|\|';'\|\|AA.CITY_ID ";
	271	+ groupBySql=" AAA.PROVINCE\|\|';'\|\|AAA.PROVINCE_ID AS PROVINCE," +
	272	+ " AAA.CITY\|\|';'\|\|AAA.CITY_ID AS CITY,";
	273	+ groupBySql1="AAA.PROVINCE\|\|';'\|\|AAA.PROVINCE_ID, " +
	274	+ " AAA.CITY\|\|';'\|\|AAA.CITY_ID ";
260	275	}
261	276	else
262	277	{
263		- groupBySql=" AA.PROVINCE\|\|';'\|\|AA.PROVINCE_ID AS PROVINCE,";
264		- groupBySql1="AA.PROVINCE\|\|';'\|\|AA.PROVINCE_ID";
	278	+ groupBySql=" AAA.PROVINCE\|\|';'\|\|AAA.PROVINCE_ID AS PROVINCE,";
	279	+ groupBySql1="AAA.PROVINCE\|\|';'\|\|AAA.PROVINCE_ID";
265	280	}
266	281
267	282
268	283	String countSql = "SELECT "+groupBySql+
269	284	" SUM(AA.FF_JS) AS FF_JS,\n" +
270	285	" SUM(SY_JS) AS SY_JS\n" +
271		- " FROM (\n" +
	286	+ " FROM ODS_D_HOSPITAL AAA \n" +
	287	+ " LEFT JOIN (\n" +
272	288	" SELECT A.PROVINCE_ID,\n" +
273	289	" A.PROVINCE,\n" +
274	290	" A.CITY_ID,\n" +
...	...	@@ -281,7 +297,9 @@
281	297	" COUNT(DISTINCT B.RECORD_ID) AS FF_RS,\n" +
282	298	" COUNT(B.TICKETS_NO) AS FF_JS\n" +
283	299	" FROM ODS_D_HOSPITAL A\n" +
284		- " LEFT JOIN ODS_F_EXAMINE_TICKET B ON A.HOSPITAL_NO=B.HOSPITAL_NO WHERE 1=1 " ;
	300	+ " LEFT JOIN ODS_F_EXAMINE_TICKET B ON A.HOSPITAL_NO=B.HOSPITAL_NO " +
	301	+ " INNER JOIN ODS_F_GRAVIDA_RECORD C ON B.RECORD_ID=C.RECORD_ID " +
	302	+ " WHERE 1=1 " ;
285	303	countSql+=issueSql;
286	304	countSql+=" GROUP BY A.PROVINCE_ID,\n" +
287	305	" A.PROVINCE,\n" +
...	...	@@ -291,7 +309,7 @@
291	309	" A.AREA_COUNTY,\n" +
292	310	" A.HOSPITAL_NO,\n" +
293	311	" A.HOSPITAL_NAME,\n" +
294		- " A.YCY_STSTEM_ID) AA\n" +
	312	+ " A.YCY_STSTEM_ID) AA ON AAA.HOSPITAL_NO=AA.HOSPITAL_NO\n" +
295	313	" LEFT JOIN (\n" +
296	314	" SELECT A.PROVINCE_ID,\n" +
297	315	" A.PROVINCE,\n" +
...	...	@@ -305,7 +323,7 @@
305	323	" COUNT(DISTINCT CC.RECORD_ID) AS SY_RS,\n" +
306	324	" COUNT(CC.TICKETS_NO) AS SY_JS\n" +
307	325	" FROM ODS_F_EXAMINE_HISTORY_ASC CC\n" +
308		- " LEFT JOIN ODS_D_HOSPITAL A ON A.HOSPITAL_NO=CC.HOSPITAL_NO\n" +
	326	+ " LEFT JOIN ODS_D_HOSPITAL A ON A.HOSPITAL_NO=CC.HOSPITAL_NO INNER JOIN ODS_F_GRAVIDA_RECORD B ON CC.RECORD_ID=B.RECORD_ID" +
309	327	" WHERE CC.TICKETS_NO IS NOT NULL\n" ;
310	328	countSql+=examineSql;
311	329	countSql+=" GROUP BY A.PROVINCE_ID,\n" +
312	330
...	...	@@ -317,10 +335,22 @@
317	335	" A.HOSPITAL_NO,\n" +
318	336	" A.HOSPITAL_NAME,\n" +
319	337	" A.YCY_STSTEM_ID\n" +
320		- " ) BB ON AA.HOSPITAL_NO=BB.HOSPITAL_NO\n" +
321		- " GROUP BY ROLLUP("+groupBySql1+")" +
322		- " ORDER BY 1,2,3";
	338	+ " ) BB ON AAA.HOSPITAL_NO=BB.HOSPITAL_NO\n" ;
	339	+ if (StringUtils.isNotEmpty(hospitalId))
	340	+ {
	341	+ countSql+=" WHERE AAA.YCY_STSTEM_ID= '" +hospitalId+"'";
	342	+ }
	343	+ else
	344	+ {
	345	+ String hospitals = getPermissionStr(userId,provinceId,cityId,areaId);
	346	+ if (StringUtils.isNotEmpty(hospitals))
	347	+ {
	348	+ countSql+=" WHERE AAA.YCY_STSTEM_ID IN " +hospitals;
	349	+ }
323	350
	351	+ }
	352	+ countSql+=" GROUP BY ROLLUP("+groupBySql1+") ORDER BY 1,2,3";
	353	+
324	354	System.out.println("basesql===="+sql1);
325	355	System.out.println("countSql====" + countSql);
326	356
327	357
...	...	@@ -656,7 +686,18 @@
656	686	}
657	687	}
658	688	}
	689	+// List<Integer> list = autoMatchFacade.matchAreaOrgId(userId);
	690	+// if (CollectionUtils.isNotEmpty(list))
	691	+// {
	692	+// for(Integer id : list)
	693	+// {
	694	+// if (id != null && com.lyms.platform.common.utils.StringUtils.isNotEmpty(id.toString()) && !hospitalList.contains(id.toString())) {
	695	+// allHospitalList.add(id.toString());
	696	+// }
	697	+// }
	698	+// }
659	699
	700	+
660	701	//条件查询到的医院
661	702	List<String> orgHospitalList = new ArrayList<>();
662	703	if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(provinceId)) {
...	...	@@ -791,7 +832,7 @@
791	832	for (Map<String,Object> map : ticketList)
792	833	{
793	834	Map<String,Object> result = new HashMap<>();
794		- result.put("issueDate", map.get("ISSUE_DATE") == null ? "" : DateUtil.getyyyy_MM_dd((Date)map.get("ISSUE_DATE"))); //发放日期
	835	+ result.put("issueDate", map.get("ISSUE_DATE") == null ? "" : DateUtil.getyyyy_MM_dd((Date)map.get("ISSUE_DATE"))); //建档日期
795	836	result.put("name", map.get("NAME")); //姓名
796	837	result.put("buildWeek", map.get("YZ_NAME")); //建档孕周
797	838	result.put("hospitalName", map.get("HOSPITAL_NAME")); //建档机构
...	...	@@ -804,7 +845,7 @@
804	845	}
805	846
806	847	Map<String, String> cnames = new LinkedHashMap<>();
807		- cnames.put("issueDate", "发放日期"); //发放日期
	848	+ cnames.put("issueDate", "发放日期"); //建档日期
808	849	cnames.put("name", "姓名"); //姓名
809	850	cnames.put("buildWeek", "建档孕周"); //建档孕周
810	851	cnames.put("hospitalName", "建档机构"); //建档机构
811	852
812	853
813	854
...	...	@@ -968,36 +1009,36 @@
968	1009
969	1010	if (StringUtils.isNotEmpty(hospitalId) \|\| StringUtils.isNotEmpty(areaId))
970	1011	{
971		- groupBySql=" AA.PROVINCE\|\|';'\|\|AA.PROVINCE_ID AS PROVINCE," +
972		- " AA.CITY\|\|';'\|\|AA.CITY_ID AS CITY," +
973		- " AA.AREA_COUNTY\|\|';'\|\|AA.AREA_COUNTY_ID AS AREA_COUNTY," +
974		- " AA.HOSPITAL_NAME\|\|';'\|\|AA.YCY_STSTEM_ID AS HNAME," ;
975		- groupBySql1="AA.PROVINCE\|\|';'\|\|AA.PROVINCE_ID, " +
976		- " AA.CITY\|\|';'\|\|AA.CITY_ID, " +
977		- " AA.AREA_COUNTY\|\|';'\|\|AA.AREA_COUNTY_ID, " +
978		- " AA.HOSPITAL_NAME\|\|';'\|\|AA.YCY_STSTEM_ID";
	1012	+ groupBySql=" AAA.PROVINCE\|\|';'\|\|AAA.PROVINCE_ID AS PROVINCE," +
	1013	+ " AAA.CITY\|\|';'\|\|AAA.CITY_ID AS CITY," +
	1014	+ " AAA.AREA_COUNTY\|\|';'\|\|AAA.AREA_COUNTY_ID AS AREA_COUNTY," +
	1015	+ " AAA.HOSPITAL_NAME\|\|';'\|\|AAA.YCY_STSTEM_ID AS HNAME," ;
	1016	+ groupBySql1="AAA.PROVINCE\|\|';'\|\|AAA.PROVINCE_ID, " +
	1017	+ " AAA.CITY\|\|';'\|\|AAA.CITY_ID, " +
	1018	+ " AAA.AREA_COUNTY\|\|';'\|\|AAA.AREA_COUNTY_ID, " +
	1019	+ " AAA.HOSPITAL_NAME\|\|';'\|\|AAA.YCY_STSTEM_ID";
979	1020	}
980	1021
981	1022	else if (StringUtils.isNotEmpty(cityId))
982	1023	{
983		- groupBySql=" AA.PROVINCE\|\|';'\|\|AA.PROVINCE_ID AS PROVINCE," +
984		- " AA.CITY\|\|';'\|\|AA.CITY_ID AS CITY," +
985		- " AA.AREA_COUNTY\|\|';'\|\|AA.AREA_COUNTY_ID AS AREA_COUNTY," ;
986		- groupBySql1="AA.PROVINCE\|\|';'\|\|AA.PROVINCE_ID, " +
987		- " AA.CITY\|\|';'\|\|AA.CITY_ID, " +
988		- " AA.AREA_COUNTY\|\|';'\|\|AA.AREA_COUNTY_ID";
	1024	+ groupBySql=" AAA.PROVINCE\|\|';'\|\|AAA.PROVINCE_ID AS PROVINCE," +
	1025	+ " AAA.CITY\|\|';'\|\|AAA.CITY_ID AS CITY," +
	1026	+ " AAA.AREA_COUNTY\|\|';'\|\|AAA.AREA_COUNTY_ID AS AREA_COUNTY," ;
	1027	+ groupBySql1="AAA.PROVINCE\|\|';'\|\|AAA.PROVINCE_ID, " +
	1028	+ " AAA.CITY\|\|';'\|\|AAA.CITY_ID, " +
	1029	+ " AAA.AREA_COUNTY\|\|';'\|\|AAA.AREA_COUNTY_ID";
989	1030	}
990	1031	else if (StringUtils.isNotEmpty(provinceId))
991	1032	{
992		- groupBySql=" AA.PROVINCE\|\|';'\|\|AA.PROVINCE_ID AS PROVINCE," +
993		- " AA.CITY\|\|';'\|\|AA.CITY_ID AS CITY,";
994		- groupBySql1="AA.PROVINCE\|\|';'\|\|AA.PROVINCE_ID, " +
995		- " AA.CITY\|\|';'\|\|AA.CITY_ID ";
	1033	+ groupBySql=" AAA.PROVINCE\|\|';'\|\|AAA.PROVINCE_ID AS PROVINCE," +
	1034	+ " AAA.CITY\|\|';'\|\|AAA.CITY_ID AS CITY,";
	1035	+ groupBySql1="AAA.PROVINCE\|\|';'\|\|AAA.PROVINCE_ID, " +
	1036	+ " AAA.CITY\|\|';'\|\|AAA.CITY_ID ";
996	1037	}
997	1038	else
998	1039	{
999		- groupBySql=" AA.PROVINCE\|\|';'\|\|AA.PROVINCE_ID AS PROVINCE,";
1000		- groupBySql1="AA.PROVINCE\|\|';'\|\|AA.PROVINCE_ID";
	1040	+ groupBySql=" AAA.PROVINCE\|\|';'\|\|AAA.PROVINCE_ID AS PROVINCE,";
	1041	+ groupBySql1="AAA.PROVINCE\|\|';'\|\|AAA.PROVINCE_ID";
1001	1042	}
1002	1043
1003	1044	String countSql = "SELECT "+groupBySql+
...	...	@@ -1008,10 +1049,8 @@
1008	1049	" SUM(NUM_24) AS NUM_24,\n" +
1009	1050	" SUM(NUM_36) AS NUM_36,\n" +
1010	1051	" SUM(NUM_40) AS NUM_40\n" +
1011		- "FROM\n" +
1012		- "(\n" +
1013		- "--建档人数\n" +
1014		- "SELECT A.PROVINCE_ID,\n" +
	1052	+ " FROM ODS_D_HOSPITAL AAA LEFT JOIN " +
	1053	+ " ( SELECT A.PROVINCE_ID,\n" +
1015	1054	" A.PROVINCE,\n" +
1016	1055	" A.CITY_ID,\n" +
1017	1056	" A.CITY,\n" +
...	...	@@ -1021,9 +1060,9 @@
1021	1060	" A.HOSPITAL_NAME,\n" +
1022	1061	" A.YCY_STSTEM_ID,\n" +
1023	1062	" COUNT(B.RECORD_ID) AS JD_NUM\n" +
1024		- "FROM ODS_D_HOSPITAL A\n" +
1025		- "INNER JOIN ODS_F_GRAVIDA_RECORD B ON A.HOSPITAL_NO=B.HOSPITAL_NO\n" +
1026		- "WHERE 1=1 ";
	1063	+ " FROM ODS_D_HOSPITAL A\n" +
	1064	+ " INNER JOIN ODS_F_GRAVIDA_RECORD B ON A.HOSPITAL_NO=B.HOSPITAL_NO\n" +
	1065	+ " WHERE 1=1 ";
1027	1066	if (StringUtils.isNotEmpty(time))
1028	1067	{
1029	1068	String startTime = time.split(" - ")[0];
...	...	@@ -1066,10 +1105,9 @@
1066	1105	" A.HOSPITAL_NO,\n" +
1067	1106	" A.HOSPITAL_NAME,\n" +
1068	1107	" A.YCY_STSTEM_ID\n" +
1069		- ") AA\n" +
1070		- "LEFT JOIN (\n" +
1071		- "--产检节点人数\n" +
1072		- "SELECT A.PROVINCE_ID,\n" +
	1108	+ " ) AA ON AAA.HOSPITAL_NO=AA.HOSPITAL_NO" +
	1109	+ " LEFT JOIN (\n" +
	1110	+ " SELECT A.PROVINCE_ID,\n" +
1073	1111	" A.PROVINCE,\n" +
1074	1112	" A.CITY_ID,\n" +
1075	1113	" A.CITY,\n" +
...	...	@@ -1084,8 +1122,8 @@
1084	1122	" SUM(CASE WHEN B.NODE_NAME='21～24 孕周' THEN 1 ELSE 0 END) AS NUM_24,\n" +
1085	1123	" SUM(CASE WHEN B.NODE_NAME='28～36 孕周' THEN 1 ELSE 0 END) AS NUM_36,\n" +
1086	1124	" SUM(CASE WHEN B.NODE_NAME='37～分娩' THEN 1 ELSE 0 END) AS NUM_40\n" +
1087		- "FROM ODS_D_HOSPITAL A\n" +
1088		- "LEFT JOIN ODS_F_EXAMINE_HISTORY B ON A.HOSPITAL_NO=B.HOSPITAL_NO "+
	1125	+ " FROM ODS_D_HOSPITAL A\n" +
	1126	+ " LEFT JOIN ODS_F_EXAMINE_HISTORY B ON A.HOSPITAL_NO=B.HOSPITAL_NO "+
1089	1127	" INNER JOIN ODS_F_GRAVIDA_RECORD C ON B.RECORD_ID=C.RECORD_ID ";
1090	1128	if (pointType != null && pointType == 1){
1091	1129	countSql+=" AND B.NODE_ID=2 ";
1092	1130
1093	1131
...	...	@@ -1133,24 +1171,41 @@
1133	1171	" A.HOSPITAL_NO,\n" +
1134	1172	" A.HOSPITAL_NAME,\n" +
1135	1173	" A.YCY_STSTEM_ID\n" +
1136		- " ) BB ON AA.HOSPITAL_NO=BB.HOSPITAL_NO\n" +
1137		- " GROUP BY ROLLUP("+groupBySql1+" ) " +
1138		- " ORDER BY 1,2,3";
	1174	+ " ) BB ON AAA.HOSPITAL_NO=BB.HOSPITAL_NO\n" ;
	1175	+ if (StringUtils.isNotEmpty(hospitalId))
	1176	+ {
	1177	+ countSql+=" WHERE AAA.YCY_STSTEM_ID= '" +hospitalId+"'";
	1178	+ }
	1179	+ else
	1180	+ {
	1181	+ String hospitals = getPermissionStr(userId,provinceId,cityId,areaId);
	1182	+ if (StringUtils.isNotEmpty(hospitals))
	1183	+ {
	1184	+ countSql+=" WHERE AAA.YCY_STSTEM_ID IN " +hospitals;
	1185	+ }
1139	1186
	1187	+ }
	1188	+ countSql+=" GROUP BY ROLLUP("+groupBySql1+" ) ORDER BY 1,2,3";
1140	1189
1141	1190
1142		- String sql = "SELECT AA.PROVINCE,AA.PROVINCE_ID," +
1143		- " AA.CITY,AA.CITY_ID," +
1144		- " AA.AREA_COUNTY,AA.AREA_COUNTY_ID ," +
1145		- " AA.HOSPITAL_NAME,AA.YCY_STSTEM_ID," +
1146		- " (CASE WHEN AA.JD_NUM IS NULL THEN 0 ELSE AA.JD_NUM END) AS JD_NUM," +
1147		- " (CASE WHEN CJ_NUM IS NULL THEN 0 ELSE CJ_NUM END) AS CJ_NUM," +
1148		- " (CASE WHEN NUM_12 IS NULL THEN 0 ELSE NUM_12 END) AS NUM_12," +
1149		- " (CASE WHEN NUM_16 IS NULL THEN 0 ELSE NUM_16 END) AS NUM_16," +
1150		- " (CASE WHEN NUM_24 IS NULL THEN 0 ELSE NUM_24 END) AS NUM_24," +
1151		- " (CASE WHEN NUM_36 IS NULL THEN 0 ELSE NUM_36 END) AS NUM_36," +
1152		- " (CASE WHEN NUM_40 IS NULL THEN 0 ELSE NUM_40 END) AS NUM_40 " +
1153		- " FROM (" +
	1191	+
	1192	+ String sql = "SELECT " +
	1193	+ " AAA.PROVINCE," +
	1194	+ " AAA.PROVINCE_ID," +
	1195	+ " AAA.CITY," +
	1196	+ " AAA.CITY_ID," +
	1197	+ " AAA.AREA_COUNTY," +
	1198	+ " AAA.AREA_COUNTY_ID ," +
	1199	+ " AAA.HOSPITAL_NAME," +
	1200	+ " AAA.YCY_STSTEM_ID," +
	1201	+ " (CASE WHEN AA.JD_NUM IS NULL THEN 0 ELSE AA.JD_NUM END) AS JD_NUM," +
	1202	+ " (CASE WHEN CJ_NUM IS NULL THEN 0 ELSE CJ_NUM END) AS CJ_NUM," +
	1203	+ " (CASE WHEN NUM_12 IS NULL THEN 0 ELSE NUM_12 END) AS NUM_12," +
	1204	+ " (CASE WHEN NUM_16 IS NULL THEN 0 ELSE NUM_16 END) AS NUM_16," +
	1205	+ " (CASE WHEN NUM_24 IS NULL THEN 0 ELSE NUM_24 END) AS NUM_24," +
	1206	+ " (CASE WHEN NUM_36 IS NULL THEN 0 ELSE NUM_36 END) AS NUM_36," +
	1207	+ " (CASE WHEN NUM_40 IS NULL THEN 0 ELSE NUM_40 END) AS NUM_40 " +
	1208	+ " FROM ODS_D_HOSPITAL AAA LEFT JOIN (" +
1154	1209	" SELECT A.PROVINCE_ID," +
1155	1210	" A.PROVINCE," +
1156	1211	" A.CITY_ID," +
...	...	@@ -1207,7 +1262,7 @@
1207	1262	" A.HOSPITAL_NO,\n" +
1208	1263	" A.HOSPITAL_NAME,\n" +
1209	1264	" A.YCY_STSTEM_ID\n" +
1210		- " ) AA LEFT JOIN (\n" +
	1265	+ " ) AA ON AAA.HOSPITAL_NO=AA.HOSPITAL_NO LEFT JOIN (\n" +
1211	1266	" SELECT A.PROVINCE_ID,\n" +
1212	1267	" A.PROVINCE,\n" +
1213	1268	" A.CITY_ID,\n" +
...	...	@@ -1273,8 +1328,21 @@
1273	1328	" A.HOSPITAL_NO,\n" +
1274	1329	" A.HOSPITAL_NAME,\n" +
1275	1330	" A.YCY_STSTEM_ID\n" +
1276		- " ) BB ON AA.HOSPITAL_NO=BB.HOSPITAL_NO\n" +
1277		- " ORDER BY 1,2,3";
	1331	+ " ) BB ON AAA.HOSPITAL_NO = BB.HOSPITAL_NO ";
	1332	+ if (StringUtils.isNotEmpty(hospitalId))
	1333	+ {
	1334	+ sql+=" WHERE AAA.YCY_STSTEM_ID= '" +hospitalId+"'";
	1335	+ }
	1336	+ else
	1337	+ {
	1338	+ String hospitals = getPermissionStr(userId,provinceId,cityId,areaId);
	1339	+ if (StringUtils.isNotEmpty(hospitals))
	1340	+ {
	1341	+ sql+=" WHERE AAA.YCY_STSTEM_ID IN " +hospitals;
	1342	+ }
	1343	+
	1344	+ }
	1345	+ sql+=" ORDER BY 1,2,3";
1278	1346	System.out.println("sql===="+sql);
1279	1347	System.out.println("countSql===="+countSql);
1280	1348
...	...	@@ -1678,7 +1746,7 @@
1678	1746	for (Map<String,Object> map : ticketList)
1679	1747	{
1680	1748	Map<String,Object> result = new HashMap<>();
1681		- result.put("createDate", map.get("CREATE_DATE") == null ? "" : DateUtil.getyyyy_MM_dd((Date)map.get("CREATE_DATE"))); //发放日期
	1749	+ result.put("createDate", map.get("CREATE_DATE") == null ? "" : DateUtil.getyyyy_MM_dd((Date)map.get("CREATE_DATE"))); //建档日期
1682	1750	result.put("name", map.get("NAME")); //姓名
1683	1751	result.put("buildWeek", map.get("YZ_NAME")); //建档孕周
1684	1752	result.put("hospitalName", map.get("HOSPITAL_NAME")); //建档机构
...	...	@@ -1691,7 +1759,7 @@
1691	1759	}
1692	1760
1693	1761	Map<String, String> cnames = new LinkedHashMap<>();
1694		- cnames.put("createDate", "发放日期"); //发放日期
	1762	+ cnames.put("createDate", "建档日期"); //建档日期
1695	1763	cnames.put("name", "姓名"); //姓名
1696	1764	cnames.put("buildWeek", "建档孕周"); //建档孕周
1697	1765	cnames.put("hospitalName", "建档机构"); //建档机构