jiangjiazhi / regional-platform

Commit 6100769e5d7b8f185b20242502797adb85502c8a

Authored by wangbo over 6 years ago

Exists in master and in 6 other branches

诸城人民初诊复诊字段添加

Showing 3 changed files with 146 additions and 6 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AnnualReportFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java

...	...	@@ -99,9 +99,8 @@
99	99	Map<Object, List<String>> map = new LinkedHashMap<>();
100	100	for (String area : listArea) {
101	101	List<String> hospitalIds = this.getCurrentUserHospPermissions(userId, provinceId, cityId, area);
102		- if (CollectionUtils.isNotEmpty(hospitalIds))
103		- {
104		- System.out.println("hospitalIds="+ hospitalIds);
	102	+ if (CollectionUtils.isNotEmpty(hospitalIds)) {
	103	+ System.out.println("hospitalIds=" + hospitalIds);
105	104	map.put(area, hospitalIds);
106	105	}
107	106
...	...	@@ -109,7 +108,7 @@
109	108
110	109
111	110	List<Map<String, String>> mapList = this.getDates(map, organizationService, time, babyService, matDeliverService, antExRecordService, antenatalExaminationService, sieveService, matDeliverFollowService, patientsService, mongoTemplate);
112		- System.out.println("mapList="+mapList);
	111	+ System.out.println("mapList=" + mapList);
113	112	this.sum(mapList);
114	113	httpServletResponse.setContentType("application/force-download");
115	114	httpServletResponse.setHeader("Content-Disposition", "attachment;filename=" + new String(("年报表.xls").getBytes("UTF-8"), "ISO-8859-1"));
...	...	@@ -124,7 +123,6 @@
124	123
125	124	public List<String> getCurrentUserHospPermissions(Integer userId, String provinceId, String cityId, String areaId) {
126	125	List<String> hospitalList = new ArrayList<>();
127		-
128	126	//权限所有的医院
129	127	List<String> allHospitalList = new ArrayList<>();
130	128	DataPermissionsModelQuery dataPermissionsModelQuery = new DataPermissionsModelQuery();

...	...	@@ -346,6 +346,66 @@
346	346	*/
347	347	private String configItemId;
348	348
	349	+ private String fTthree;
	350	+
	351	+ private String fTFour;
	352	+
	353	+ private String tSH;
	354	+
	355	+ private String tpaAb;
	356	+
	357	+ private String tgAb;
	358	+
	359	+ private String aTSHR;
	360	+
	361	+ public String getfTthree() {
	362	+ return fTthree;
	363	+ }
	364	+
	365	+ public void setfTthree(String fTthree) {
	366	+ this.fTthree = fTthree;
	367	+ }
	368	+
	369	+ public String getfTFour() {
	370	+ return fTFour;
	371	+ }
	372	+
	373	+ public void setfTFour(String fTFour) {
	374	+ this.fTFour = fTFour;
	375	+ }
	376	+
	377	+ public String gettSH() {
	378	+ return tSH;
	379	+ }
	380	+
	381	+ public void settSH(String tSH) {
	382	+ this.tSH = tSH;
	383	+ }
	384	+
	385	+ public String getTpaAb() {
	386	+ return tpaAb;
	387	+ }
	388	+
	389	+ public void setTpaAb(String tpaAb) {
	390	+ this.tpaAb = tpaAb;
	391	+ }
	392	+
	393	+ public String getTgAb() {
	394	+ return tgAb;
	395	+ }
	396	+
	397	+ public void setTgAb(String tgAb) {
	398	+ this.tgAb = tgAb;
	399	+ }
	400	+
	401	+ public String getaTSHR() {
	402	+ return aTSHR;
	403	+ }
	404	+
	405	+ public void setaTSHR(String aTSHR) {
	406	+ this.aTSHR = aTSHR;
	407	+ }
	408	+
349	409	public String getConfigItemId() {
350	410	return configItemId;
351	411	}
...	...	@@ -913,6 +973,16 @@
913	973	* 产检项
914	974	* */
915	975	setConfigItemId(destModel.getConfigItemId());
	976	+
	977	+ //添加甲状腺
	978	+ setfTthree(destModel.getfTthree());
	979	+ setfTFour(destModel.getfTFour());
	980	+ settSH(destModel.gettSH());
	981	+ setTpaAb(destModel.getTpaAb());
	982	+ setTgAb(destModel.getTgAb());
	983	+ setaTSHR(destModel.getaTSHR());
	984	+
	985	+
916	986	try {
917	987	setBp(JsonUtil.str2Obj(destModel.getBp(), java.util.Map.class));
918	988	} catch (Exception e) {

...	...	@@ -340,6 +340,20 @@
340	340	/**
341	341	* -------------辅助检查结果录入------------------
342	342	**/
	343	+
	344	+ private String fTthree;
	345	+
	346	+ private String fTFour;
	347	+
	348	+ private String tSH;
	349	+
	350	+ private String tpaAb;
	351	+
	352	+ private String tgAb;
	353	+
	354	+ private String aTSHR;
	355	+
	356	+
343	357	//血红蛋白值
344	358	private String xhdb;
345	359	//白细胞计数值
...	...	@@ -497,6 +511,55 @@
497	511	//妊娠异常
498	512	private String pregnancyExcpetion;
499	513
	514	+
	515	+ public String getfTthree() {
	516	+ return fTthree;
	517	+ }
	518	+
	519	+ public void setfTthree(String fTthree) {
	520	+ this.fTthree = fTthree;
	521	+ }
	522	+
	523	+ public String getfTFour() {
	524	+ return fTFour;
	525	+ }
	526	+
	527	+ public void setfTFour(String fTFour) {
	528	+ this.fTFour = fTFour;
	529	+ }
	530	+
	531	+ public String gettSH() {
	532	+ return tSH;
	533	+ }
	534	+
	535	+ public void settSH(String tSH) {
	536	+ this.tSH = tSH;
	537	+ }
	538	+
	539	+ public String getTpaAb() {
	540	+ return tpaAb;
	541	+ }
	542	+
	543	+ public void setTpaAb(String tpaAb) {
	544	+ this.tpaAb = tpaAb;
	545	+ }
	546	+
	547	+ public String getTgAb() {
	548	+ return tgAb;
	549	+ }
	550	+
	551	+ public void setTgAb(String tgAb) {
	552	+ this.tgAb = tgAb;
	553	+ }
	554	+
	555	+ public String getaTSHR() {
	556	+ return aTSHR;
	557	+ }
	558	+
	559	+ public void setaTSHR(String aTSHR) {
	560	+ this.aTSHR = aTSHR;
	561	+ }
	562	+
500	563	public Integer getPregnancyMethod() {
501	564	return pregnancyMethod;
502	565	}
...	...	@@ -1668,6 +1731,16 @@
1668	1731	* 产检项
1669	1732	* */
1670	1733	setConfigItemId(antExChuModel.getConfigItemId());
	1734	+
	1735	+ //辅助功能甲状腺
	1736	+ setfTthree(antExChuModel.getfTthree());
	1737	+ setfTFour(antExChuModel.getfTFour());
	1738	+ settSH(antExChuModel.gettSH());
	1739	+ setTpaAb(antExChuModel.getTpaAb());
	1740	+ setTpaAb(antExChuModel.getTgAb());
	1741	+ setaTSHR(antExChuModel.getaTSHR());
	1742	+
	1743	+
1671	1744	// //早孕期病毒检测
1672	1745	// private String zyqbdjc;
1673	1746	// //nt检查
...	...	@@ -1851,7 +1924,6 @@
1851	1924	setPregnancyMethod(antExChuModel.getPregnancyMethod());
1852	1925	setPregnancyExcpetion(antExChuModel.getPregnancyExcpetion());
1853	1926	setMonthCompliance(antExChuModel.getMonthCompliance());
1854		-
1855	1927
1856	1928
1857	1929	}