jiangjiazhi / regional-platform

Commit 13fc39f4476d0df22dc574de509b6093c358f695

Authored by liquanyu over 4 years ago

Exists in master and in 6 other branches

update

Showing 6 changed files with 270 additions and 170 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/MongoSyncService.java
platform-msg-generate/src/main/java/com/lyms/platform/msg/service/impl/BaseServiceImpl.java
platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/TempleteMsgGenerateWorker.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java
platform-operate-api/src/main/resources/spring/applicationContext-quartz.xml

...	...	@@ -167,7 +167,7 @@
167	167	return false;
168	168	} catch (Exception e) {
169	169	ExceptionUtils.catchException(e,"syncData Error. id :" +id+",action:" +action+",json:"+json +",className:"+className);
170		- return false;
	170	+ return true;
171	171	}
172	172	}
173	173

1	1	package com.lyms.platform.msg.service.impl;
2	2
3	3	import com.lyms.platform.biz.service.*;
	4	+import com.lyms.platform.common.constants.ErrorCodeConstants;
4	5	import com.lyms.platform.common.enums.*;
	6	+import com.lyms.platform.common.result.BaseListResponse;
5	7	import com.lyms.platform.common.utils.JsonUtil;
6	8	import com.lyms.platform.common.utils.StringUtils;
7	9	import com.lyms.platform.msg.model.HighScoreResult;
8	10
9	11
10	12
11	13
12	14
13	15
14	16
...	...	@@ -120,68 +122,88 @@
120	122	//把时间格式化成 yyyy_MM_dd 的日期
121	123	yuYueDate = DateUtils.formatDate(yuYueDate,DateUtils.Y_M_D);
122	124	}
123		- AntExChuQuery antExChuQuery = new AntExChuQuery();
124		- antExChuQuery.setYn(YnEnums.YES.getId());
125		- antExChuQuery.setNextCheckTimeStart(yuYueDate);
126		- antExChuQuery.setNextCheckTimeEnd(yuYueDate);
127		- antExChuQuery.setHospitalId(tempHid);
128		- List<AntExChuModel> chus = antenatalExaminationService.queryAntExChu(antExChuQuery);
129		- if (CollectionUtils.isNotEmpty(chus))
130		- {
131		- for (AntExChuModel chu : chus)
132		- {
133		- AntExQuery antExQuery = new AntExQuery();
134		- antExQuery.setParentId(chu.getParentId());
135		- antExQuery.setYn(YnEnums.YES.getId());
136		- antExQuery.setHospitalId(tempHid);
137		- //复诊不存在才添加
138		- List<AntenatalExaminationModel> list = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.DESC, "created"));
139		- if (!CollectionUtils.isNotEmpty(list))
140		- {
141		- idset.add(chu.getParentId());
142		- }
143	125
144		- }
145		- }
146	126
147		- PatientsQuery patientQuery = new PatientsQuery();
148		- patientQuery.setYn(YnEnums.YES.getId());
149		- List buildType = new ArrayList();
150		- buildType.add(0);
151		- buildType.add(2);
152		- patientQuery.setBuildTypeList(buildType);
153		- //1孕妇 3 产妇
154		- patientQuery.setType(1);
155		- //分娩状态
156		- patientQuery.setDueStatus(0);
157		- patientQuery.setHospitalId(tempHid);
	127	+ AntExRecordQuery antExRecordQuery = new AntExRecordQuery();
	128	+ antExRecordQuery.setHospitalId(tempHid);
	129	+ antExRecordQuery.setNextCheckTimeStart(yuYueDate);
	130	+ antExRecordQuery.setNextCheckTimeEnd(yuYueDate);
158	131
159		- //末次月经必须大于当前时间减去42周视为未分娩孕妇
160		- Date lastMensesMax = DateUtils.getNewDate(new Date(),-42, "周", 1);
161		- patientQuery.setLastMensesStart(lastMensesMax);
162		-
163		- List<Patients> patientses = patientsService.queryPatient(patientQuery);
164		- if (CollectionUtils.isNotEmpty(patientses))
	132	+ System.out.println(antExRecordQuery.convertToQuery().convertToMongoQuery().toString());
	133	+ List<AntExRecordModel> antExRecordModelList = recordService.queryAntExRecords(antExRecordQuery, Sort.Direction.DESC, "created");
	134	+ if (CollectionUtils.isNotEmpty(antExRecordModelList))
