jiangjiazhi / regional-platform

Commit 04598a153e22ba249767b465de3cd874c528aa1c

Authored by shiyang over 3 years ago

Exists in master and in 6 other branches

update

Showing 5 changed files with 52 additions and 6 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java
platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.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/PatientFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientManagerRequest.java

...	...	@@ -89,6 +89,7 @@
89	89
90	90	public List<Patients> queryPatient(PatientsQuery patientsQuery) {
91	91	MongoQuery query = patientsQuery.convertToQuery();
	92	+ System.out.println(query.convertToMongoQuery().toString());
92	93	if (StringUtils.isNotEmpty(patientsQuery.getNeed())) {
93	94	patientsQuery.mysqlBuild(iPatientDao.queryPatientCount(query));
94	95	query.start(patientsQuery.getOffset()).end(patientsQuery.getLimit());

...	...	@@ -392,6 +392,20 @@
392	392	private Date firstCheckTimeStart;
393	393	private Date firstCheckTimeEnd;
394	394
	395	+ /**
	396	+ * 是否有初诊医生
	397	+ */
	398	+ private String prodDoctor;
	399	+
	400	+ public String getProdDoctor() {
	401	+ return prodDoctor;
	402	+ }
	403	+
	404	+ public void setProdDoctor(String prodDoctor) {
	405	+ this.prodDoctor = prodDoctor;
	406	+ }
	407	+ /**********************************************/
	408	+
395	409	public Boolean getIsSendCoupon() {
396	410	return isSendCoupon;
397	411	}
...	...	@@ -790,6 +804,13 @@
790	804	}
791	805	if (null != firstCheckId) {
792	806	condition = condition.and("firstCheckId", firstCheckId, MongoOper.IS);
	807	+ }
	808	+ if(null!=prodDoctor){
	809	+ if("是".equals(prodDoctor)){
	810	+ condition=condition.and("prodDoctor",null,MongoOper.NE);
	811	+ }else {
	812	+ condition=condition.and("prodDoctor",null,MongoOper.IS);
	813	+ }
793	814	}
794	815
795	816

...	...	@@ -3588,18 +3588,26 @@
3588	3588	* @param parentId
3589	3589	* @return
3590	3590	*/
3591		- public String cap(Date date, String parentId) {
	3591	+ public String cap(Date date, String parentId,Integer hospitalId) {
	3592	+ int st=15;
	3593	+ int ed=20;
	3594	+ /*围场需求12-30孕周/
	3595	+ if(null!=hospitalId&&hospitalId==2100001452){
	3596	+ st=12;
	3597	+ ed=30;
	3598	+ }
	3599	+ /****************/
3592	3600	if (null == date) {
3593	3601	return "0";
3594	3602	}
3595	3603	int day = DateUtil.getDays(date, new Date());
3596	3604	// int start = 15 * 7 + 3;
3597		- int start = 15 * 7;
	3605	+ int start = st * 7;
3598	3606	if (his_version != null && "21".equals(his_version)) {
3599	3607	start = 11 * 7;
3600	3608	}
3601	3609
3602		- int end = 20 * 7 + 6;
	3610	+ int end = ed * 7 + 6;
3603	3611	if (day >= start && day <= end) {
3604	3612	SieveApplyOrderQuery sieveApplyOrderQuery = new SieveApplyOrderQuery();
3605	3613	sieveApplyOrderQuery.setYn(YnEnums.YES.getId());
...	...	@@ -3856,7 +3864,8 @@
3856	3864
3857	3865	antexListResult.convertToResult(list, patients, antExChulist);
3858	3866	antexListResult.setData(handlAntData(antExChulist, list));
3859		- antexListResult.setIsSieve(cap(patients.getLastMenses(), patients.getId()));
	3867	+ //围场产筛12-30孕周显示申请产筛按钮标记字段isSieve(cap方法增加了hospitalId 参数）
	3868	+ antexListResult.setIsSieve(cap(patients.getLastMenses(), patients.getId(),StringUtils.isNotEmpty(hospitalId)?Integer.valueOf(hospitalId):null));
3860	3869	antexListResult.setRiskFactor(highScoreResult.getHighRisk());
3861	3870	antexListResult.setRiskScore(highScoreResult.getScoreStr());
3862	3871
...	...	@@ -4189,7 +4198,7 @@
4189	4198	antenatalExaminationResult.setQuickenRemark(examinationModel.getQuickenRemark());
4190	4199	antenatalExaminationResult.setmHighRiskReason(mHighRiskReason);
4191	4200
4192		- antenatalExaminationResult.setIsSieve(cap(data, examinationModel.getParentId()));
	4201	+ antenatalExaminationResult.setIsSieve(cap(data, examinationModel.getParentId(),null));
4193	4202	antenatalExaminationResult.setHasSieve(CollectionUtils.isEmpty(applyOrderService.querySieveApplyOrderWithQuery(applyOrderQuery)) ? 0 : 1);
4194	4203
4195	4204	// 丰润字段的添加
...	...	@@ -4313,7 +4322,7 @@
4313	4322	applyOrderQuery.setParentId(antExChuModel.getParentId());
4314	4323	applyOrderQuery.setYn(YnEnums.YES.getId());
4315	4324	antexChuResult.setHasSieve(CollectionUtils.isEmpty(applyOrderService.querySieveApplyOrderWithQuery(applyOrderQuery)) ? 0 : 1);
4316		- antexChuResult.setIsSieve(cap(antExChuModel.getLastMenses(), antExChuModel.getParentId()));
	4325	+ antexChuResult.setIsSieve(cap(antExChuModel.getLastMenses(), antExChuModel.getParentId(),null));
4317	4326
4318	4327	Map <String, List <String>> treatmentOpinion2 = antExChuModel.getTreatmentOpinion2();
4319	4328	Map <String, List <Map <String, Object>>> restTreatmentOpinion2 = new HashMap <>();

...	...	@@ -2456,6 +2456,7 @@
2456	2456	String hospitalId = autoMatchFacade.getHospitalId(patientManagerRequest.getOperatorId());
2457	2457	PatientsQuery patientsQuery = new PatientsQuery();
2458	2458	patientsQuery.setScreening(patientManagerRequest.getScreening());
	2459	+ patientsQuery.setProdDoctor(patientManagerRequest.getProdDoctor());
2459	2460
2460	2461	patientsQuery.setYyzyfmHospitalId(patientManagerRequest.getYyzyfmHospitalId());
2461	2462

...	...	@@ -115,6 +115,20 @@
115	115	//空或者1为正常 2为补录
116	116	private String normal;
117	117
	118	+ /**
	119	+ * 是否有初诊医生
	120	+ */
	121	+ private String prodDoctor;
	122	+
	123	+ public String getProdDoctor() {
	124	+ return prodDoctor;
	125	+ }
	126	+
	127	+ public void setProdDoctor(String prodDoctor) {
	128	+ this.prodDoctor = prodDoctor;
	129	+ }
	130	+ /**********************************************/
	131	+
118	132	public String getNormal() {
119	133	return normal;
120	134	}