jiangjiazhi / regional-platform

Commit b1de498fd65fe83534fe8bccaa75ddb85463fc2b

Authored by zhangchao over 1 year ago

Exists in dev

#fix:优化大同艾梅乙查询逻辑

Showing 10 changed files with 290 additions and 20 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
platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanPatientsResult.java

...	...	@@ -287,6 +287,7 @@
287	287	AntenatalExaminationModel antenatalExaminationModel = null;
288	288	boolean b = false;
289	289	boolean p=false;
	290	+ boolean amy=false;
290	291	List<AntenatalExaminationModel> antenatalExaminationModelList = antExService.queryLastAntenx(antExQuery);
291	292	if (CollectionUtils.isNotEmpty(antenatalExaminationModelList)) {
292	293	antenatalExaminationModel = antenatalExaminationModelList.get(0);
293	294
294	295
295	296
296	297
297	298
298	299
299	300
300	301
301	302
302	303
303	304
304	305
305	306
306	307
307	308
...	...	@@ -392,69 +393,117 @@
392	393	if (StringUtils.isNotEmpty(params.get("HBcAb-J"))){
393	394	p=true;
394	395	patients.setHBcAbJ(params.get("HBcAb-J"));
	396	+ if (!amy){
	397	+ amy= params.get("HBcAb-J").contains("阳")\|\|params.get("HBcAb-J").contains("陽")?true:false;
	398	+ }
	399	+
395	400	}
396	401	if (StringUtils.isNotEmpty(params.get("HBcAb"))){
397	402	p=true;
398	403	patients.setHBcAbJ(params.get("HBcAb"));
	404	+ if (!amy){
	405	+ amy= params.get("HBcAb").contains("阳")\|\|params.get("HBcAb").contains("陽")?true:false;
	406	+ }
	407	+
399	408	}
400	409	if (StringUtils.isNotEmpty(params.get("HBeAb-J"))){
401	410	p=true;
402	411	patients.setHBeAbJ(params.get("HBeAb-J"));
	412	+ if (!amy){
	413	+ amy= params.get("HBeAb-J").contains("阳")\|\|params.get("HBeAb-J").contains("陽")?true:false;
	414	+ }
403	415	}
404	416	if (StringUtils.isNotEmpty(params.get("HBeAb"))){
405	417	p=true;
406	418	patients.setHBeAbJ(params.get("HBeAb"));
	419	+ if (!amy){
	420	+ amy= params.get("HBeAb").contains("阳")\|\|params.get("HBeAb").contains("陽")?true:false;
	421	+ }
407	422	}
408	423	if (StringUtils.isNotEmpty(params.get("HBeAg-j"))){
409	424	p=true;
410	425	patients.setHBeAgj(params.get("HBeAg-j"));
	426	+ if (!amy){
	427	+ amy= params.get("HBeAg-J").contains("阳")\|\|params.get("HBeAg-J").contains("陽")?true:false;
	428	+ }
411	429	}
412	430	if (StringUtils.isNotEmpty(params.get("HBeAg"))){
413	431	p=true;
414	432	patients.setHBeAgj(params.get("HBeAg"));
	433	+ if (!amy){
	434	+ amy= params.get("HBeAg").contains("阳")\|\|params.get("HBeAg").contains("陽")?true:false;
	435	+ }
415	436	}
416	437	if (StringUtils.isNotEmpty(params.get("HBsAb-J"))){
417	438	p=true;
418	439	patients.setHBsAbJ(params.get("HBsAb-J"));
	440	+ if (!amy){
	441	+ amy= params.get("HBsAb-J").contains("阴")?true:false;
	442	+ }
419	443	}
420	444	if (StringUtils.isNotEmpty(params.get("HBsAb"))){
421	445	p=true;
422	446	patients.setHBsAbJ(params.get("HBsAb"));
	447	+ if (!amy){
	448	+ amy= params.get("HBsAb").contains("阴")?true:false;
	449	+ }
423	450	}
424	451	if (StringUtils.isNotEmpty(params.get("HBsAg-J"))){
425	452	p=true;
426	453	patients.setHBsAgJ(params.get("HBsAg-J"));
	454	+ if (!amy){
	455	+ amy= params.get("HBsAg-J").contains("阳")\|\|params.get("HBsAg-J").contains("陽")?true:false;
	456	+ }
427	457	}
428	458	if (StringUtils.isNotEmpty(params.get("HBsAg"))){
429	459	p=true;
430	460	patients.setHBsAgJ(params.get("HBsAg"));
	461	+ if (!amy){
	462	+ amy= params.get("HBsAg").contains("阳")\|\|params.get("HBsAg").contains("陽")?true:false;
	463	+ }
431	464	}
432	465	if (StringUtils.isNotEmpty(params.get("HIV(1+2)抗体-J"))){
433	466	p=true;
434	467	patients.setHIVJ(params.get("HIV(1+2)抗体-J"));
	468	+ if (!amy){
	469	+ amy= params.get("HIV(1+2)抗体-J").contains("阳")\|\|params.get("HIV(1+2)抗体-J").contains("陽")?true:false;
	470	+ }
435	471	}
436	472	if (StringUtils.isNotEmpty(params.get("HIV(1+2)抗体"))) {
437	473	p=true;
438	474	patients.setHIVJ(params.get("HIV(1+2)抗体"));
	475	+ if (!amy){
	476	+ amy= params.get("HIV(1+2)抗体").contains("阳")\|\|params.get("HIV(1+2)抗体").contains("陽")?true:false;
	477	+ }
439	478	}
440	479	if (StringUtils.isNotEmpty(params.get("TP—抗体"))){
441	480	p=true;
442	481	patients.setTp(params.get("TP—抗体"));
	482	+ if (!amy){
	483	+ amy= params.get("TP—抗体").contains("阳")\|\|params.get("TP—抗体").contains("陽")?true:false;
	484	+ }
443	485	}
444	486	if (StringUtils.isNotEmpty(params.get("TP-抗体"))){
445	487	p=true;
446	488	patients.setTp(params.get("TP-抗体"));
	489	+ if (!amy){
	490	+ amy= params.get("TP-抗体").contains("阳")\|\|params.get("TP-抗体").contains("陽")?true:false;
	491	+ }
447	492	}
448	493	if (p){
449	494	/* if (StringUtils.isNotEmpty(applyDoctor)&&canConvertToInt(applyDoctor)){
450	495	patients.setLastCheckEmployeeId(applyDoctor);
451	496	}*/
	497	+ if (amy){
	498	+ patients.setDtAmy(0);
	499	+ }
452	500	patientsService.updatePatientOne(patients,patients.getId());
453	501	}
454	502	} else {
455	503	if (antExChuModel != null &&type==1) {
456	504	boolean b = false;
457	505	boolean p=false;
	506	+ boolean amy=false;
458	507	if (StringUtils.isNotEmpty(params.get("HGB"))) {
459	508	b = true;
460	509	antExChuModel.setXhdb(params.get("HGB"));
461	510
462	511
463	512
464	513
465	514
466	515
467	516
468	517
469	518
470	519
471	520
472	521
473	522
474	523
...	...	@@ -556,63 +605,110 @@
556	605	if (StringUtils.isNotEmpty(params.get("HBcAb-J"))){
557	606	p=true;
558	607	patients.setHBcAbJ(params.get("HBcAb-J"));
	608	+ if (!amy){
	609	+ amy= params.get("HBcAb-J").contains("阳")\|\|params.get("HBcAb-J").contains("陽")?true:false;
	610	+ }
	611	+
559	612	}
560	613	if (StringUtils.isNotEmpty(params.get("HBcAb"))){
561	614	p=true;
562	615	patients.setHBcAbJ(params.get("HBcAb"));
	616	+ if (!amy){
	617	+ amy= params.get("HBcAb").contains("阳")\|\|params.get("HBcAb").contains("陽")?true:false;
	618	+ }
	619	+
563	620	}
564	621	if (StringUtils.isNotEmpty(params.get("HBeAb-J"))){
565	622	p=true;
566	623	patients.setHBeAbJ(params.get("HBeAb-J"));
	624	+ if (!amy){
	625	+ amy= params.get("HBeAb-J").contains("阳")\|\|params.get("HBeAb-J").contains("陽")?true:false;
	626	+ }
567	627	}
568	628	if (StringUtils.isNotEmpty(params.get("HBeAb"))){
569	629	p=true;
570	630	patients.setHBeAbJ(params.get("HBeAb"));
	631	+ if (!amy){
	632	+ amy= params.get("HBeAb").contains("阳")\|\|params.get("HBeAb").contains("陽")?true:false;
	633	+ }
571	634	}
572	635	if (StringUtils.isNotEmpty(params.get("HBeAg-j"))){
573	636	p=true;
574	637	patients.setHBeAgj(params.get("HBeAg-j"));
	638	+ if (!amy){
	639	+ amy= params.get("HBeAg-J").contains("阳")\|\|params.get("HBeAg-J").contains("陽")?true:false;
	640	+ }
575	641	}
576	642	if (StringUtils.isNotEmpty(params.get("HBeAg"))){
577	643	p=true;
578	644	patients.setHBeAgj(params.get("HBeAg"));
	645	+ if (!amy){
	646	+ amy= params.get("HBeAg").contains("阳")\|\|params.get("HBeAg").contains("陽")?true:false;
	647	+ }
579	648	}
580	649	if (StringUtils.isNotEmpty(params.get("HBsAb-J"))){
581	650	p=true;
582	651	patients.setHBsAbJ(params.get("HBsAb-J"));
	652	+ if (!amy){
	653	+ amy= params.get("HBsAb-J").contains("阴")?true:false;
	654	+ }
583	655	}
584	656	if (StringUtils.isNotEmpty(params.get("HBsAb"))){
585	657	p=true;
586	658	patients.setHBsAbJ(params.get("HBsAb"));
	659	+ if (!amy){
	660	+ amy= params.get("HBsAb").contains("阴")?true:false;
	661	+ }
587	662	}
588	663	if (StringUtils.isNotEmpty(params.get("HBsAg-J"))){
589	664	p=true;
590	665	patients.setHBsAgJ(params.get("HBsAg-J"));
	666	+ if (!amy){
	667	+ amy= params.get("HBsAg-J").contains("阳")\|\|params.get("HBsAg-J").contains("陽")?true:false;
	668	+ }
591	669	}
592	670	if (StringUtils.isNotEmpty(params.get("HBsAg"))){
593	671	p=true;
594	672	patients.setHBsAgJ(params.get("HBsAg"));
	673	+ if (!amy){
	674	+ amy= params.get("HBsAg").contains("阳")\|\|params.get("HBsAg").contains("陽")?true:false;
	675	+ }
595	676	}
596	677	if (StringUtils.isNotEmpty(params.get("HIV(1+2)抗体-J"))){
597	678	p=true;
598	679	patients.setHIVJ(params.get("HIV(1+2)抗体-J"));
	680	+ if (!amy){
	681	+ amy= params.get("HIV(1+2)抗体-J").contains("阳")\|\|params.get("HIV(1+2)抗体-J").contains("陽")?true:false;
	682	+ }
599	683	}
600	684	if (StringUtils.isNotEmpty(params.get("HIV(1+2)抗体"))) {
601	685	p=true;
602	686	patients.setHIVJ(params.get("HIV(1+2)抗体"));
	687	+ if (!amy){
	688	+ amy= params.get("HIV(1+2)抗体").contains("阳")\|\|params.get("HIV(1+2)抗体").contains("陽")?true:false;
	689	+ }
603	690	}
604	691	if (StringUtils.isNotEmpty(params.get("TP—抗体"))){
605	692	p=true;
606	693	patients.setTp(params.get("TP—抗体"));
	694	+ if (!amy){
	695	+ amy= params.get("TP—抗体").contains("阳")\|\|params.get("TP—抗体").contains("陽")?true:false;
	696	+ }
607	697	}
608	698	if (StringUtils.isNotEmpty(params.get("TP-抗体"))){
609	699	p=true;
610	700	patients.setTp(params.get("TP-抗体"));
	701	+ if (!amy){
	702	+ amy= params.get("TP-抗体").contains("阳")\|\|params.get("TP-抗体").contains("陽")?true:false;
	703	+ }
611	704	}
612	705	if (p){
613	706	/* if (StringUtils.isNotEmpty(applyDoctor)&&canConvertToInt(applyDoctor)){
614	707	patients.setLastCheckEmployeeId(applyDoctor);
615	708	}*/
	709	+ if (amy){
	710	+ patients.setDtAmy(0);
	711	+ }
616	712	patientsService.updatePatientOne(patients,patients.getId());
617	713	}
618	714
619	715
620	716
621	717
622	718
...	...	@@ -816,23 +912,33 @@
816	912	private String getResult(String code,String name,LisCrisisItem crisisItem){
817	913	if (code.equals("HBcAb")){
818	914	if ("乙型肝炎核心抗体(发光法)".equals(name)){
819		- return crisisItem.getResult();
	915	+ return crisisItem.getResult().contains("阴")
	916	+ \|\|crisisItem.getResult().contains("阳")
	917	+ \|\|crisisItem.getResult().contains("陽")?crisisItem.getResult():buildEmergency(crisisItem);
820	918	}
821	919	}else if (code.equals("HBeAb")){
822	920	if ("乙型肝炎e抗体（发光法）".equals(name)){
823		- return crisisItem.getResult();
	921	+ return crisisItem.getResult().contains("阴")
	922	+ \|\|crisisItem.getResult().contains("阳")
	923	+ \|\|crisisItem.getResult().contains("陽")?crisisItem.getResult():buildEmergency(crisisItem);
824	924	}
825	925	}else if (code.equals("HBeAg")){
826	926	if ("乙型肝炎e抗原(发光法)".equals(name)){
827		- return buildEmergency(crisisItem);
	927	+ return crisisItem.getResult().contains("阴")
	928	+ \|\|crisisItem.getResult().contains("阳")
	929	+ \|\|crisisItem.getResult().contains("陽")?crisisItem.getResult():buildEmergency(crisisItem);
828	930	}
829	931	}else if (code.equals("HBsAb")){
830	932	if ("乙型肝炎表面抗体(发光法)".equals(name)){
831		- return buildEmergency(crisisItem);
	933	+ return crisisItem.getResult().contains("阴")
	934	+ \|\|crisisItem.getResult().contains("阳")
	935	+ \|\|crisisItem.getResult().contains("陽")?crisisItem.getResult():buildEmergency(crisisItem);
832	936	}
833	937	}else if (code.equals("HBsAg")){
834	938	if ("乙型肝炎表面抗原（发光法）".equals(name)){
835		- return buildEmergency(crisisItem);
	939	+ return crisisItem.getResult().contains("阴")
	940	+ \|\|crisisItem.getResult().contains("阳")
	941	+ \|\|crisisItem.getResult().contains("陽")?crisisItem.getResult():buildEmergency(crisisItem);
836	942	}
837	943	}else {
838	944	return crisisItem.getResult();
839	945
...	...	@@ -851,9 +957,9 @@
851	957	BigDecimal b=new BigDecimal(array[1]);
852	958	BigDecimal a=new BigDecimal(arrays[1]);
853	959	if (b.compareTo(a)>0){
854		- return "阳性";
	960	+ return "阳性["+b.toPlainString()+"]";
855	961	}else {
856		- return "阴性";
	962	+ return "阴性["+b.toPlainString()+"]";
857	963	}
858	964	}
859	965	return null;

...	...	@@ -514,6 +514,8 @@
514	514	private String HIVJ;//人类免疫缺陷病毒抗体
515	515	private String tp;//梅毒螺旋体抗体
516	516
	517	+ private Integer dtAmy; // 大同艾梅乙审核状态 0为未审核
	518	+
517	519	//大同职工 1为是 0为否
518	520	private Integer userType;
519	521	private String dept;
...	...	@@ -526,6 +528,14 @@
526	528	private String blNo;
527	529	//大同his同步分娩建档数据不给护士及门诊展示住院用默认为0
528	530	private Integer dtFm;
	531	+
	532	+ public Integer getDtAmy() {
	533	+ return dtAmy;
	534	+ }
	535	+
	536	+ public void setDtAmy(Integer dtAmy) {
	537	+ this.dtAmy = dtAmy;
	538	+ }
529	539
530	540	public Integer getDtFm() {
531	541	return dtFm;

...	...	@@ -457,6 +457,18 @@
457	457	private String allPats;
458	458	//大同艾梅乙查询
459	459	private String diseaseType;
	460	+
	461	+
	462	+ private Integer dtAmy;
	463	+
	464	+ public Integer getDtAmy() {
	465	+ return dtAmy;
	466	+ }
	467	+
	468	+ public void setDtAmy(Integer dtAmy) {
	469	+ this.dtAmy = dtAmy;
	470	+ }
	471	+
460	472	private MongoCondition condition2;
461	473
462	474	public String getDiseaseType() {
463	475
...	...	@@ -1411,7 +1423,12 @@
1411	1423	c1 = c.orCondition(new MongoCondition[]{con1, con2}).getCriteria();
1412	1424	}
1413	1425	}
	1426	+ if (dtAmy!=null){
	1427	+ condition=condition.and("dtAmy",0,MongoOper.IS);
	1428	+ }
	1429	+
1414	1430	if(StringUtils.isNotEmpty(diseaseType)){
	1431	+ condition=condition.and("dtAmy",0,MongoOper.IS);
1415	1432	MongoCondition c = MongoCondition.newInstance();
1416	1433	List <MongoCondition> mongoCondits = new ArrayList <>();
1417	1434	//乙肝查询
1418	1435
1419	1436
1420	1437
1421	1438
...	...	@@ -1421,24 +1438,24 @@
1421	1438	// hBsAbJ;//乙肝e抗体阳
1422	1439	// hBsAgJ;//乙肝核心抗体
1423	1440	if (diseaseType.equals(DiseaseTypeEnums.YIGAN.getName())) {
1424		- mongoCondits.add(new MongoCondition("hBcAbJ", "阳", MongoOper.LIKE));
1425		- mongoCondits.add(new MongoCondition("hBeAbJ", "阳", MongoOper.LIKE));
1426		- mongoCondits.add(new MongoCondition("hBeAgj", "阳", MongoOper.LIKE));
	1441	+ mongoCondits.add(new MongoCondition("hBcAbJ", "阳", MongoOper.LIKE).orCondition(new MongoCondition("hBcAbJ", "陽", MongoOper.LIKE)));
	1442	+ mongoCondits.add(new MongoCondition("hBeAbJ", "阳", MongoOper.LIKE).orCondition(new MongoCondition("hBeAbJ", "陽", MongoOper.LIKE)));
	1443	+ mongoCondits.add(new MongoCondition("hBeAgj", "阳", MongoOper.LIKE).orCondition(new MongoCondition("hBeAgj", "陽", MongoOper.LIKE)));
1427	1444	mongoCondits.add(new MongoCondition("hBsAbJ", "阴", MongoOper.LIKE));
1428		- mongoCondits.add(new MongoCondition("hBsAgJ", "阳", MongoOper.LIKE));
	1445	+ mongoCondits.add(new MongoCondition("hBsAgJ", "阳", MongoOper.LIKE).orCondition(new MongoCondition("hBsAgJ", "陽", MongoOper.LIKE)));
1429	1446
1430	1447	}else if (diseaseType.equals(DiseaseTypeEnums.MEIDU.getName())) {
1431	1448	//梅毒查询
1432		- mongoCondits.add(new MongoCondition("tp", "阳", MongoOper.LIKE).orCondition(new MongoCondition("syjg", "", MongoOper.NE)));
1433		- mongoCondits.add(new MongoCondition("HIVJ", "阳", MongoOper.LIKE).orCondition(new MongoCondition("hivkt", "", MongoOper.NE)));
	1449	+ mongoCondits.add(new MongoCondition("tp", "阳", MongoOper.LIKE).orCondition(new MongoCondition("tp", "陽", MongoOper.LIKE)));
	1450	+ mongoCondits.add(new MongoCondition("HIVJ", "阳", MongoOper.LIKE).orCondition(new MongoCondition("HIVJ", "陽", MongoOper.LIKE)));
1434	1451	}else {
1435		- mongoCondits.add(new MongoCondition("hBcAbJ", "阳", MongoOper.LIKE));
1436		- mongoCondits.add(new MongoCondition("hBeAbJ", "阳", MongoOper.LIKE));
1437		- mongoCondits.add(new MongoCondition("hBeAgj", "阳", MongoOper.LIKE));
	1452	+ mongoCondits.add(new MongoCondition("hBcAbJ", "阳", MongoOper.LIKE).orCondition(new MongoCondition("hBcAbJ", "陽", MongoOper.LIKE)));
	1453	+ mongoCondits.add(new MongoCondition("hBeAbJ", "阳", MongoOper.LIKE).orCondition(new MongoCondition("hBeAbJ", "陽", MongoOper.LIKE)));
	1454	+ mongoCondits.add(new MongoCondition("hBeAgj", "阳", MongoOper.LIKE).orCondition(new MongoCondition("hBeAgj", "陽", MongoOper.LIKE)));
1438	1455	mongoCondits.add(new MongoCondition("hBsAbJ", "阴", MongoOper.LIKE));
1439		- mongoCondits.add(new MongoCondition("hBsAgJ", "阳", MongoOper.LIKE));
1440		- mongoCondits.add(new MongoCondition("tp", "阳", MongoOper.LIKE).orCondition(new MongoCondition("syjg", "", MongoOper.NE)));
1441		- mongoCondits.add(new MongoCondition("HIVJ", "阳", MongoOper.LIKE).orCondition(new MongoCondition("hivkt", "", MongoOper.NE)));
	1456	+ mongoCondits.add(new MongoCondition("hBsAgJ", "阳", MongoOper.LIKE).orCondition(new MongoCondition("hBsAgJ", "陽", MongoOper.LIKE)));
	1457	+ mongoCondits.add(new MongoCondition("tp", "阳", MongoOper.LIKE).orCondition(new MongoCondition("tp", "陽",MongoOper.LIKE)));
	1458	+ mongoCondits.add(new MongoCondition("HIVJ", "阳", MongoOper.LIKE).orCondition(new MongoCondition("HIVJ", "陽", MongoOper.LIKE)));
1442	1459	}
1443	1460	if (c1 != null) {
1444	1461	c1 = c1.andOperator(c.orCondition(mongoCondits.toArray(new MongoCondition[mongoCondits.size()])).getCriteria());

...	...	@@ -114,6 +114,14 @@
114	114	}
115	115	return lisService.saveLisData(list,commonThreadPool);
116	116	}
	117	+ @RequestMapping(method = RequestMethod.GET, value = "/test/saveLisData")
	118	+ @ResponseBody
	119	+ public BaseResponse saveLisDataTemp(HttpServletRequest httpServletRequest) {
	120	+ LisReportQuery query=new LisReportQuery();
	121	+ query.setHospitalId("2100002419");
	122	+ return lisService.saveLisData(lisService.queryLisDataByQuery(query),commonThreadPool);
	123	+ }
	124	+
117	125	@RequestMapping(method = RequestMethod.POST, value = "/saveLisDataTemp")
118	126	@ResponseBody
119	127	public Integer saveLisDataTemp(@RequestBody LisReportModel models,

...	...	@@ -625,6 +625,21 @@
625	625	*
626	626	* @return 返回结果
627	627	*/
	628	+ @RequestMapping(value = "/queryAmyPatientsCount", method = RequestMethod.GET)
	629	+ @ResponseBody
	630	+ @TokenRequired
	631	+ public BaseResponse queryAmyPatientsCount( HttpServletRequest request){
	632	+ LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
	633	+ return patientFacade.queryAmyPatientsCount(loginState.getId());
	634	+ }
	635	+
	636	+
	637	+
	638	+ /**
	639	+ * 艾梅乙孕妇管理
	640	+ *
	641	+ * @return 返回结果
	642	+ */
628	643	@RequestMapping(value = "/queryAmyPatients", method = RequestMethod.GET)
629	644	@ResponseBody
630	645	@TokenRequired

...	...	@@ -691,12 +691,15 @@
691	691	try {
692	692	if (patients != null) {
693	693	patients.setVcCardNo(antExAddRequest.getVcCardNo());
	694	+ if (antExAddRequest.getIsAmy()!=null){
	695	+ patients.setDtAmy(1);
	696	+ }
694	697	//发送推送消息
695	698	if (antExamModel.getSendMsg() != null && antExamModel.getSendMsg()) {
696	699	//发送推送消息
697	700	patients.setSendMsgTime(new Date());
698	701	}
699		- if (antExamModel.getSendMsg() != null \|\| StringUtils.isNotEmpty(antExAddRequest.getVcCardNo())) {
	702	+ if (antExAddRequest.getIsAmy()!=null \|\| antExamModel.getSendMsg() != null \|\| StringUtils.isNotEmpty(antExAddRequest.getVcCardNo())) {
700	703	patientsService.updatePatient(patients);
701	704	}
702	705	}

...	...	@@ -440,6 +440,9 @@
440	440	}//衡水冀州六院
441	441	else if("2100002324".equals(model.getHospitalId())){
442	442	model.setVcCardNo(cardNo);
	443	+ }else if ("2100002419".equals(model.getHospitalId())){
	444	+ //大同
	445	+ model.setVcCardNo(cardNo);
443	446	}
444	447	// //昌邑市妇幼保健院 lis检查表中存的是病历号需要用身份证号码转换成病历好查询
445	448	// else if("2100001605".equals(model.getHospitalId())){

...	...	@@ -704,6 +704,21 @@
704	704
705	705	return patientsQuery;
706	706	}
	707	+
	708	+ public BaseResponse queryAmyPatientsCount(Integer userId){
	709	+ String hospital = autoMatchFacade.getHospitalId(userId);
	710	+ PatientsQuery patientsQuery =new PatientsQuery();
	711	+ patientsQuery.setDtFm(true);
	712	+ patientsQuery.setDtAmy(0);
	713	+ patientsQuery.setHospitalId(hospital);
	714	+ patientsQuery.setYn(1);
	715	+ patientsQuery.setType(1);
	716	+ int count= patientsService.queryPatientCount(patientsQuery);
	717	+ BaseResponse baseResponse= new BaseResponse();
	718	+ baseResponse.setObject(count);
	719	+ baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
	720	+ return baseResponse;
	721	+ }
707	722	/**
708	723	* 大同艾梅乙查询
709	724	* @param userId

...	...	@@ -441,6 +441,16 @@
441	441	private String symptoms;//高危手册症状与体征
442	442	private String otherCheck;//高危手册其他检查项
443	443
	444	+ private Integer isAmy;//大同艾梅乙特殊处理
	445	+
	446	+ public Integer getIsAmy() {
	447	+ return isAmy;
	448	+ }
	449	+
	450	+ public void setIsAmy(Integer isAmy) {
	451	+ this.isAmy = isAmy;
	452	+ }
	453	+
444	454	public String getOther() {
445	455	return other;
446	456	}

...	...	@@ -121,7 +121,82 @@
121	121
122	122	//最后检查时间
123	123	private String lastCheckTime;
	124	+ //大同传染病筛查
	125	+ private String hBcAbJ;//乙肝表面抗原
	126	+ private String hBeAbJ;//乙肝表面抗体
	127	+ private String hBeAgj;//乙肝e抗原
	128	+ private String hBsAbJ;//乙肝e抗体
	129	+ private String hBsAgJ;//乙肝核心抗体
124	130
	131	+ private String HIVJ;//人类免疫缺陷病毒抗体
	132	+ private String tp;//梅毒螺旋体抗体
	133	+
	134	+ private Integer dtAmy;
	135	+
	136	+ public Integer getDtAmy() {
	137	+ return dtAmy;
	138	+ }
	139	+
	140	+ public void setDtAmy(Integer dtAmy) {
	141	+ this.dtAmy = dtAmy;
	142	+ }
	143	+
	144	+ public String gethBcAbJ() {
	145	+ return hBcAbJ;
	146	+ }
	147	+
	148	+ public void sethBcAbJ(String hBcAbJ) {
	149	+ this.hBcAbJ = hBcAbJ;
	150	+ }
	151	+
	152	+ public String gethBeAbJ() {
	153	+ return hBeAbJ;
	154	+ }
	155	+
	156	+ public void sethBeAbJ(String hBeAbJ) {
	157	+ this.hBeAbJ = hBeAbJ;
	158	+ }
	159	+
	160	+ public String gethBeAgj() {
	161	+ return hBeAgj;
	162	+ }
	163	+
	164	+ public void sethBeAgj(String hBeAgj) {
	165	+ this.hBeAgj = hBeAgj;
	166	+ }
	167	+
	168	+ public String gethBsAbJ() {
	169	+ return hBsAbJ;
	170	+ }
	171	+
	172	+ public void sethBsAbJ(String hBsAbJ) {
	173	+ this.hBsAbJ = hBsAbJ;
	174	+ }
	175	+
	176	+ public String gethBsAgJ() {
	177	+ return hBsAgJ;
	178	+ }
	179	+
	180	+ public void sethBsAgJ(String hBsAgJ) {
	181	+ this.hBsAgJ = hBsAgJ;
	182	+ }
	183	+
	184	+ public String getHIVJ() {
	185	+ return HIVJ;
	186	+ }
	187	+
	188	+ public void setHIVJ(String HIVJ) {
	189	+ this.HIVJ = HIVJ;
	190	+ }
	191	+
	192	+ public String getTp() {
	193	+ return tp;
	194	+ }
	195	+
	196	+ public void setTp(String tp) {
	197	+ this.tp = tp;
	198	+ }
	199	+
125	200	public String getLastCheckTime() {
126	201	return lastCheckTime;
127	202	}
...	...	@@ -562,6 +637,14 @@
562	637	}
563	638	//秦皇岛定制字段：是否产筛 0：未产筛 1：已产筛
564	639	setProductionSieveType(destModel.getProductionSieveType());
	640	+ sethBcAbJ(destModel.getHBcAbJ());
	641	+ sethBeAbJ(destModel.getHBeAbJ());
	642	+ sethBeAgj(destModel.getHBeAgj());
	643	+ sethBsAbJ(destModel.getHBsAbJ());
	644	+ sethBsAgJ(destModel.getHBsAgJ());
	645	+ setTp(destModel.getTp());
	646	+ setHIVJ(destModel.getHIVJ());
	647	+ setDtAmy(destModel.getDtAmy());
565	648	return this;
566	649	}
567	650	}