165	135	{
166		- for (Patients pat : patientses)
	136	+ for (AntExRecordModel model : antExRecordModelList)
167	137	{
168		- AntExQuery antExQuery = new AntExQuery();
169		- antExQuery.setParentId(pat.getId());
170		- antExQuery.setYn(YnEnums.YES.getId());
171		- List<AntenatalExaminationModel> list = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.DESC, "created"));
172		- if (CollectionUtils.isNotEmpty(list))
173		- {
174		- AntenatalExaminationModel ae = list.get(0);
175		- if (ae != null && ae.getNextCheckTime() != null)
176		- {
177		- if (DateUtils.getDateStr(yuYueDate, DateUtils.Y_M_D).equals(DateUtils.getDateStr(ae.getNextCheckTime(), DateUtils.Y_M_D))) {
178		- idset.add(ae.getParentId());
179		- }
180		- }
181		- }
	138	+ idset.add(model.getParentId());
182	139	}
183	140	}
	141	+
184	142	return idset;
	143	+
	144	+
	145	+// AntExChuQuery antExChuQuery = new AntExChuQuery();
	146	+// antExChuQuery.setYn(YnEnums.YES.getId());
	147	+// antExChuQuery.setNextCheckTimeStart(yuYueDate);
	148	+// antExChuQuery.setNextCheckTimeEnd(yuYueDate);
	149	+// antExChuQuery.setHospitalId(tempHid);
	150	+// List<AntExChuModel> chus = antenatalExaminationService.queryAntExChu(antExChuQuery);
	151	+// if (CollectionUtils.isNotEmpty(chus))
	152	+// {
	153	+// for (AntExChuModel chu : chus)
	154	+// {
	155	+// AntExQuery antExQuery = new AntExQuery();
	156	+// antExQuery.setParentId(chu.getParentId());
	157	+// antExQuery.setYn(YnEnums.YES.getId());
	158	+// antExQuery.setHospitalId(tempHid);
	159	+// //复诊不存在才添加
	160	+// List<AntenatalExaminationModel> list = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.DESC, "created"));
	161	+// if (!CollectionUtils.isNotEmpty(list))
	162	+// {
	163	+// idset.add(chu.getParentId());
	164	+// }
	165	+//
	166	+// }
	167	+// }
	168	+//
	169	+// PatientsQuery patientQuery = new PatientsQuery();
	170	+// patientQuery.setYn(YnEnums.YES.getId());
	171	+// List buildType = new ArrayList();
	172	+// buildType.add(0);
	173	+// buildType.add(2);
	174	+// patientQuery.setBuildTypeList(buildType);
	175	+// //1孕妇 3 产妇
	176	+// patientQuery.setType(1);
	177	+// //分娩状态
	178	+// patientQuery.setDueStatus(0);
	179	+// patientQuery.setHospitalId(tempHid);
	180	+//
	181	+// //末次月经必须大于当前时间减去42周视为未分娩孕妇
	182	+// Date lastMensesMax = DateUtils.getNewDate(new Date(),-42, "周", 1);
	183	+// patientQuery.setLastMensesStart(lastMensesMax);
	184	+//
	185	+// List<Patients> patientses = patientsService.queryPatient(patientQuery);
	186	+// if (CollectionUtils.isNotEmpty(patientses))
	187	+// {
	188	+// for (Patients pat : patientses)
	189	+// {
	190	+// AntExQuery antExQuery = new AntExQuery();
	191	+// antExQuery.setParentId(pat.getId());
	192	+// antExQuery.setYn(YnEnums.YES.getId());
	193	+// List<AntenatalExaminationModel> list = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.DESC, "created"));
	194	+// if (CollectionUtils.isNotEmpty(list))
	195	+// {
	196	+// AntenatalExaminationModel ae = list.get(0);
	197	+// if (ae != null && ae.getNextCheckTime() != null)
	198	+// {
	199	+// if (DateUtils.getDateStr(yuYueDate, DateUtils.Y_M_D).equals(DateUtils.getDateStr(ae.getNextCheckTime(), DateUtils.Y_M_D))) {
	200	+// idset.add(ae.getParentId());
	201	+// }
	202	+// }
	203	+// }
	204	+// }
	205	+// }
	206	+// return idset;
