jiangjiazhi / regional-platform

Authored by zhangchao over 1 year ago

Exists in dev

Showing 7 changed files with 45 additions and 1 deletions

...	...	@@ -520,6 +520,17 @@
520	520
521	521	private String lowerHairOgr;//母子健康手册
522	522
	523	+ //大同审核建档 0为待审核 1为正常
	524	+ private Integer isArchive;
	525	+
	526	+ public Integer getIsArchive() {
	527	+ return isArchive;
	528	+ }
	529	+
	530	+ public void setIsArchive(Integer isArchive) {
	531	+ this.isArchive = isArchive;
	532	+ }
	533	+
523	534	public String getLowerHairOgr() {
524	535	return lowerHairOgr;
525	536	}

...	...	@@ -443,7 +443,17 @@
443	443	private Integer userType;
444	444	//大同院内职工所属科室
445	445	private String dept;
	446	+ //大同审核建档 0为待审核 1为正常
	447	+ private boolean isArchive=false;
446	448
	449	+ public boolean isArchive() {
	450	+ return isArchive;
	451	+ }
	452	+
	453	+ public void setArchive(boolean archive) {
	454	+ isArchive = archive;
	455	+ }
	456	+
447	457	public String getDept() {
448	458	return dept;
449	459	}
...	...	@@ -870,6 +880,12 @@
870	880	if (isFace) {
871	881	condition = condition.and("face", true, MongoOper.EXISTS);
872	882	}
	883	+
	884	+
	885	+ if (isArchive){
	886	+ condition= condition.and("isArchive",0, MongoOper.NE);
	887	+ }
	888	+
873	889
874	890
875	891	if (extSource != null) {

...	...	@@ -580,6 +580,7 @@
580	580	list.add(m1);
581	581	list.add(m2);
582	582	request.setSerInfos(list);
	583	+ request.setIsArchive(0);
583	584	}
584	585
585	586	BaseObjectResponse baseObjectResponse = bookbuildingFacade.addPregnantBookbuilding(request,StringUtils.isNotEmpty(archiveUsers.getAssistUserId())?Integer.valueOf(archiveUsers.getAssistUserId()):null , false);

...	...	@@ -2823,6 +2823,7 @@
2823	2823	patient.setUserType(yunRequest.getUserType());
2824	2824	patient.setDept(yunRequest.getDept());
2825	2825	patient.setLowerHairOgr(yunRequest.getLowerHairOgr());
	2826	+ patient.setIsArchive(yunRequest.getIsArchive());
2826	2827	return patient;
2827	2828	}
2828	2829

...	...	@@ -3204,7 +3204,9 @@
3204	3204	patientsQuery.setCurrentAreaId(organization.getAreaId());
3205	3205	patientsQuery.setWqxType(patientManagerRequest.getWqxType());
3206	3206	patientsQuery.setBooksuifangDoctor(patientManagerRequest.getBooksuifangDoctor());
3207		-
	3207	+ if ("2100002419".equals(hospitalId)){
	3208	+ patientsQuery.setArchive(true);
	3209	+ }
3208	3210	//孕产建档管理-初诊医生是否条件查询
3209	3211	if(StringUtils.isNotEmpty(patientManagerRequest.getProdDoctor())){
3210	3212	patientsQuery.setProdDoctor(patientManagerRequest.getProdDoctor());

...	...	@@ -1611,6 +1611,9 @@
1611	1611	patientsQuery.setNeed("1");
1612	1612	patientsQuery.setPage(statisticsQueryRequest.getPage());
1613	1613	patientsQuery.setLimit(statisticsQueryRequest.getLimit());
	1614	+ if ("2100002419".equals(hospitalId)){
	1615	+ patientsQuery.setArchive(true);
	1616	+ }
1614	1617	if (StringUtils.isNotEmpty(statisticsQueryRequest.getDueDate())) {
1615	1618	String time = statisticsQueryRequest.getDueDate();
1616	1619	String array[] = time.split(" - ");

...	...	@@ -654,6 +654,16 @@
654	654	private String closeCaseCode;
655	655	//是否建册
656	656	private String buildingManualCode;
	657	+ //大同审核建档 0为待审核 1为正常
	658	+ private Integer isArchive;
	659	+
	660	+ public Integer getIsArchive() {
	661	+ return isArchive;
	662	+ }
	663	+
	664	+ public void setIsArchive(Integer isArchive) {
	665	+ this.isArchive = isArchive;
	666	+ }
657	667
658	668	public String getLastCheckEmployeeName() {
659	669	return lastCheckEmployeeName;