jiangjiazhi / regional-platform

Commit c8a74c34ee1d023684dc45a8fe4b202023b7504e

Authored by zhangchao over 1 year ago

Exists in dev

#fix:新增大同产筛录入功能

Showing 2 changed files with 487 additions and 166 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java
platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java

...	...	@@ -154,11 +154,11 @@
154	154	List<LisReportModel> lisReportModels = masterLisMapper.queryLisDataByModel(lisReportQuery);
155	155	saveLisUpdateData(lisReportModels.get(0));
156	156	//TODO 处理大同危急值逻辑
157		- if ("2100002419".equals(model.getHospitalId())){
	157	+ if ("2100002419".equals(model.getHospitalId())) {
158	158	saveLisCrisisItemList(model);
159	159	}
160	160	} catch (Exception e) {
161		- System.out.println("LisSaveTask ->Exception,"+e);
	161	+ System.out.println("LisSaveTask ->Exception," + e);
162	162	continue;
163	163	}
164	164
...	...	@@ -169,6 +169,7 @@
169	169
170	170	}
171	171	}
	172	+
172	173	@Autowired
173	174	private ReferConfigService referConfigService;
174	175
175	176
176	177
177	178
...	...	@@ -177,14 +178,15 @@
177	178
178	179	/**
179	180	* 根据Lis数据同步大同高危急值
	181	+ *
180	182	* @param model
181	183	*/
182		- public void saveLisCrisisItemList(LisReportModel model){
	184	+ public void saveLisCrisisItemList(LisReportModel model) {
183	185	System.out.println("saveLisCrisisItemList startup");
184	186	//1获取孕妇pid
185		- String hospitalId=model.getHospitalId();
	187	+ String hospitalId = model.getHospitalId();
186	188	Patients patients = null;
187		- List<Patients> list= null;
	189	+ List<Patients> list = null;
188	190	PatientsQuery patientsQuery = new PatientsQuery();
189	191	patientsQuery.setHospitalId(hospitalId);
190	192	patientsQuery.setName(model.getName());
191	193
192	194
193	195
194	196
...	...	@@ -197,26 +199,26 @@
197	199	patientsQuery.setPhone(model.getPhone());
198	200	patientsQuery.setVcCardNo(null);
199	201	list = patientsService.queryPatient(patientsQuery);
200		- if(list != null && list.size() > 0){
	202	+ if (list != null && list.size() > 0) {
201	203	patients = list.get(list.size() - 1);
202	204	}
203	205
204	206	}
205		- if(patients == null){
	207	+ if (patients == null) {
206	208	System.out.println("lis query patients null");
207	209	return;
208	210	}
209	211
210		- AntExChuQuery antExChuQuery=new AntExChuQuery();
	212	+ AntExChuQuery antExChuQuery = new AntExChuQuery();
211	213	antExChuQuery.setParentId(patients.getId());
212	214	antExChuQuery.setYn(1);
213		- List<AntExChuModel> antExChuModels= antExService.queryAntExChu(antExChuQuery);
214		- AntExChuModel antExChuModel=null;
215		- if (CollectionUtils.isNotEmpty(antExChuModels)){
216		- antExChuModel= antExChuModels.get(0);
	215	+ antExChuQuery.setHospitalId(hospitalId);
	216	+ List<AntExChuModel> antExChuModels = antExService.queryAntExChu(antExChuQuery);
	217	+ AntExChuModel antExChuModel = null;
	218	+ if (CollectionUtils.isNotEmpty(antExChuModels)) {
	219	+ antExChuModel = antExChuModels.get(0);
217	220	}
218	221
219		-
220	222	LisCrisisItem crisisItem = new LisCrisisItem();
221	223	crisisItem.setPid(patients.getPid());
222	224	crisisItem.setPatientId(patients.getId());
223	225
224	226
...	...	@@ -230,17 +232,17 @@
230	232	crisisItem.setPublishTime(model.getPublishTime());
231	233	try {
232	234	crisisItem.setAge(Integer.valueOf(model.getAge()));
233		- }catch (Exception e){
234		- System.out.println("saveLisCrisisItemList->Exception e,"+e);
	235	+ } catch (Exception e) {
	236	+ System.out.println("saveLisCrisisItemList->Exception e," + e);
235	237	}
236	238
237		- // crisisItem.setApplyDoctorCode(model.getApplyDoctorCode());
	239	+ // crisisItem.setApplyDoctorCode(model.getApplyDoctorCode());
238	240	crisisItem.setApplyDoctorName(model.getApplyDoctor());
239	241	crisisItem.setHospitalId(hospitalId);
240	242	crisisItem.setStatus(1);
241	243	crisisItem.setStatusName("待处理");
242	244	crisisItem.setSyncStatus(0);
243		- if (StringUtils.isNotEmpty(model.getItemJson())){
	245	+ if (StringUtils.isNotEmpty(model.getItemJson())) {
244	246	ReferConfigQuery referConfigQuery = new ReferConfigQuery();
245	247	referConfigQuery.setYn(YnEnums.YES.getId());
246	248	referConfigQuery.setHospitalId(Integer.valueOf(hospitalId));
247	249
248	250
249	251
250	252
...	...	@@ -251,24 +253,24 @@
251	253	referValueMap.put(referValue.getCode(), referValue);
252	254	}
253	255
254		- Map<String,String> params=new HashMap<>();
	256	+ Map<String, String> params = new HashMap<>();
255	257
256		- List<LisReportItemModel> itemList= JsonUtil.jsonToList(model.getItemJson(),LisReportItemModel.class);
	258	+ List<LisReportItemModel> itemList = JsonUtil.jsonToList(model.getItemJson(), LisReportItemModel.class);
257	259	// crisis init
258	260	for (LisReportItemModel item : itemList) {
259		- String code= item.getCode().trim();
	261	+ String code = item.getCode().trim();
260	262	ReferValue referValue = referValueMap.get(code);
261	263	if (referValue != null) {
262	264
263		- boolean flag=buildEmergency(item.getResult(),referValue);
264		- System.out.println("saveLisCrisisItemList flag"+flag);
	265	+ boolean flag = buildEmergency(item.getResult(), referValue);
	266	+ System.out.println("saveLisCrisisItemList flag" + flag);
265	267	if (flag) {
266	268	crisisItem.setId(model.getLisId() + "_" + item.getCode());
267	269	crisisItem.setName(model.getType());
268	270	crisisItem.setClassify(model.getType());
269	271	crisisItem.setClassifyName(model.getType());
270	272	crisisItem.setResult(item.getResult());
271		- //crisisItem.setFlag(item.getFlag());
	273	+ //crisisItem.setFlag(item.getFlag());
272	274	crisisItem.setItemCode(item.getCode().trim());
273	275	crisisItem.setItemName(item.getName().trim());
274	276	crisisItem.setRef(buildRef(referValue));
275	277
276	278
277	279
278	280
279	281
280	282
...	...	@@ -276,77 +278,338 @@
276	278	lisCrisisItemService.addLisCrisisItem(crisisItem);
277	279	}
278	280	}
279		- params.put(code,item.getResult().trim());
	281	+ params.put(code, item.getResult().trim());
280	282	}
	283	+ //TODO code HBcAb-J 乙肝表面抗原 HBeAb-J 乙肝表面抗体 HBeAg-j 乙肝e抗原 HBsAb-J 乙肝e抗体 HBsAg-J 乙肝核心抗体 HIV(1+2)抗体-J 人类免疫缺陷病毒抗体 TP-抗体梅毒螺旋体抗体
	284	+ String time = DateUtil.getyyyy_MM_dd(new Date());
	285	+ //根据辅助检查项日期判断是初检还是复检
	286	+ if (antExChuModel != null &&
	287	+ !time.equals(DateUtil.getyyyy_MM_dd(antExChuModel.getCreated()))) {
281	288
282		- if (antExChuModel!=null && (com.lyms.platform.common.utils.StringUtils.isNotEmpty(antExChuModel.getXhdb())
283		- \|\| com.lyms.platform.common.utils.StringUtils.isNotEmpty(antExChuModel.getBxbjs()) \|\| com.lyms.platform.common.utils.StringUtils.isNotEmpty(antExChuModel.getPlatelet())
284		- \|\| com.lyms.platform.common.utils.StringUtils.isNotEmpty(antExChuModel.getNdb()) \|\| com.lyms.platform.common.utils.StringUtils.isNotEmpty(antExChuModel.getNt())
285		- \|\| com.lyms.platform.common.utils.StringUtils.isNotEmpty(antExChuModel.getUrineKetone()) \|\| com.lyms.platform.common.utils.StringUtils.isNotEmpty(antExChuModel.getBld()))){
286		- System.out.println("addAntenatalExamination");
287		- addAntenatalExamination(antExChuModel,patients);
288		- }else {
289		- if (antExChuModel!=null){
290		- antExChuModel.setXhdb(params.get("HGB"));
291		- antExChuModel.setBxbjs(params.get("WBC"));
292		- antExChuModel.setPlatelet(params.get("PLT"));
293		- antExChuModel.setNdb(params.get("PRO"));
294		- antExChuModel.setNt(params.get("GLU1"));
295		- antExChuModel.setUrineKetone(params.get("KET"));
296		- antExChuModel.setBld(params.get("BLD"));
297		- System.out.println("updateAntExChu");
298		- antExService.updateAntExChu(antExChuModel,antExChuModel.getId());
	289	+ AntExQuery antExQuery = new AntExQuery();
	290	+ antExQuery.setParentId(patients.getId());
	291	+ antExQuery.setYn(1);
	292	+ antExQuery.setHospitalId(hospitalId);
	293	+ antExQuery.setCreatedTimeStart(DateUtil.parseYMDHMS(time + " 00:00:00"));
	294	+ antExQuery.setCreatedTimeEnd(DateUtil.parseYMDHMS(time + " 23:59:59"));
	295	+ //复检可能会存在一天多个检查
	296	+ AntenatalExaminationModel antenatalExaminationModel = null;
	297	+ boolean b = false;
	298	+ boolean p=false;
	299	+ List<AntenatalExaminationModel> antenatalExaminationModelList = antExService.queryLastAntenx(antExQuery);
	300	+ if (CollectionUtils.isNotEmpty(antenatalExaminationModelList)) {
	301	+ antenatalExaminationModel = antenatalExaminationModelList.get(0);
	302	+ } else {
	303	+ antenatalExaminationModel = new AntenatalExaminationModel();
299	304	}
	305	+ if (StringUtils.isNotEmpty(params.get("HGB"))) {
	306	+ b = true;
	307	+ antenatalExaminationModel.setHemoglobin(params.get("HGB"));
	308	+ }
	309	+ if (StringUtils.isNotEmpty(params.get("WBC"))) {
	310	+ b = true;
	311	+ antenatalExaminationModel.setBxbjs(params.get("WBC"));
	312	+ }
	313	+ if (StringUtils.isNotEmpty(params.get("PLT"))) {
	314	+ b = true;
	315	+ antenatalExaminationModel.setPlatelet(params.get("PLT"));
	316	+ }
	317	+ if (StringUtils.isNotEmpty(params.get("PRO"))) {
	318	+ b = true;
	319	+ antenatalExaminationModel.setUrineProtein(params.get("PRO"));
	320	+ }
	321	+ if (StringUtils.isNotEmpty(params.get("GLU1"))) {
	322	+ b = true;
	323	+ antenatalExaminationModel.setNt(params.get("GLU1"));
	324	+ }
	325	+ if (StringUtils.isNotEmpty(params.get("KET"))) {
	326	+ b = true;
	327	+ antenatalExaminationModel.setUrineKetone(params.get("KET"));
	328	+ }
	329	+ if (StringUtils.isNotEmpty(params.get("BLD"))) {
	330	+ b = true;
	331	+ antenatalExaminationModel.setBld(params.get("BLD"));
	332	+ }
	333	+ if (StringUtils.isNotEmpty(params.get("ABO"))) {
	334	+ b = true;
	335	+ antenatalExaminationModel.setAbo(params.get("ABO"));
	336	+ }
	337	+ if (StringUtils.isNotEmpty(params.get("rh"))) {
	338	+ b = true;
	339	+ antenatalExaminationModel.setRh(params.get("rh"));
	340	+ }
	341	+ if (StringUtils.isNotEmpty(params.get("GPT"))) {
	342	+ b = true;
	343	+ antenatalExaminationModel.setXqgbzam(params.get("GPT"));
	344	+ }
	345	+ if (StringUtils.isNotEmpty(params.get("GOT"))) {
	346	+ b = true;
	347	+ antenatalExaminationModel.setXqgczam(params.get("GOT"));
	348	+ }
	349	+ if (StringUtils.isNotEmpty(params.get("ALB"))) {
	350	+ b = true;
	351	+ antenatalExaminationModel.setAlbumin(params.get("ALB"));
	352	+ }
	353	+ if (StringUtils.isNotEmpty(params.get("TBiL"))) {
	354	+ b = true;
	355	+ antenatalExaminationModel.setTotalBilirubin(params.get("TBiL"));
	356	+ }
	357	+
	358	+ /* antenatalExaminationModel.setCr(params.get("Cr"));
	359	+ antenatalExaminationModel.setBun(params.get("BUN"));*/
	360	+ if (StringUtils.isNotEmpty(params.get("HIV(1+2)抗体"))) {
	361	+ b = true;
	362	+ antenatalExaminationModel.setHivkt(params.get("HIV(1+2)抗体"));
	363	+ }
	364	+ if (StringUtils.isNotEmpty(params.get("TSH"))) {
	365	+ b = true;
	366	+ antenatalExaminationModel.settSH(params.get("TSH"));
	367	+ }
	368	+ if (StringUtils.isNotEmpty(params.get("FT3"))) {
	369	+ b = true;
	370	+ antenatalExaminationModel.setfTthree(params.get("FT3"));
	371	+ }
	372	+ if (StringUtils.isNotEmpty(params.get("FT4"))) {
	373	+ b = true;
	374	+ antenatalExaminationModel.setfTFour(params.get("FT4"));
	375	+ }
	376	+ if (b) {
	377	+ System.out.println("addAntenatalExamination");
	378	+ addAntenatalExamination(antenatalExaminationModel, antExChuModel, patients);
	379	+ }
	380	+ //GLU3 60分钟血糖 GLU4 120分钟血糖 GLUCm 空腹
	381	+ if (StringUtils.isNotEmpty(params.get("GLU3"))){
	382	+ p=true;
	383	+ patients.setGluthree(params.get("GLU3"));
	384	+ }
	385	+ if (StringUtils.isNotEmpty(params.get("GLU4"))){
	386	+ p=true;
	387	+ patients.setGlufour(params.get("GLU4"));
	388	+ }
	389	+ if (StringUtils.isNotEmpty(params.get("GLUCm"))){
	390	+ p=true;
	391	+ patients.setGlucm(params.get("GLUCm"));
	392	+ }
	393	+ //TODO code HBcAb-J 乙肝表面抗原 HBeAb-J 乙肝表面抗体 HBeAg-j 乙肝e抗原 HBsAb-J 乙肝e抗体 HBsAg-J 乙肝核心抗体 HIV(1+2)抗体-J 人类免疫缺陷病毒抗体 TP-抗体梅毒螺旋体抗体
	394	+ if (StringUtils.isNotEmpty(params.get("HBcAb-J"))){
	395	+ p=true;
	396	+ patients.setHBcAbJ(params.get("HBcAb-J"));
	397	+ }
	398	+ if (StringUtils.isNotEmpty(params.get("HBeAb-J"))){
	399	+ p=true;
	400	+ patients.setHBeAbJ(params.get("HBeAb-J"));
	401	+ }
	402	+ if (StringUtils.isNotEmpty(params.get("HBeAg-j"))){
	403	+ p=true;
	404	+ patients.setHBeAgj(params.get("HBeAg-j"));
	405	+ }
	406	+ if (StringUtils.isNotEmpty(params.get("HBsAb-J"))){
	407	+ p=true;
	408	+ patients.setHBsAbJ(params.get("HBsAb-J"));
	409	+ }
	410	+ if (StringUtils.isNotEmpty(params.get("HBsAg-J"))){
	411	+ p=true;
	412	+ patients.setHBsAgJ(params.get("HBsAg-J"));
	413	+ }
	414	+ if (StringUtils.isNotEmpty(params.get("HIV(1+2)抗体-J"))){
	415	+ p=true;
	416	+ patients.setHIVJ(params.get("HIV(1+2)抗体-J"));
	417	+ }
	418	+ if (StringUtils.isNotEmpty(params.get("TP-抗体"))){
	419	+ p=true;
	420	+ patients.setTp(params.get("TP-抗体"));
	421	+ }
	422	+ if (p){
	423	+ patientsService.updatePatientOne(patients,patients.getId());
	424	+ }
	425	+ } else {
	426	+ if (antExChuModel != null) {
	427	+ boolean b = false;
	428	+ boolean p=false;
	429	+ if (StringUtils.isNotEmpty(params.get("HGB"))) {
	430	+ b = true;
	431	+ antExChuModel.setXhdb(params.get("HGB"));
	432	+ }
	433	+ if (StringUtils.isNotEmpty(params.get("WBC"))) {
	434	+ b = true;
	435	+ antExChuModel.setBxbjs(params.get("WBC"));
	436	+ }
	437	+ if (StringUtils.isNotEmpty(params.get("PLT"))) {
	438	+ b = true;
	439	+ antExChuModel.setPlatelet(params.get("PLT"));
	440	+ }
	441	+ if (StringUtils.isNotEmpty(params.get("PRO"))) {
	442	+ b = true;
	443	+ antExChuModel.setNdb(params.get("PRO"));
	444	+ }
	445	+ if (StringUtils.isNotEmpty(params.get("GLU1"))) {
	446	+ b = true;
	447	+ antExChuModel.setNt(params.get("GLU1"));
	448	+ }
	449	+ if (StringUtils.isNotEmpty(params.get("KET"))) {
	450	+ b = true;
	451	+ antExChuModel.setUrineKetone(params.get("KET"));
	452	+ }
	453	+ if (StringUtils.isNotEmpty(params.get("BLD"))) {
	454	+ b = true;
	455	+ antExChuModel.setBld(params.get("BLD"));
	456	+ }
	457	+ if (StringUtils.isNotEmpty(params.get("ABO"))) {
	458	+ b = true;
	459	+ antExChuModel.setAbo(params.get("ABO"));
	460	+ }
	461	+ if (StringUtils.isNotEmpty(params.get("rh"))) {
	462	+ b = true;
	463	+ antExChuModel.setRh(params.get("rh"));
	464	+ }
	465	+ if (StringUtils.isNotEmpty(params.get("GPT"))) {
	466	+ b = true;
	467	+ antExChuModel.setXqgbzam(params.get("GPT"));
	468	+ }
	469	+ if (StringUtils.isNotEmpty(params.get("GOT"))) {
	470	+ b = true;
	471	+ antExChuModel.setXqgczam(params.get("GOT"));
	472	+ }
	473	+
	474	+ if (StringUtils.isNotEmpty(params.get("ALB"))) {
	475	+ b = true;
	476	+ antExChuModel.setAlbumin(params.get("ALB"));
	477	+ }
	478	+ if (StringUtils.isNotEmpty(params.get("TBiL"))) {
	479	+ b = true;
	480	+ antExChuModel.setTotalBilirubin(params.get("TBiL"));
	481	+ }
	482	+ if (StringUtils.isNotEmpty(params.get("Cr"))) {
	483	+ b = true;
	484	+ antExChuModel.setCr(params.get("Cr"));
	485	+ }
	486	+ if (StringUtils.isNotEmpty(params.get("BUN"))) {
	487	+ b = true;
	488	+ antExChuModel.setBun(params.get("BUN"));
	489	+ }
	490	+ if (StringUtils.isNotEmpty(params.get("HIV(1+2)抗体"))) {
	491	+ b = true;
	492	+ antExChuModel.setHivkt(params.get("HIV(1+2)抗体"));
	493	+ }
	494	+ if (StringUtils.isNotEmpty(params.get("TSH"))) {
	495	+ b = true;
	496	+ antExChuModel.settSH(params.get("TSH"));
	497	+ }
	498	+ if (StringUtils.isNotEmpty(params.get("FT3"))) {
	499	+ b = true;
	500	+ antExChuModel.setfTthree(params.get("FT3"));
	501	+ }
	502	+ if (StringUtils.isNotEmpty(params.get("FT4"))) {
	503	+ b = true;
	504	+ antExChuModel.setfTFour(params.get("FT4"));
	505	+ }
	506	+ if (b) {
	507	+ System.out.println("updateAntExChu");
	508	+ antExService.updateAntExChu(antExChuModel, antExChuModel.getId());
	509	+ }
	510	+ //GLU3 60分钟血糖 GLU4 120分钟血糖 GLUCm 空腹
	511	+ if (StringUtils.isNotEmpty(params.get("GLU3"))){
	512	+ p=true;
	513	+ patients.setGluthree(params.get("GLU3"));
	514	+ }
	515	+ if (StringUtils.isNotEmpty(params.get("GLU4"))){
	516	+ p=true;
	517	+ patients.setGlufour(params.get("GLU4"));
	518	+ }
	519	+ if (StringUtils.isNotEmpty(params.get("GLUCm"))){
	520	+ p=true;
	521	+ patients.setGlucm(params.get("GLUCm"));
	522	+ }
	523	+ if (StringUtils.isNotEmpty(params.get("HBcAb-J"))){
	524	+ p=true;
	525	+ patients.setHBcAbJ(params.get("HBcAb-J"));
	526	+ }
	527	+ if (StringUtils.isNotEmpty(params.get("HBeAb-J"))){
	528	+ p=true;
	529	+ patients.setHBeAbJ(params.get("HBeAb-J"));
	530	+ }
	531	+ if (StringUtils.isNotEmpty(params.get("HBeAg-j"))){
	532	+ p=true;
	533	+ patients.setHBeAgj(params.get("HBeAg-j"));
	534	+ }
	535	+ if (StringUtils.isNotEmpty(params.get("HBsAb-J"))){
	536	+ p=true;
	537	+ patients.setHBsAbJ(params.get("HBsAb-J"));
	538	+ }
	539	+ if (StringUtils.isNotEmpty(params.get("HBsAg-J"))){
	540	+ p=true;
	541	+ patients.setHBsAgJ(params.get("HBsAg-J"));
	542	+ }
	543	+ if (StringUtils.isNotEmpty(params.get("HIV(1+2)抗体-J"))){
	544	+ p=true;
	545	+ patients.setHIVJ(params.get("HIV(1+2)抗体-J"));
	546	+ }
	547	+ if (StringUtils.isNotEmpty(params.get("TP-抗体"))){
	548	+ p=true;
	549	+ patients.setTp(params.get("TP-抗体"));
	550	+ }
	551	+ if (p){
	552	+ patientsService.updatePatientOne(patients,patients.getId());
	553	+ }
	554	+
	555	+ }
300	556	}
301	557	System.out.println("saveLisCrisisItemList end");
302	558	}
303	559
304	560	}
305	561
	562	+
306	563	@Autowired
307	564	private AntenatalExaminationService antenatalExaminationService;
308	565	@Autowired
309	566	private AntExRecordService antExRecordService;
310	567
311		- public void addAntenatalExamination(AntExChuModel antExChuModel,Patients patients){
312		- AntExRecordModel antExRecordModel = new AntExRecordModel();
313		- antExRecordModel.setType(2);
314		- antExRecordModel.setHospitalId(patients.getHospitalId());
315		- antExRecordModel.setLastMenses(patients.getLastMenses());
316		- antExRecordModel.setName(patients.getUsername());
317		- antExRecordModel.setNextCheckTime(patients.getNextCheckTime());
318		- antExRecordModel.setBrith(patients.getBirth());
319		- antExRecordModel.setParentId(patients.getId());
320		- antExRecordModel.setPid(patients.getPid());
321		- antExRecordModel.setDueDate(patients.getDueDate());
322		- antExRecordModel.setCardNo(patients.getCardNo());
323		- antExRecordModel.setCheckDoctor(String.valueOf(patients.getOperator()));
324		- antExRecordModel.setType(1);
325		- antExRecordModel.setCheckTime(patients.getBookbuildingDate());
326		- antExRecordModel.setBuildTime(patients.getBookbuildingDate());
327		- if (antExRecordModel.getDueDate() != null) {
328		- antExRecordModel.setStatus(antExRecordModel.getDueDate().compareTo(new Date()) > 0 ? 2 : 1);
329		- antExRecordModel.setDueStatus(antExRecordModel.getStatus());
	568	+ public void addAntenatalExamination(AntenatalExaminationModel antenatalExaminationModel, AntExChuModel antExChuModel, Patients patients) {
	569	+ if (antenatalExaminationModel.getId() != null) {
	570	+ antenatalExaminationModel.setCheckDate(new Date());
	571	+ antenatalExaminationService.updateOneAnt(antenatalExaminationModel, antenatalExaminationModel.getId());
	572	+ } else {
	573	+ AntExRecordModel antExRecordModel = new AntExRecordModel();
	574	+ antExRecordModel.setType(2);
	575	+ antExRecordModel.setHospitalId(patients.getHospitalId());
	576	+ antExRecordModel.setLastMenses(patients.getLastMenses());
	577	+ antExRecordModel.setName(patients.getUsername());
	578	+ antExRecordModel.setNextCheckTime(patients.getNextCheckTime());
	579	+ antExRecordModel.setBrith(patients.getBirth());
	580	+ antExRecordModel.setParentId(patients.getId());
	581	+ antExRecordModel.setPid(patients.getPid());
	582	+ antExRecordModel.setDueDate(patients.getDueDate());
	583	+ antExRecordModel.setCardNo(patients.getCardNo());
	584	+ antExRecordModel.setCheckDoctor(String.valueOf(patients.getOperator()));
	585	+ antExRecordModel.setType(1);
	586	+ antExRecordModel.setCheckTime(patients.getBookbuildingDate());
	587	+ antExRecordModel.setBuildTime(patients.getBookbuildingDate());
	588	+ if (antExRecordModel.getDueDate() != null) {
	589	+ antExRecordModel.setStatus(antExRecordModel.getDueDate().compareTo(new Date()) > 0 ? 2 : 1);
	590	+ antExRecordModel.setDueStatus(antExRecordModel.getStatus());
	591	+ }
	592	+
	593	+
	594	+ antenatalExaminationModel.setYn(1);
	595	+ antenatalExaminationModel.setParentId(patients.getId());
	596	+ antenatalExaminationModel.setPid(patients.getPid());
	597	+ antenatalExaminationModel.setCheckDoctor(String.valueOf(patients.getOperator()));
	598	+ antenatalExaminationModel.setHospitalId(patients.getHospitalId());
	599	+ antenatalExaminationModel.setName(patients.getUsername());
	600	+ antenatalExaminationModel.setRiskScore(antExChuModel.getHighriskSocre());
	601	+ antenatalExaminationModel.setRiskFactor(antExChuModel.getHighrisk());
	602	+ antenatalExaminationModel.setLastMenses(patients.getLastMenses());
	603	+ antenatalExaminationModel.setNextCheckTime(patients.getNextCheckTime());
	604	+ antenatalExaminationModel.setCurrentDueDate(getBuildingWeek(patients));
	605	+ antenatalExaminationModel.setCheckDate(new Date());
	606	+ antenatalExaminationModel = antenatalExaminationService.addOneBabyAnt(antenatalExaminationModel);
	607	+ antExRecordModel.setfId(antenatalExaminationModel.getId());
	608	+ antExRecordService.addOneRecord(antExRecordModel);
	609	+ //添加复诊时添加追访信息
	610	+ addTrackDownInfo(patients.getOperator(), patients, patients.getNextCheckTime());
330	611	}
331	612
332		- AntenatalExaminationModel antenatalExaminationModel = new AntenatalExaminationModel();
333		- antenatalExaminationModel.setYn(1);
334		- antenatalExaminationModel.setParentId(patients.getId());
335		- antenatalExaminationModel.setPid(patients.getPid());
336		- antenatalExaminationModel.setCheckDoctor(String.valueOf(patients.getOperator()));
337		- antenatalExaminationModel.setHospitalId(patients.getHospitalId());
338		- antenatalExaminationModel.setName(patients.getUsername());
339		- antenatalExaminationModel.setRiskScore(antExChuModel.getHighriskSocre());
340		- antenatalExaminationModel.setRiskFactor(antExChuModel.getHighrisk());
341		- antenatalExaminationModel.setLastMenses(patients.getLastMenses());
342		- antenatalExaminationModel.setNextCheckTime(patients.getNextCheckTime());
343		- antenatalExaminationModel.setCurrentDueDate(getBuildingWeek(patients));
344		- antenatalExaminationModel.setCheckDate(patients.getBookbuildingDate());
345		- antenatalExaminationModel=antenatalExaminationService.addOneBabyAnt(antenatalExaminationModel);
346		- antExRecordModel.setfId(antenatalExaminationModel.getId());
347		- antExRecordService.addOneRecord(antExRecordModel);
348		- //添加复诊时添加追访信息
349		- addTrackDownInfo(patients.getOperator(), patients, patients.getNextCheckTime());
350	613	}
351	614
352	615
353	616
...	...	@@ -356,10 +619,9 @@
356	619	* @param patients
357	620	* @return
358	621	*/
359		- private String getBuildingWeek(Patients patients) {
	622	+ private String getBuildingWeek(Patients patients) {
360	623	String weekDay = "";
361	624	try {
362		- // 徐倩说改的
363	625	if (patients.getBookbuildingDate().getTime() - patients.getDueDate().getTime() > 0 && patients.getBuildType() == 2) {
364	626	// if (patients.getBookbuildingDate().getTime() - patients.getFmDate().getTime() > 0 && patients.getBuildType() == 2) {
365	627	weekDay = "";
366	628
...	...	@@ -395,13 +657,13 @@
395	657	TrackDownRecordQuery downRecordQuery = new TrackDownRecordQuery();
396	658	downRecordQuery.setParentId(patient.getId());
397	659	downRecordQuery.setStatus(3);
398		- if (nextCheckTime!=null) {
	660	+ if (nextCheckTime != null) {
399	661	trackDownRecord.setAppointmentDate(nextCheckTime);
400	662	trackDownRecord.setNextCheckTime(nextCheckTime);
401	663	} else {
402	664	trackDownRecord.setAppointmentDate(new Date());
403	665	}
404		- List <TrackDownRecord> records = trackDownRecordService.queryTrackDown(downRecordQuery);
	666	+ List<TrackDownRecord> records = trackDownRecordService.queryTrackDown(downRecordQuery);
405	667	if (CollectionUtils.isNotEmpty(records)) {//存在则进行修改，只修改基本信息，不修改显示状态和追访类型
406	668	TrackDownRecord trackDownRecord1 = records.get(0);
407	669	trackDownRecord.setId(trackDownRecord1.getId());
...	...	@@ -417,7 +679,7 @@
417	679	}
418	680	trackDownRecord.setOverTimes(0);
419	681	trackDownRecordService.updateTrackDown(trackDownRecord, trackDownRecord1.getId());
420		- }else {
	682	+ } else {
421	683	trackDownRecord.setOverTimes(0);
422	684	trackDownRecordService.addTrackDown(trackDownRecord);
423	685	}
424	686
425	687
426	688
427	689
...	...	@@ -429,25 +691,25 @@
429	691
430	692	}
431	693
432		- private boolean buildEmergency(String result,ReferValue referValue) {
433		- boolean b=false;
434		- if (StringUtils.isEmpty(result)){
	694	+ private boolean buildEmergency(String result, ReferValue referValue) {
	695	+ boolean b = false;
	696	+ if (StringUtils.isEmpty(result)) {
435	697	return b;
436	698	}
437		- BigDecimal bd=new BigDecimal(result);
	699	+ BigDecimal bd = new BigDecimal(result);
438	700	if (StringUtils.isNotBlank(referValue.getEmergencyMin()) && StringUtils.isNotBlank(referValue.getEmergencyMax())) {
439		- if (bd.compareTo(new BigDecimal(referValue.getEmergencyMin()))<0 \|\|
440		- bd.compareTo(new BigDecimal((referValue.getEmergencyMax())))>0 ){
441		- b=true;
	701	+ if (bd.compareTo(new BigDecimal(referValue.getEmergencyMin())) < 0 \|\|
	702	+ bd.compareTo(new BigDecimal((referValue.getEmergencyMax()))) > 0) {
	703	+ b = true;
442	704	}
443	705	} else {
444	706	if (StringUtils.isNotBlank(referValue.getEmergencyMin())) {
445		- if (bd.compareTo(new BigDecimal(referValue.getEmergencyMin()))<0){
446		- b=true;
447		- }
	707	+ if (bd.compareTo(new BigDecimal(referValue.getEmergencyMin())) < 0) {
	708	+ b = true;
	709	+ }
448	710	} else if (StringUtils.isNotBlank(referValue.getEmergencyMax())) {
449		- if (bd.compareTo(new BigDecimal(referValue.getEmergencyMax()))>0){
450		- b=true;
	711	+ if (bd.compareTo(new BigDecimal(referValue.getEmergencyMax())) > 0) {
	712	+ b = true;
451	713	}
452	714	}
453	715	}
454	716
...	...	@@ -455,10 +717,9 @@
455	717	}
456	718
457	719
458		-
459	720	private String buildRef(ReferValue referValue) {
460	721	if (StringUtils.isNotBlank(referValue.getEmergencyMin()) && StringUtils.isNotBlank(referValue.getEmergencyMax())) {
461		- return "<"+referValue.getEmergencyMin() + " \|\| " + ">"+referValue.getEmergencyMax();
	722	+ return "<" + referValue.getEmergencyMin() + " \|\| " + ">" + referValue.getEmergencyMax();
462	723	} else {
463	724	if (StringUtils.isNotBlank(referValue.getEmergencyMin())) {
464	725	return "<" + referValue.getEmergencyMin();
...	...	@@ -478,7 +739,7 @@
478	739
479	740	//1获取孕妇pid
480	741	Patients patients = null;
481		- List<Patients> list= null;
	742	+ List<Patients> list = null;
482	743	PatientsQuery patientsQuery = new PatientsQuery();
483	744	patientsQuery.setHospitalId(model.getHospitalId());
484	745	patientsQuery.setName(model.getName());
485	746
...	...	@@ -491,12 +752,12 @@
491	752	patientsQuery.setPhone(model.getPhone());
492	753	patientsQuery.setVcCardNo(null);
493	754	list = patientsService.queryPatient(patientsQuery);
494		- if(list != null && list.size() > 0){
	755	+ if (list != null && list.size() > 0) {
495	756	patients = list.get(list.size() - 1);
496	757	}
497	758
498	759	}
499		- if(patients == null){
	760	+ if (patients == null) {
500	761	System.out.println("lis query patients null");
501	762	return;
502	763	}
503	764
504	765
...	...	@@ -520,22 +781,21 @@
520	781	antExChuModelUpadte(model, antExChuModel, antExChuModel1);
521	782	} else if ("216".equals(antExChuModel.getHospitalId())) {
522	783	antExChuModelQHDUpadte(model, antExChuModel, antExChuModel1);
523		- }else if("1000000016".equals(antExChuModel.getHospitalId())){ //秦皇岛第二医院
	784	+ } else if ("1000000016".equals(antExChuModel.getHospitalId())) { //秦皇岛第二医院
524	785	antExChuModelQHDDeyyUpadte(model, antExChuModel, antExChuModel1);
525	786	}
526	787	antExService.updateAntExChu(antExChuModel1, antExChuModel.getId());
527	788	}
528	789	} else {
529	790	AntenatalExaminationModel antenatalExaminationModel = AntenatalExaminationModels.get(AntenatalExaminationModels.size() - 1);
530		- if (antenatalExaminationModel.getCreated().getTime() > DateUtil.addDay(model.getPublishTime(),-3).getTime())
531		- {
	791	+ if (antenatalExaminationModel.getCreated().getTime() > DateUtil.addDay(model.getPublishTime(), -3).getTime()) {
532	792	AntenatalExaminationModel antenatalExaminationModel1 = new AntenatalExaminationModel();
533	793	//3 更新复诊记录
534	794	if ("2100001291".equals(antenatalExaminationModel.getHospitalId())) {
535	795	fuZhenUpdate(model, antenatalExaminationModel, antenatalExaminationModel1);
536	796	} else if ("216".equals(antenatalExaminationModel.getHospitalId())) {
537	797	fuZhenQHDUpdate(model, antenatalExaminationModel, antenatalExaminationModel1);
538		- }else if("1000000016".equals(antenatalExaminationModel.getHospitalId())){
	798	+ } else if ("1000000016".equals(antenatalExaminationModel.getHospitalId())) {
539	799	fuZhenQHDDeyyUpdate(model, antenatalExaminationModel, antenatalExaminationModel1);
540	800	}
541	801	antExService.updateOneAnt(antenatalExaminationModel1, antenatalExaminationModel.getId());
...	...	@@ -633,6 +893,7 @@
633	893
634	894	/**
635	895	* 秦皇岛第二医院更新复诊记录
	896	+ *
636	897	* @param model
637	898	* @param antenatalExaminationModel
638	899	* @param antenatalExaminationModel1
639	900
640	901
641	902
...	...	@@ -692,13 +953,13 @@
692	953	String result = getCodeValue(model, "ABO");
693	954	String value = "";
694	955	if ("A型".equals(result)) {
695		- value= "5769ef240cf22c3157577423";//血型
	956	+ value = "5769ef240cf22c3157577423";//血型
696	957	} else if ("B型".equals(result)) {
697		- value= "5769ef380cf22c3157577424";
	958	+ value = "5769ef380cf22c3157577424";
698	959	} else if ("O型".equals(result)) {
699		- value= "5769ef380cf22c3157577425";
	960	+ value = "5769ef380cf22c3157577425";
700	961	} else if ("AB型".equals(result)) {
701		- value= "5769ef380cf22c3157577426";
	962	+ value = "5769ef380cf22c3157577426";
702	963	} else {
703	964	value = result;
704	965	}
...	...	@@ -709,10 +970,10 @@
709	970	String result = getCodeValue(model, "RH");
710	971	String value = "";
711	972	if ("阳性".equals(result) \|\| "+".equals(result)) {
712		- value= "yang";
713		- } else if ("阴性".equals(result) \|\| "-".equals(result)){
714		- value= "yin";//RH血型
715		- }else {
	973	+ value = "yang";
	974	+ } else if ("阴性".equals(result) \|\| "-".equals(result)) {
	975	+ value = "yin";//RH血型
	976	+ } else {
716	977	value = result;
717	978	}
718	979	antExChuModel1.setRh(value);
...	...	@@ -741,11 +1002,11 @@
741	1002	String result = getCodeValue(model, "HCV");
742	1003	String value = "";
743	1004	if ("阳性".equals(result) \|\| "+".equals(result)) {
744		- value= "yang";
745		- } else if ("阴性".equals(result) \|\| "-".equals(result)){
746		- value= "yin";
747		- }else {
748		- value= result;
	1005	+ value = "yang";
	1006	+ } else if ("阴性".equals(result) \|\| "-".equals(result)) {
	1007	+ value = "yin";
	1008	+ } else {
	1009	+ value = result;
749	1010	}
750	1011	antExChuModel1.setBg(value);
751	1012	}
...	...	@@ -754,11 +1015,11 @@
754	1015	String result = getCodeValue(model, "HBsAg");
755	1016	String value = "";
756	1017	if ("阳性".equals(result) \|\| "+".equals(result)) {
757		- value= "yang";
758		- } else if ("阴性".equals(result) \|\| "-".equals(result)){
759		- value= "yin";
760		- }else {
761		- value= result;
	1018	+ value = "yang";
	1019	+ } else if ("阴性".equals(result) \|\| "-".equals(result)) {
	1020	+ value = "yin";
	1021	+ } else {
	1022	+ value = result;
762	1023	}
763	1024	antExChuModel1.setYgbmky(value);
764	1025
...	...	@@ -768,11 +1029,11 @@
768	1029	String result = getCodeValue(model, "HBsAb");
769	1030	String value = "";
770	1031	if ("阳性".equals(result) \|\| "+".equals(result)) {
771		- value= "yang";
772		- } else if ("阴性".equals(result) \|\| "-".equals(result)){
773		- value= "yin";
774		- }else {
775		- value= result;
	1032	+ value = "yang";
	1033	+ } else if ("阴性".equals(result) \|\| "-".equals(result)) {
	1034	+ value = "yin";
	1035	+ } else {
	1036	+ value = result;
776	1037	}
777	1038	antExChuModel1.setYgbmkt(value);
778	1039
...	...	@@ -782,11 +1043,11 @@
782	1043	String result = getCodeValue(model, "HBeAg");
783	1044	String value = "";
784	1045	if ("阳性".equals(result) \|\| "+".equals(result)) {
785		- value= "yang";
786		- } else if ("阴性".equals(result) \|\| "-".equals(result)){
787		- value= "yin";
788		- }else {
789		- value= result;
	1046	+ value = "yang";
	1047	+ } else if ("阴性".equals(result) \|\| "-".equals(result)) {
	1048	+ value = "yin";
	1049	+ } else {
	1050	+ value = result;
790	1051	}
791	1052	antExChuModel1.setYgeky(value);
792	1053	}
...	...	@@ -795,11 +1056,11 @@
795	1056	String result = getCodeValue(model, "HBeAb");
796	1057	String value = "";
797	1058	if ("阳性".equals(result) \|\| "+".equals(result)) {
798		- value= "yang";
799		- } else if ("阴性".equals(result) \|\| "-".equals(result)){
800		- value= "yin";
801		- }else {
802		- value= result;
	1059	+ value = "yang";
	1060	+ } else if ("阴性".equals(result) \|\| "-".equals(result)) {
	1061	+ value = "yin";
	1062	+ } else {
	1063	+ value = result;
803	1064	}
804	1065	antExChuModel1.setYgekt(value);
805	1066	}
...	...	@@ -808,11 +1069,11 @@
808	1069	String result = getCodeValue(model, "HBcAb");
809	1070	String value = "";
810	1071	if ("阳性".equals(result) \|\| "+".equals(result)) {
811		- value= "yang";
812		- } else if ("阴性".equals(result) \|\| "-".equals(result)){
813		- value= "yin";
814		- }else {
815		- value= result;
	1072	+ value = "yang";
	1073	+ } else if ("阴性".equals(result) \|\| "-".equals(result)) {
	1074	+ value = "yin";
	1075	+ } else {
	1076	+ value = result;
816	1077	}
817	1078	antExChuModel1.setYghxkt(value);
818	1079	}
...	...	@@ -827,11 +1088,11 @@
827	1088	String result = getCodeValue(model, "TP1");
828	1089	String value = "";
829	1090	if ("阳性".equals(result) \|\| "+".equals(result)) {
830		- value= "yang";
831		- } else if ("阴性".equals(result) \|\| "-".equals(result)){
832		- value= "yin";
833		- }else {
834		- value= result;
	1091	+ value = "yang";
	1092	+ } else if ("阴性".equals(result) \|\| "-".equals(result)) {
	1093	+ value = "yin";
	1094	+ } else {
	1095	+ value = result;
835	1096	}
836	1097	antExChuModel1.setSyjg(value);
837	1098	}
...	...	@@ -840,11 +1101,11 @@
840	1101	String result = getCodeValue(model, "HIV1");
841	1102	String value = "";
842	1103	if ("阳性".equals(result) \|\| "+".equals(result)) {
843		- value= "yang";
844		- } else if ("阴性".equals(result) \|\| "-".equals(result)){
845		- value= "yin";
846		- }else {
847		- value= result;
	1104	+ value = "yang";
	1105	+ } else if ("阴性".equals(result) \|\| "-".equals(result)) {
	1106	+ value = "yin";
	1107	+ } else {
	1108	+ value = result;
848	1109	}
849	1110	antExChuModel1.setHivkt(value);
850	1111	}
851	1112
...	...	@@ -933,13 +1194,11 @@
933	1194	if ("".equals(antExChuModel.getRh()) \|\| antExChuModel.getRh() == null) {//RH血型
934	1195	antExChuModel1.setRh(getCodeValue(model, "RHDType"));
935	1196
936		- if ("216".equals(antExChuModel1.getHospitalId()) && "yin".equals(antExChuModel1.getRh()))
937		- {
938		- String risks = antExChuModel1.getHighrisk();
939		- if ( StringUtils.isNotEmpty(risks) && !"[]".equals(risks)) {
	1197	+ if ("216".equals(antExChuModel1.getHospitalId()) && "yin".equals(antExChuModel1.getRh())) {
	1198	+ String risks = antExChuModel1.getHighrisk();
	1199	+ if (StringUtils.isNotEmpty(risks) && !"[]".equals(risks)) {
940	1200	List list2 = JsonUtil.toList(antExChuModel.getHighrisk(), List.class);
941		- if (CollectionUtils.isNotEmpty(list2) && !list2.contains("5aab6d3d422b03d4ad2bf830"))
942		- {
	1201	+ if (CollectionUtils.isNotEmpty(list2) && !list2.contains("5aab6d3d422b03d4ad2bf830")) {
943	1202	list2.add("5aab6d3d422b03d4ad2bf830");
944	1203	antExChuModel1.setHighrisk(JsonUtil.array2JsonString(list2));
945	1204	}
...	...	@@ -1013,6 +1272,7 @@
1013	1272
1014	1273	/**
1015	1274	* 秦皇岛第二医院更新初诊记录
	1275	+ *
1016	1276	* @param model
1017	1277	* @param antExChuModel
1018	1278	* @param antExChuModel1
1019	1279
...	...	@@ -1047,13 +1307,11 @@
1047	1307	if ("".equals(antExChuModel.getRh()) \|\| antExChuModel.getRh() == null) {//RH血型
1048	1308	antExChuModel1.setRh(getCodeValue(model, "1268"));
1049	1309
1050		- if ("1000000016".equals(antExChuModel1.getHospitalId()) && "yin".equals(antExChuModel1.getRh()))
1051		- {
1052		- String risks = antExChuModel1.getHighrisk();
1053		- if ( StringUtils.isNotEmpty(risks) && !"[]".equals(risks)) {
	1310	+ if ("1000000016".equals(antExChuModel1.getHospitalId()) && "yin".equals(antExChuModel1.getRh())) {
	1311	+ String risks = antExChuModel1.getHighrisk();
	1312	+ if (StringUtils.isNotEmpty(risks) && !"[]".equals(risks)) {
1054	1313	List list2 = JsonUtil.toList(antExChuModel.getHighrisk(), List.class);
1055		- if (CollectionUtils.isNotEmpty(list2) && !list2.contains("5aab6d3d422b03d4ad2bf830"))
1056		- {
	1314	+ if (CollectionUtils.isNotEmpty(list2) && !list2.contains("5aab6d3d422b03d4ad2bf830")) {
1057	1315	list2.add("5aab6d3d422b03d4ad2bf830");
1058	1316	antExChuModel1.setHighrisk(JsonUtil.array2JsonString(list2));
1059	1317	}

...	...	@@ -504,7 +504,70 @@
504	504	private String glufour;//120分钟血糖
505	505	//产筛结果
506	506	private String nipt;//唐氏筛查/无创DNA检测
	507	+ //传染病筛查
	508	+ private String HBcAbJ;//乙肝表面抗原
	509	+ private String HBeAbJ;//乙肝表面抗体
	510	+ private String HBeAgj;//乙肝e抗原
	511	+ private String HBsAbJ;//乙肝e抗体
	512	+ private String HBsAgJ;//乙肝核心抗体
	513	+ private String HIVJ;//人类免疫缺陷病毒抗体
	514	+ private String tp;//梅毒螺旋体抗体
507	515
	516	+ public String getHBcAbJ() {
	517	+ return HBcAbJ;
	518	+ }
	519	+
	520	+ public void setHBcAbJ(String HBcAbJ) {
	521	+ this.HBcAbJ = HBcAbJ;
	522	+ }
	523	+
	524	+ public String getHBeAbJ() {
	525	+ return HBeAbJ;
	526	+ }
	527	+
	528	+ public void setHBeAbJ(String HBeAbJ) {
	529	+ this.HBeAbJ = HBeAbJ;
	530	+ }
	531	+
	532	+ public String getHBeAgj() {
	533	+ return HBeAgj;
	534	+ }
	535	+
	536	+ public void setHBeAgj(String HBeAgj) {
	537	+ this.HBeAgj = HBeAgj;
	538	+ }
	539	+
	540	+ public String getHBsAbJ() {
	541	+ return HBsAbJ;
	542	+ }
	543	+
	544	+ public void setHBsAbJ(String HBsAbJ) {
	545	+ this.HBsAbJ = HBsAbJ;
	546	+ }
	547	+
	548	+ public String getHBsAgJ() {
	549	+ return HBsAgJ;
	550	+ }
	551	+
	552	+ public void setHBsAgJ(String HBsAgJ) {
	553	+ this.HBsAgJ = HBsAgJ;
	554	+ }
	555	+
	556	+ public String getHIVJ() {
	557	+ return HIVJ;
	558	+ }
	559	+
	560	+ public void setHIVJ(String HIVJ) {
	561	+ this.HIVJ = HIVJ;
	562	+ }
	563	+
	564	+ public String getTp() {
	565	+ return tp;
	566	+ }
	567	+
	568	+ public void setTp(String tp) {
	569	+ this.tp = tp;
	570	+ }
508	571
509	572	public String getGlucm() {
510	573	return glucm;