185	207	}
186	208
187	209	/**

...	...	@@ -1273,15 +1273,13 @@
1273	1273	addYumRemindMessages(template, config, service, tempHid, sendTimeType, messages,start, end, patient);
1274	1274	}
1275	1275	} else {
1276		- PatientsQuery query = getPatientsQuery(template, true);
1277		- query.setLastMensesStart(startDate);
1278		- query.setLastMensesEnd(endDate);
1279		-
1280		- List<Patients> patients = yunBookbuildingService.queryPregnantWithQuery(query);
	1276	+ // PatientsQuery query = getPatientsQuery(template, true);
	1277	+ patientsQuery.setLastMensesStart(startDate);
	1278	+ patientsQuery.setLastMensesEnd(endDate);
	1279	+ System.out.println(patientsQuery.convertToQuery().convertToMongoQuery().toString());
	1280	+ List<Patients> patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery);
1281	1281	for (Patients patient : patients){
1282		- HashMap<String, Object> hashMap = getMapByParam(template, patient.getId(), false);
1283		- List<Map> patientServices = patientServiceService.getPatientServices(hashMap);
1284		- if (CollectionUtils.isNotEmpty(patientServices)){
	1282	+ if (CollectionUtils.isNotEmpty(patients)){
1285	1283	addYumRemindMessages(template, config, service, tempHid, sendTimeType, messages,start, end, patient);
1286	1284	}
1287	1285	}
...	...	@@ -1354,12 +1352,12 @@
1354	1352	if (existMsg){
1355	1353	continue;
1356	1354	}
1357		-
1358		- HashMap<String, Object> hashMap = getMapByParam(template, patient.getId(), false);
1359		- List<Map> patientServices = patientServiceService.getPatientServices(hashMap);
1360		- if (CollectionUtils.isNotEmpty(patientServices)){
1361		- addYunOverdueMessages(template, config, service, messages, yuYueDate, patient);
1362		- }
	1355	+ addYunOverdueMessages(template, config, service, messages, yuYueDate, patient);
	1356	+// HashMap<String, Object> hashMap = getMapByParam(template, patient.getId(), false);
	1357	+// List<Map> patientServices = patientServiceService.getPatientServices(hashMap);
	1358	+// if (CollectionUtils.isNotEmpty(patientServices)){
	1359	+// addYunOverdueMessages(template, config, service, messages, yuYueDate, patient);
	1360	+// }
1363	1361	}
1364	1362	list.setMessages(messages);
1365	1363	HelperUtils.sendMsg(list);

...	...	@@ -293,6 +293,7 @@
293	293	public void syncAntex(Date start,Date end)
294	294	{
295	295	AntExQuery antExQuery = new AntExQuery();
	296	+ antExQuery.setYn(YnEnums.YES.getId());
296	297	antExQuery.setHospitalId("2100001377");
297	298
298	299	if (start != null)
299	300
300	301
301	302
302	303
303	304
304	305
305	306
...	...	@@ -767,41 +768,54 @@
767	768	String assistFood = babyCheckModel.getAssistFood();
768	769	if (StringUtils.isNotEmpty(assistFood))
769	770	{
770		- JSONObject jsonObject = JsonUtil.getObj(assistFood);
771		- if (jsonObject != null && jsonObject.size() > 0 && "yes".equals(jsonObject.get("yesOrNo").toString()) && jsonObject.get("qtText") != null)
	771	+ try {
	772	+ JSONObject jsonObject = JsonUtil.getObj(assistFood);
	773	+ if (jsonObject != null && jsonObject.size() > 0 && "yes".equals(jsonObject.get("yesOrNo").toString()) && jsonObject.get("qtText") != null)
	774	+ {
	775	+ mysqlBabyCheck.setAssistFood(jsonObject.get("qtText").toString());
	776	+ }
	777	+ else if (jsonObject != null && "no".equals(jsonObject.get("yesOrNo").toString()))
	778	+ {
	779	+ mysqlBabyCheck.setAssistFood(null);
	780	+ }
	781	+ }catch (Exception e)
772	782	{
773		- mysqlBabyCheck.setAssistFood(jsonObject.get("qtText").toString());
	783	+ mysqlBabyCheck.setAssistFood(assistFood);
774	784	}
775		- else if (jsonObject != null && "no".equals(jsonObject.get("yesOrNo").toString()))
776		- {
777		- mysqlBabyCheck.setAssistFood(null);
778		- }
	785	+
	786	+
779	787	}
780	788
781	789
782	790	String faceColor = babyCheckModel.getFaceColor();
783	791	if (StringUtils.isNotEmpty(faceColor))
784	792	{
785		- JSONObject jsonObject = JsonUtil.getObj(faceColor);
786		- if (jsonObject != null && jsonObject.size() > 0 && StringUtils.isNotEmpty(jsonObject.get("select").toString()))
787		- {
788		- if ( "1".equals(jsonObject.get("select").toString()))
	793	+ try {
	794	+ JSONObject jsonObject = JsonUtil.getObj(faceColor);
	795	+ if (jsonObject != null && jsonObject.size() > 0 && StringUtils.isNotEmpty(jsonObject.get("select").toString()))
789	796	{
790		- faceColor ="红润";
791		- }else if ( "2".equals(jsonObject.get("select").toString()))
792		- {
793		- faceColor ="黄染";
	797	+ if ( "1".equals(jsonObject.get("select").toString()))
	798	+ {
	799	+ faceColor ="红润";
	800	+ }else if ( "2".equals(jsonObject.get("select").toString()))
	801	+ {
	802	+ faceColor ="黄染";
	803	+ }
	804	+ else
	805	+ {
	806	+ faceColor = jsonObject.get("qtText") !=null ? jsonObject.get("qtText").toString() : null;
	807	+ }
	808	+ mysqlBabyCheck.setFaceColor(faceColor);
794	809	}
795	810	else
796	811	{
797		- faceColor = jsonObject.get("qtText") !=null ? jsonObject.get("qtText").toString() : null;
	812	+ mysqlBabyCheck.setFaceColor(null);
798	813	}
	814	+ }catch (Exception e)
	815	+ {
799	816	mysqlBabyCheck.setFaceColor(faceColor);
800	817	}
801		- else
802		- {
803		- mysqlBabyCheck.setFaceColor(null);
804		- }
	818	+
805	819	}
806	820
807	821
808	822
809	823
810	824
...	...	@@ -868,18 +882,24 @@
868	882	String neck = babyCheckModel.getNeck();
869	883	if (StringUtils.isNotEmpty(neck))
870	884	{
871		- JSONObject jsonObject = JsonUtil.getObj(neck);
872		- if (jsonObject != null && jsonObject.size() > 0 && StringUtils.isNotEmpty(jsonObject.get("yesOrNo").toString()))
873		- {
874		- if ( "yes".equals(jsonObject.get("yesOrNo").toString()))
	885	+ try {
	886	+ JSONObject jsonObject = JsonUtil.getObj(neck);
	887	+ if (jsonObject != null && jsonObject.size() > 0 && StringUtils.isNotEmpty(jsonObject.get("yesOrNo").toString()))
875	888	{
876		- neck = jsonObject.get("qtText") !=null ? jsonObject.get("qtText").toString() : null;
877		- }else if ( "no".equals(jsonObject.get("yesOrNo").toString()))
878		- {
879		- neck ="无";
	889	+ if ( "yes".equals(jsonObject.get("yesOrNo").toString()))
	890	+ {
	891	+ neck = jsonObject.get("qtText") !=null ? jsonObject.get("qtText").toString() : null;
	892	+ }else if ( "no".equals(jsonObject.get("yesOrNo").toString()))
	893	+ {
	894	+ neck ="无";
	895	+ }
	896	+ mysqlBabyCheck.setNeck(neck);
880	897	}
	898	+ }catch (Exception e)
	899	+ {
881	900	mysqlBabyCheck.setNeck(neck);
882	901	}
	902	+
883	903	}
884	904
885	905	Map navel = babyCheckModel.getNavel();
886	906
887	907
888	908
889	909
890	910
891	911
892	912
893	913
894	914
895	915
896	916
897	917
898	918
899	919
900	920
901	921
902	922
903	923
904	924
905	925
906	926
...	...	@@ -950,95 +970,126 @@
950	970	String chest = babyCheckModel.getChest();
951	971	if (StringUtils.isNotEmpty(chest))
952	972	{
953		- JSONObject jsonObject = JsonUtil.getObj(chest);
954		- if (jsonObject != null && jsonObject.size() > 0 && StringUtils.isNotEmpty(jsonObject.get("yesOrNo").toString()))
955		- {
956		- if ( "yes".equals(jsonObject.get("yesOrNo").toString()))
	973	+ try {
	974	+ JSONObject jsonObject = JsonUtil.getObj(chest);
	975	+ if (jsonObject != null && jsonObject.size() > 0 && StringUtils.isNotEmpty(jsonObject.get("yesOrNo").toString()))
957	976	{
958		- chest = jsonObject.get("qtText") !=null ? jsonObject.get("qtText").toString() : null;
959		- }else if ( "no".equals(jsonObject.get("yesOrNo").toString()))
960		- {
961		- chest ="无";
	977	+ if ( "yes".equals(jsonObject.get("yesOrNo").toString()))
	978	+ {
	979	+ chest = jsonObject.get("qtText") !=null ? jsonObject.get("qtText").toString() : null;
	980	+ }else if ( "no".equals(jsonObject.get("yesOrNo").toString()))
	981	+ {
	982	+ chest ="无";
	983	+ }
	984	+ mysqlBabyCheck.setChest(chest);
962	985	}
	986	+ }
	987	+ catch (Exception e)
	988	+ {
963	989	mysqlBabyCheck.setChest(chest);
964	990	}
	991	+
965	992	}
966	993
967	994
968	995	String portaGenitals = babyCheckModel.getPortaGenitals();
969	996	if (StringUtils.isNotEmpty(portaGenitals))
970	997	{
971		- JSONObject jsonObject = JsonUtil.getObj(portaGenitals);
972		- if (jsonObject != null && jsonObject.size() > 0 && StringUtils.isNotEmpty(jsonObject.get("yesOrNo").toString()) && "yes".equals(jsonObject.get("yesOrNo").toString()))
	998	+ try {
	999	+ JSONObject jsonObject = JsonUtil.getObj(portaGenitals);
	1000	+ if (jsonObject != null && jsonObject.size() > 0 && StringUtils.isNotEmpty(jsonObject.get("yesOrNo").toString()) && "yes".equals(jsonObject.get("yesOrNo").toString()))
	1001	+ {
	1002	+ mysqlBabyCheck.setPortaGenitals("异常");
	1003	+ }
	1004	+ else if ("no".equals(jsonObject.get("yesOrNo").toString()))
	1005	+ {
	1006	+ mysqlBabyCheck.setPortaGenitals("未见异常");
	1007	+ }
	1008	+ }catch (Exception e)
973	1009	{
974		- mysqlBabyCheck.setPortaGenitals("异常");
	1010	+ mysqlBabyCheck.setPortaGenitals("portaGenitals");
975	1011	}
976		- else if ("no".equals(jsonObject.get("yesOrNo").toString()))
977		- {
978		- mysqlBabyCheck.setPortaGenitals("未见异常");
979		- }
980	1012
	1013	+
981	1014	}
982	1015
983	1016
984	1017	String stoopStatus = babyCheckModel.getStoopStatus();
985	1018	if (StringUtils.isNotEmpty(stoopStatus))
986	1019	{
987		- JSONObject jsonObject = JsonUtil.getObj(stoopStatus);
988		- if (jsonObject != null && jsonObject.size() > 0 && StringUtils.isNotEmpty(jsonObject.get("yesOrNo").toString()))
989		- {
990		- if ( "yes".equals(jsonObject.get("yesOrNo").toString()))
	1020	+ try {
	1021	+ JSONObject jsonObject = JsonUtil.getObj(stoopStatus);
	1022	+ if (jsonObject != null && jsonObject.size() > 0 && StringUtils.isNotEmpty(jsonObject.get("yesOrNo").toString()))
991	1023	{
992		- stoopStatus = "异常";
993		- }else if ( "no".equals(jsonObject.get("yesOrNo").toString()))
994		- {
995		- stoopStatus ="未见异常";
	1024	+ if ( "yes".equals(jsonObject.get("yesOrNo").toString()))
	1025	+ {
	1026	+ stoopStatus = "异常";
	1027	+ }else if ( "no".equals(jsonObject.get("yesOrNo").toString()))
	1028	+ {
	1029	+ stoopStatus ="未见异常";
	1030	+ }
	1031	+ mysqlBabyCheck.setStoopStatus(stoopStatus);
996	1032	}
	1033	+ }catch (Exception e)
	1034	+ {
997	1035	mysqlBabyCheck.setStoopStatus(stoopStatus);
998	1036	}
	1037	+
999	1038	}
1000	1039
1001	1040	String stoopSign = babyCheckModel.getStoopSign();
1002	1041	if (StringUtils.isNotEmpty(stoopSign))
1003	1042	{
1004		- JSONObject jsonObject = JsonUtil.getObj(stoopSign);
1005		- if (jsonObject != null && jsonObject.size() > 0 && StringUtils.isNotEmpty(jsonObject.get("yesOrNo").toString()))
1006		- {
1007		- if ( "yes".equals(jsonObject.get("yesOrNo").toString()))
	1043	+ try {
	1044	+ JSONObject jsonObject = JsonUtil.getObj(stoopSign);
	1045	+ if (jsonObject != null && jsonObject.size() > 0 && StringUtils.isNotEmpty(jsonObject.get("yesOrNo").toString()))
1008	1046	{
1009		- stoopSign = "异常";
1010		- }else if ( "no".equals(jsonObject.get("yesOrNo").toString()))
1011		- {
1012		- stoopSign ="未见异常";
	1047	+ if ( "yes".equals(jsonObject.get("yesOrNo").toString()))
	1048	+ {
	1049	+ stoopSign = "异常";
	1050	+ }else if ( "no".equals(jsonObject.get("yesOrNo").toString()))
	1051	+ {
	1052	+ stoopSign ="未见异常";
	1053	+ }
	1054	+ mysqlBabyCheck.setStoopSign(stoopSign);
1013	1055	}
	1056	+ }catch (Exception e)
	1057	+ {
1014	1058	mysqlBabyCheck.setStoopSign(stoopSign);
1015	1059	}
	1060	+
1016	1061	}
1017	1062
1018	1063
1019	1064	String hipJoint = babyCheckModel.getHipJoint();
1020	1065	if (StringUtils.isNotEmpty(hipJoint))
1021	1066	{
1022		- JSONObject jsonObject = JsonUtil.getObj(hipJoint);
1023		- if (jsonObject != null && jsonObject.size() > 0 && StringUtils.isNotEmpty(jsonObject.get("select").toString()))
1024		- {
1025		- if ( "1".equals(jsonObject.get("select").toString()))
	1067	+ try {
	1068	+ JSONObject jsonObject = JsonUtil.getObj(hipJoint);
	1069	+ if (jsonObject != null && jsonObject.size() > 0 && StringUtils.isNotEmpty(jsonObject.get("select").toString()))
1026	1070	{
1027		- hipJoint = "未见明显异常";
1028		- }else if ( "2".equals(jsonObject.get("select").toString()))
1029		- {
1030		- hipJoint ="接近正常";
	1071	+ if ( "1".equals(jsonObject.get("select").toString()))
	1072	+ {
	1073	+ hipJoint = "未见明显异常";
	1074	+ }else if ( "2".equals(jsonObject.get("select").toString()))
	1075	+ {
	1076	+ hipJoint ="接近正常";
	1077	+ }
	1078	+ else if ( "3".equals(jsonObject.get("select").toString()))
	1079	+ {
	1080	+ hipJoint = jsonObject.get("qtText") !=null ? jsonObject.get("qtText").toString() : null;
	1081	+ }
	1082	+ mysqlBabyCheck.setHipJoint(hipJoint);
1031	1083	}
1032		- else if ( "3".equals(jsonObject.get("select").toString()))
	1084	+ else
1033	1085	{
1034		- hipJoint = jsonObject.get("qtText") !=null ? jsonObject.get("qtText").toString() : null;
	1086	+ mysqlBabyCheck.setHipJoint(null);
1035	1087	}
	1088	+ }catch (Exception e)
	1089	+ {
1036	1090	mysqlBabyCheck.setHipJoint(hipJoint);
1037	1091	}
1038		- else
1039		- {
1040		- mysqlBabyCheck.setHipJoint(null);
1041		- }
	1092	+
1042	1093	}
1043	1094
1044	1095	mysqlBabyCheck.setHemoglobin(babyCheckModel.getHemoglobin());
1045	1096
1046	1097
1047	1098
...	...	@@ -1099,18 +1150,24 @@
1099	1150	String slscx = mysqlBabyCheck.getSlscx();
1100	1151	if (StringUtils.isNotEmpty(slscx))
1101	1152	{
1102		- JSONObject jsonObject = JsonUtil.getObj(slscx);
1103		- if (jsonObject != null && jsonObject.size() > 0 && StringUtils.isNotEmpty(jsonObject.get("select").toString()))
1104		- {
1105		- if ( "2".equals(jsonObject.get("select").toString()))
	1153	+ try {
	1154	+ JSONObject jsonObject = JsonUtil.getObj(slscx);
	1155	+ if (jsonObject != null && jsonObject.size() > 0 && StringUtils.isNotEmpty(jsonObject.get("select").toString()))
1106	1156	{
1107		- slscx = jsonObject.get("qtText") !=null ? jsonObject.get("qtText").toString() : null;
1108		- }else if ( "1".equals(jsonObject.get("select").toString()))
1109		- {
1110		- slscx ="未见异常";
	1157	+ if ( "2".equals(jsonObject.get("select").toString()))
	1158	+ {
	1159	+ slscx = jsonObject.get("qtText") !=null ? jsonObject.get("qtText").toString() : null;
	1160	+ }else if ( "1".equals(jsonObject.get("select").toString()))
	1161	+ {
	1162	+ slscx ="未见异常";
	1163	+ }
	1164	+ mysqlBabyCheck.setSlscx(slscx);
1111	1165	}
	1166	+ }catch (Exception e)
	1167	+ {
1112	1168	mysqlBabyCheck.setSlscx(slscx);
1113	1169	}
	1170	+
1114	1171	}
1115	1172	else
1116	1173	{
1117	1174
1118	1175
1119	1176
...	...	@@ -1149,24 +1206,30 @@
1149	1206	if (StringUtils.isNotEmpty(hearing))
1150	1207	{
1151	1208	String hearingStr = "";
1152		- JSONObject jsonObject = JsonUtil.getObj(hearing);
1153		- if (jsonObject != null && jsonObject.size() > 0 && StringUtils.isNotEmpty(jsonObject.get("select").toString()))
1154		- {
1155		- if ( "1".equals(jsonObject.get("select").toString()))
	1209	+ try {
	1210	+ JSONObject jsonObject = JsonUtil.getObj(hearing);
	1211	+ if (jsonObject != null && jsonObject.size() > 0 && StringUtils.isNotEmpty(jsonObject.get("select").toString()))
1156	1212	{
1157		- hearingStr = "通过";
1158		- }else if ( "2".equals(jsonObject.get("select").toString())) {
1159		- hearingStr = "未通过";
	1213	+ if ( "1".equals(jsonObject.get("select").toString()))
	1214	+ {
	1215	+ hearingStr = "通过";
	1216	+ }else if ( "2".equals(jsonObject.get("select").toString())) {
	1217	+ hearingStr = "未通过";
	1218	+ }
	1219	+ else if ( "3".equals(jsonObject.get("select").toString()))
	1220	+ {
	1221	+ hearingStr = "未筛查";
	1222	+ }
	1223	+ else {
	1224	+ hearingStr = jsonObject.get("qtText") !=null ? jsonObject.get("qtText").toString() : null;
	1225	+ }
	1226	+ mysqlBabyCheck.setHearing(hearingStr);
1160	1227	}
1161		- else if ( "3".equals(jsonObject.get("select").toString()))
1162		- {
1163		- hearingStr = "未筛查";
1164		- }
1165		- else {
1166		- hearingStr = jsonObject.get("qtText") !=null ? jsonObject.get("qtText").toString() : null;
1167		- }
1168		- mysqlBabyCheck.setHearing(hearingStr);
	1228	+ }catch (Exception e)
	1229	+ {
	1230	+ mysqlBabyCheck.setHearing(hearing);
1169	1231	}
	1232	+
1170	1233	}
1171	1234	else
1172	1235	{

...	...	@@ -51,11 +51,11 @@
51	51	// urls.put("area-changyi-api.healthbaby.com.cn:12356","昌邑");
52	52	// urls.put("area-xtrm-api.healthbaby.com.cn:12356","邢台人民医院系统");
53	53	// urls.put("area-lc-api.healthbaby.com.cn:55581","聊城");
54		- urls.put("area-dz-api.healthbaby.com.cn:12356","德州");
	54	+ // urls.put("area-dz-api.healthbaby.com.cn:12356","德州");
55	55	urls.put("area-qhd-api.healthbaby.com.cn:18019","秦皇岛");
56	56	// urls.put("area-nc-api.healthbaby.com.cn:12356","南充");
57	57	//urls.put("area-laoling-api.healthbaby.com.cn:12356","乐陵");
58		- urls.put("area-zhuchengrenmin-api.healthbaby.com.cn:12356","诸城人民医院");
	58	+ // urls.put("area-zhuchengrenmin-api.healthbaby.com.cn:12356","诸城人民医院");
59	59	urls.put("area-hengshui-api.healthbaby.com.cn:8787","衡水区域");
60	60	urls.put("area-rongcheng-api.healthbaby.com.cn:12356","荣成");
61	61	urls.put("area-zhucheng-api.healthbaby.com.cn:12356","诸城市妇幼保健院");
...	...	@@ -167,8 +167,8 @@
167	167	{
168	168	if ("26EB0301C4A2410E90985A3E55856E4BDD1E0738D7612389D1064D8FEA3E8BA03E6DE745639AC53F4ECD0A961CF459E4".equals(
169	169	model.getClassName()) \|\| "26EB0301C4A2410E90985A3E55856E4BD23678A20530C64EC8478C7581BC98073D9BFF0544133E28AB36B23DF4485FB8".equals(model.getClassName())
170		- \|\| model.getClassName().equals("26EB0301C4A2410E90985A3E55856E4BC90B764322A576155B201AFB0BC8C94FFAB29197A8B86F592DD2ABABF896EB89")
171		- \|\| model.getClassName().equals("26EB0301C4A2410E90985A3E55856E4B3C4D479C08144B1C305459866E333E5EA9DBC5ADCC909D6B56A15E9ACD7D84BB")
	170	+// \|\| model.getClassName().equals("26EB0301C4A2410E90985A3E55856E4BC90B764322A576155B201AFB0BC8C94FFAB29197A8B86F592DD2ABABF896EB89")
	171	+// \|\| model.getClassName().equals("26EB0301C4A2410E90985A3E55856E4B3C4D479C08144B1C305459866E333E5EA9DBC5ADCC909D6B56A15E9ACD7D84BB")
172	172	)
173	173	{
174	174	//System.out.println("archiveData="+model.getClassName());

...	...	@@ -521,14 +521,31 @@
521	521	<property name="cronExpression" value="0 20 8 * * ? "></property>
522	522	</bean>
523	523
	524	+ <!-- 滦平妇幼同步mongodb数据到mysql-->
	525	+ <bean id="patientSyncMysqlJob" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
	526	+ <!-- 要调用的bean -->
	527	+ <property name="targetObject" ref="patientSyncMysqlFacade"></property>
	528	+ <!-- 要调用的Method -->
	529	+ <property name="targetMethod" value="syncLpData"></property>
	530	+ <!-- 是否并发,false表示如果发生错误也不影响下一次的调用 -->
	531	+ <property name="concurrent" value="false"></property>
	532	+ </bean>
524	533
	534	+ <bean id="patientSyncMysqlTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean">
	535	+ <property name="jobDetail" ref="patientSyncMysqlJob"/>
	536	+ <property name="cronExpression" value="0 38 13 * * ? "></property>
	537	+ </bean>
525	538
	539	+
	540	+
	541	+
526	542	<!-- 总调度,用于启动定时器 -->
527	543	<bean id="schedulerFactory" class="org.springframework.scheduling.quartz.SchedulerFactoryBean">
528	544	<property name="triggers" >
529	545	<list>
530	546	<!--<ref bean="babySieveQhdTrigger"/>-->
531	547	<ref bean="qhdChuZhengTrigger"/>
	548	+ <ref bean="patientSyncMysqlTrigger"/>
532	549
533	550	<ref bean="autoMatDeliverTrigger"/>
534	551	<ref bean="delSieveTrigger"/>