jiangjiazhi / regional-platform

Commit 2d2891c626ef1eb26268c1d62554eeccb6e08dc0

Authored by liquanyu over 3 years ago

Exists in master and in 6 other branches

省平台孕前优生

Showing 3 changed files with 112 additions and 61 deletions

platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyUploadingProvince.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/VolumeComponentAnalysisController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VolumeComponentAnalysisFacade.java

...	...	@@ -972,12 +972,14 @@
972	972	husbandCheck.setSex("01");
973	973
974	974	//尿常规
975		- List<Object> ncg = (ArrayList<Object>) husbandMap.get("ncg");
976		- if (ncg != null && ncg.size() > 0) {
977		- Integer ncgStatus = Integer.valueOf(ncg.get(0).toString());
978		- husbandCheck.setRoutineUrine(ncgStatus == 0 ? "01" : "02");//尿常规
	975	+ if (husbandMap.get("ncg") != null)
	976	+ {
	977	+ List<Object> ncg = (ArrayList<Object>) husbandMap.get("ncg");
	978	+ if (ncg != null && ncg.size() > 0) {
	979	+ Integer ncgStatus = Integer.valueOf(ncg.get(0).toString());
	980	+ husbandCheck.setRoutineUrine(ncgStatus == 0 ? "01" : "02");//尿常规
	981	+ }
979	982	}
980		-
981	983	Object abo = husbandMap.get("abo");//ABO型
982	984	if (abo != null) {
983	985	Integer aboi = (Integer) abo;
984	986
985	987
986	988
987	989
988	990
...	...	@@ -995,23 +997,39 @@
995	997	}
996	998
997	999	//乙肝血清学检查
998		- List<Integer> yigans = (ArrayList<Integer>) husbandMap.get("yigan");
999		- if (CollectionUtils.isNotEmpty(yigans)) {
1000		- Integer hbsag = yigans.get(0);//HBs-Ag
1001		- husbandCheck.setHbsag(hbsag == 0 ? "01" : (hbsag == 1 ? "02" : "03"));
	1000	+ if (husbandMap.get("yigan") != null)
	1001	+ {
	1002	+ List<Integer> yigans = (ArrayList<Integer>) husbandMap.get("yigan");
	1003	+ if (CollectionUtils.isNotEmpty(yigans)) {
	1004	+ Integer hbsag = yigans.get(0);//HBs-Ag
	1005	+ if (hbsag != null && hbsag >= 0)
	1006	+ {
	1007	+ husbandCheck.setHbsag(hbsag == 0 ? "01" : (hbsag == 1 ? "02" : "03"));
	1008	+ }
1002	1009
1003		- Integer hbsab = yigans.get(1);//HBs-Ab
1004		- husbandCheck.setHbsab(hbsab == 0 ? "01" : (hbsab == 1 ? "02" : "03"));
1005	1010
1006		- Integer hbeag = yigans.get(2);//HBe-Ag
1007		- husbandCheck.setHbeag(hbeag == 0 ? "01" : (hbeag == 1 ? "02" : "03"));
	1011	+ Integer hbsab = yigans.get(1);//HBs-Ab
	1012	+ if (hbsab != null && hbsab >= 0) {
	1013	+ husbandCheck.setHbsab(hbsab == 0 ? "01" : (hbsab == 1 ? "02" : "03"));
	1014	+ }
1008	1015
1009		- Integer hbeab = yigans.get(3);//HBe-Ab
1010		- husbandCheck.setHbeab(hbeab == 0 ? "01" : (hbeab == 1 ? "02" : "03"));
	1016	+ Integer hbeag = yigans.get(2);//HBe-Ag
	1017	+ if (hbeag != null && hbeag >= 0) {
	1018	+ husbandCheck.setHbeag(hbeag == 0 ? "01" : (hbeag == 1 ? "02" : "03"));
	1019	+ }
1011	1020
1012		- Integer hbcab = yigans.get(4);//HBc-Ab
1013		- husbandCheck.setHbcab(hbcab == 0 ? "01" : (hbcab == 1 ? "02" : "03"));
	1021	+
	1022	+ Integer hbeab = yigans.get(3);//HBe-Ab
	1023	+ if (hbeab != null && hbeab >= 0) {
	1024	+ husbandCheck.setHbeab(hbeab == 0 ? "01" : (hbeab == 1 ? "02" : "03"));
	1025	+ }
	1026	+ Integer hbcab = yigans.get(4);//HBc-Ab
	1027	+ if (hbcab != null && hbcab >= 0) {
	1028	+ husbandCheck.setHbcab(hbcab == 0 ? "01" : (hbcab == 1 ? "02" : "03"));
	1029	+ }
	1030	+ }
1014	1031	}
	1032	+
1015	1033	Object gbzam = husbandMap.get("gbzam");//谷丙转氨酶(ALT)
1016	1034	if (gbzam != null) {
1017	1035	husbandCheck.setSgpt(gbzam.toString());
1018	1036
1019	1037
1020	1038
...	...	@@ -1043,43 +1061,67 @@
1043	1061	wifeCheck.setAntenatalArchivesId(documentId);
1044	1062	wifeCheck.setSex("02");
1045	1063	//白带检查
1046		- List<Integer> bdjcs = (ArrayList<Integer>) wifeMap.get("bdjc");
1047		- Integer xsxb = bdjcs.get(0);//线索细胞
1048		- wifeCheck.setClueCells(xsxb == 0 ? "01" : (xsxb == 1 ? "02" : "03"));
1049		- Integer nqjgr = bdjcs.get(1);//念珠菌感染
1050		- wifeCheck.setCandida(nqjgr == 0 ? "01" : (nqjgr == 1 ? "02" : "03"));
	1064	+ if (wifeMap.get("bdjc") != null)
	1065	+ {
	1066	+ List<Integer> bdjcs = (ArrayList<Integer>) wifeMap.get("bdjc");
	1067	+ Integer xsxb = bdjcs.get(0);//线索细胞
	1068	+ if(xsxb != null && xsxb >= 0)
	1069	+ {
	1070	+ wifeCheck.setClueCells(xsxb == 0 ? "01" : (xsxb == 1 ? "02" : "03"));
	1071	+ }
	1072	+ Integer nqjgr = bdjcs.get(1);//念珠菌感染
	1073	+ if (nqjgr != null && nqjgr >= 0)
	1074	+ {
	1075	+ wifeCheck.setCandida(nqjgr == 0 ? "01" : (nqjgr == 1 ? "02" : "03"));
	1076	+ }
	1077	+ Integer dcgr = bdjcs.get(2);//滴虫感染
	1078	+ if (dcgr != null && dcgr >= 0)
	1079	+ {
	1080	+ wifeCheck.setTrichomonad(dcgr == 0 ? "01" : (dcgr == 1 ? "02" : "03"));
	1081	+ }
	1082	+ Integer qjd = bdjcs.get(3);//清洁度
	1083	+ if (qjd != null && qjd >= 0)
	1084	+ {
	1085	+ wifeCheck.setVaginalCleanliness(qjd == 0 ? "01" : (qjd == 1 ? "02" : (qjd == 2 ? "03" : "04")));
	1086	+ }
	1087	+ Integer acwsy = bdjcs.get(4);//胺臭味实验
	1088	+ if (acwsy != null && acwsy >= 0)
	1089	+ {
	1090	+ wifeCheck.setAfot(acwsy == 0 ? "01" : "02");
	1091	+ }
	1092	+ Integer phz = bdjcs.get(5);//ph值
	1093	+ if (phz != null && phz >= 0)
	1094	+ {
	1095	+ wifeCheck.setPhNum(phz == 0 ? "01" : "02");
	1096	+ }
	1097	+ Integer lqjsc = bdjcs.get(6);//淋球菌筛查
	1098	+ if (lqjsc != null && lqjsc >= 0)
	1099	+ {
	1100	+ wifeCheck.setNeisseriaGonorrhoeae(lqjsc == 0 ? "01" : (lqjsc == 1 ? "02" : "03"));
	1101	+ }
	1102	+ Integer syyytsc = bdjcs.get(7);//沙眼衣原体筛查
	1103	+ if (syyytsc != null && syyytsc >= 0)
	1104	+ {
	1105	+ wifeCheck.setChlamydiaTrachomatis(syyytsc == 0 ? "01" : (syyytsc == 1 ? "02" : "03"));
	1106	+ }
	1107	+ }
1051	1108
1052		- Integer dcgr = bdjcs.get(2);//滴虫感染
1053		- wifeCheck.setTrichomonad(dcgr == 0 ? "01" : (dcgr == 1 ? "02" : "03"));
1054	1109
1055		- Integer qjd = bdjcs.get(3);//清洁度
1056		- wifeCheck.setVaginalCleanliness(qjd == 0 ? "01" : (qjd == 1 ? "02" : (qjd == 2 ? "03" : "04")));
1057	1110
1058		- Integer acwsy = bdjcs.get(4);//胺臭味实验
1059		- wifeCheck.setAfot(acwsy == 0 ? "01" : "02");
1060		-
1061		- Integer phz = bdjcs.get(5);//ph值
1062		- wifeCheck.setPhNum(phz == 0 ? "01" : "02");
1063		-
1064		-
1065		- Integer lqjsc = bdjcs.get(6);//淋球菌筛查
1066		- wifeCheck.setNeisseriaGonorrhoeae(lqjsc == 0 ? "01" : (lqjsc == 1 ? "02" : "03"));
1067		-
1068		- Integer syyytsc = bdjcs.get(7);//沙眼衣原体筛查
1069		- wifeCheck.setChlamydiaTrachomatis(syyytsc == 0 ? "01" : (syyytsc == 1 ? "02" : "03"));
1070		-
1071		- //血细胞分析
1072		- List<String> xxbfxs = (ArrayList<String>) wifeMap.get("xxbfx");
1073		- wifeCheck.setHemoglobin(xxbfxs.get(0));//Hb
1074		- wifeCheck.setRedBloodCell(xxbfxs.get(1));//RBc
1075		- wifeCheck.setPlatelet(xxbfxs.get(2));//PLT
1076		- wifeCheck.setWhiteBloodCell(xxbfxs.get(3));//WBC
1077		- wifeCheck.setNeutrophil(xxbfxs.get(4));//N
1078		- wifeCheck.setLymphocyte(xxbfxs.get(5));//L
1079		- wifeCheck.setMonocytes(xxbfxs.get(6));//M
1080		- wifeCheck.setEo(xxbfxs.get(7));//E
1081		- wifeCheck.setBaso(xxbfxs.get(8));//B
1082		-
	1111	+ if ( wifeMap.get("xxbfx") != null )
	1112	+ {
	1113	+ //血细胞分析
	1114	+ List<String> xxbfxs = (ArrayList<String>) wifeMap.get("xxbfx");
	1115	+ wifeCheck.setHemoglobin(xxbfxs.get(0));//Hb
	1116	+ wifeCheck.setRedBloodCell(xxbfxs.get(1));//RBc
	1117	+ wifeCheck.setPlatelet(xxbfxs.get(2));//PLT
	1118	+ wifeCheck.setWhiteBloodCell(xxbfxs.get(3));//WBC
	1119	+ wifeCheck.setNeutrophil(xxbfxs.get(4));//N
	1120	+ wifeCheck.setLymphocyte(xxbfxs.get(5));//L
	1121	+ wifeCheck.setMonocytes(xxbfxs.get(6));//M
	1122	+ wifeCheck.setEo(xxbfxs.get(7));//E
	1123	+ wifeCheck.setBaso(xxbfxs.get(8));//B
	1124	+ }
1083	1125	//尿常规
1084	1126	List<Object> ncg = (ArrayList<Object>) wifeMap.get("ncg");
1085	1127	if (ncg != null && ncg.size() > 0) {
1086	1128
1087	1129
1088	1130
1089	1131
...	...	@@ -1105,19 +1147,28 @@
1105	1147	List<Integer> yigans = (ArrayList<Integer>) wifeMap.get("yigan");
1106	1148	if (CollectionUtils.isNotEmpty(yigans)) {
1107	1149	Integer hbsag = yigans.get(0);//HBs-Ag
1108		- wifeCheck.setHbsag(hbsag == 0 ? "01" : (hbsag == 1 ? "02" : "03"));
1109		-
	1150	+ if (hbsag != null && hbsag >= 0)
	1151	+ {
	1152	+ wifeCheck.setHbsag(hbsag == 0 ? "01" : (hbsag == 1 ? "02" : "03"));
	1153	+ }
1110	1154	Integer hbsab = yigans.get(1);//HBs-Ab
1111		- wifeCheck.setHbsab(hbsab == 0 ? "01" : (hbsab == 1 ? "02" : "03"));
	1155	+ if (hbsab != null && hbsab >= 0) {
	1156	+ wifeCheck.setHbsab(hbsab == 0 ? "01" : (hbsab == 1 ? "02" : "03"));
	1157	+ }
1112	1158
1113	1159	Integer hbeag = yigans.get(2);//HBe-Ag
1114		- wifeCheck.setHbeag(hbeag == 0 ? "01" : (hbeag == 1 ? "02" : "03"));
	1160	+ if (hbeag != null && hbeag >= 0) {
	1161	+ wifeCheck.setHbeag(hbeag == 0 ? "01" : (hbeag == 1 ? "02" : "03"));
	1162	+ }
1115	1163
1116	1164	Integer hbeab = yigans.get(3);//HBe-Ab
1117		- wifeCheck.setHbeab(hbeab == 0 ? "01" : (hbeab == 1 ? "02" : "03"));
1118		-
	1165	+ if (hbeab != null && hbeab >= 0) {
	1166	+ wifeCheck.setHbeab(hbeab == 0 ? "01" : (hbeab == 1 ? "02" : "03"));
	1167	+ }
1119	1168	Integer hbcab = yigans.get(4);//HBc-Ab
1120		- wifeCheck.setHbcab(hbcab == 0 ? "01" : (hbcab == 1 ? "02" : "03"));
	1169	+ if (hbcab != null && hbcab >= 0) {
	1170	+ wifeCheck.setHbcab(hbcab == 0 ? "01" : (hbcab == 1 ? "02" : "03"));
	1171	+ }
1121	1172	}
1122	1173	Object gbzam = wifeMap.get("gbzam");//谷丙转氨酶(ALT)
1123	1174	if (gbzam != null) {

...	...	@@ -68,7 +68,7 @@
68	68	}
69	69
70	70	/**
71		- * 承德县医院 2100001328
	71	+ * 承德县中医院 2100001329
72	72	* @param volume
73	73	* @param request
74	74	* @return
...	...	@@ -76,7 +76,7 @@
76	76	@RequestMapping(method = RequestMethod.POST, value = "/addComponentAnalysisCdxyy")
77	77	@ResponseBody
78	78	public BaseObjectResponse addComponentAnalysisCdxyy(@RequestBody @Valid VolumeComponentAnalysisModel volume,HttpServletRequest request) {
79		- volume.setHospitalId("2100001328");
	79	+ volume.setHospitalId("2100001329");
80	80	return volumeComponentAnalysisFacade.addComponentAnalysis(volume);
81	81
82	82	}

...	...	@@ -239,7 +239,7 @@
239	239	String hospitalId = autoMatchFacade.getHospitalId(userId);
240	240	VolumeComponentAnalysisModel volumeComponentAnalysisModel = mongoTemplate.findById(id, VolumeComponentAnalysisModel.class);
241	241	if (volumeComponentAnalysisModel != null) {
242		- Patients patients = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(volumeComponentAnalysisModel.getPatientId()).and("yn").is(YnEnums.YES.getId()).and("hospitalId").is(hospitalId)), Patients.class);
	242	+ Patients patients = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(volumeComponentAnalysisModel.getPatientId()).and("yn").is(YnEnums.YES.getId())), Patients.class);
243	243	if (patients != null) {
244	244	data = setData(patients, volumeComponentAnalysisModel,userId);
245	245	}