jiangjiazhi / regional-platform

Commit 02a4ff47152ccd529858c3d9e3f48c1d10750346

Authored by liquanyu over 2 years ago

Exists in master and in 2 other branches

隆化孤独症字段增加和分娩记录查询条件

Showing 11 changed files with 121 additions and 6 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java
platform-dal/src/main/java/com/lyms/platform/query/MatDeliverQuery.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckPageResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java

...	...	@@ -434,6 +434,11 @@
434	434
435	435	//孤独症筛查
436	436	private String gdzsc;
	437	+ //孤独症筛查 0 未见异常 1 异常
	438	+ private Integer gdzscType;
	439	+
	440	+ //孤独症筛查征象
	441	+ private String gdzscItem;
437	442	//膳食分析
438	443	private String ssfx;
439	444	//感觉统合能力检查
...	...	@@ -563,6 +568,22 @@
563	568	//隆化儿保检查左右视力检查
564	569	private String eyeRight;
565	570	private String eyeLeft;
	571	+
	572	+ public Integer getGdzscType() {
	573	+ return gdzscType;
	574	+ }
	575	+
	576	+ public void setGdzscType(Integer gdzscType) {
	577	+ this.gdzscType = gdzscType;
	578	+ }
	579	+
	580	+ public String getGdzscItem() {
	581	+ return gdzscItem;
	582	+ }
	583	+
	584	+ public void setGdzscItem(String gdzscItem) {
	585	+ this.gdzscItem = gdzscItem;
	586	+ }
566	587
567	588	public String getEyeRight() {
568	589	return eyeRight;

...	...	@@ -56,6 +56,16 @@
56	56	//分娩记录加住院管床大夫
57	57	private String gcdfDoctorId;
58	58
	59	+ private Integer dueCount;
	60	+
	61	+ public Integer getDueCount() {
	62	+ return dueCount;
	63	+ }
	64	+
	65	+ public void setDueCount(Integer dueCount) {
	66	+ this.dueCount = dueCount;
	67	+ }
	68	+
59	69	public String getGcdfDoctorId() {
60	70	return gcdfDoctorId;
61	71	}
...	...	@@ -392,6 +402,9 @@
392	402
393	403	if (null != deathCause) {
394	404	condition = condition.and("deathCause", deathCause, MongoOper.IS);
	405	+ }
	406	+ if (null != dueCount) {
	407	+ condition = condition.and("dueCount", dueCount, MongoOper.IS);
395	408	}
396	409
397	410	if (CollectionUtils.isNotEmpty(ids)) {

...	...	@@ -555,6 +555,8 @@
555	555	model.setZlcpState(request.getZlcpState());
556	556	//孤独症筛查
557	557	model.setGdzsc(request.getGdzsc());
	558	+ model.setGdzscType(request.getGdzscType());
	559	+ model.setGdzscItem(request.getGdzscItem());
558	560	//膳食分析
559	561	model.setSsfx(request.getSsfx());
560	562	//感觉统合能力检查
...	...	@@ -2749,6 +2751,8 @@
2749	2751	model.setZlcp(checkModel.getZlcp());
2750	2752	//孤独症筛查
2751	2753	model.setGdzsc(checkModel.getGdzsc());
	2754	+ model.setGdzscType(checkModel.getGdzscType());
	2755	+ model.setGdzscItem(checkModel.getGdzscItem());
2752	2756	//膳食分析
2753	2757	model.setSsfx(checkModel.getSsfx());
2754	2758	//感觉统合能力检查

...	...	@@ -707,12 +707,12 @@
707	707
708	708
709	709	public BaseResponse handleHistry() {
710		- //查询条件
	710	+ //查询条件
711	711	CancerScreeningQuery query = new CancerScreeningQuery();
712	712	query.setYn(YnEnums.YES.getId());
713		- query.setHospitalId("2100001605");
714		- query.setCreatedStart(DateUtil.parseYMD("2023-01-01"));
715		- query.setCreatedEnd(DateUtil.getDayLastSecond(DateUtil.parseYMD("2023-05-27")));
	713	+ query.setHospitalId("2100001605");
	714	+ query.setCreatedStart(DateUtil.parseYMD("2022-01-01"));
	715	+ query.setCreatedEnd(DateUtil.getDayLastSecond(DateUtil.parseYMD("2022-12-31")));
716	716	List <CancerScreeningModel> modelList = cancerScreenService.queryCancerScreList(query);
717	717	if (CollectionUtils.isNotEmpty(modelList)) {
718	718	System.out.println("handleHistry=" + modelList.size());

...	...	@@ -2715,6 +2715,7 @@
2715	2715	}
2716	2716
2717	2717	MatDeliverQuery matDeliverQuery = new MatDeliverQuery();
	2718	+ matDeliverQuery.setDueCount(childbirthManagerRequest.getDueCount());
2718	2719	matDeliverQuery.setParentIdList(parentIdList);
2719	2720	matDeliverQuery.setYn(YnEnums.YES.getId());
2720	2721	matDeliverQuery.setHloseBloodType(childbirthManagerRequest.getHloseBloodType());

...	...	@@ -6178,6 +6178,8 @@
6178	6178	model.setZlcp(checkModel.getZlcp());
6179	6179	//孤独症筛查
6180	6180	model.setGdzsc(checkModel.getGdzsc());
	6181	+ model.setGdzscType(checkModel.getGdzscType());
	6182	+ model.setGdzscItem(checkModel.getGdzscItem());
6181	6183	//膳食分析
6182	6184	model.setSsfx(checkModel.getSsfx());
6183	6185	//感觉统合能力检查

...	...	@@ -356,6 +356,12 @@
356	356	private String patientSign;
357	357	//孤独症筛查
358	358	private String gdzsc;
	359	+ //孤独症筛查 0 未见异常 1 异常
	360	+ private Integer gdzscType;
	361	+
	362	+ //孤独症筛查征象
	363	+ private String gdzscItem;
	364	+
359	365	//膳食分析
360	366	private String ssfx;
361	367	//感觉统合能力检查
...	...	@@ -520,6 +526,22 @@
520	526	//隆化儿保检查左右视力检查
521	527	private String eyeRight;
522	528	private String eyeLeft;
	529	+
	530	+ public Integer getGdzscType() {
	531	+ return gdzscType;
	532	+ }
	533	+
	534	+ public void setGdzscType(Integer gdzscType) {
	535	+ this.gdzscType = gdzscType;
	536	+ }
	537	+
	538	+ public String getGdzscItem() {
	539	+ return gdzscItem;
	540	+ }
	541	+
	542	+ public void setGdzscItem(String gdzscItem) {
	543	+ this.gdzscItem = gdzscItem;
	544	+ }
523	545
524	546	public String getEyeRight() {
525	547	return eyeRight;

...	...	@@ -151,6 +151,16 @@
151	151	*/
152	152	private String endAge;
153	153
	154	+ //胎次
	155	+ private Integer dueCount;
	156	+
	157	+ public Integer getDueCount() {
	158	+ return dueCount;
	159	+ }
	160	+
	161	+ public void setDueCount(Integer dueCount) {
	162	+ this.dueCount = dueCount;
	163	+ }
154	164	/**
155	165	* @auther HuJiaqi
156	166	* @createTime 2016年12月21日 10时56分

...	...	@@ -55,6 +55,27 @@
55	55	//隆化儿保检查左右视力检查
56	56	private String eyeRight;
57	57	private String eyeLeft;
	58	+ //孤独症筛查 0 未见异常 1 异常
	59	+ private Integer gdzscType;
	60	+
	61	+ //孤独症筛查征象
	62	+ private String gdzscItem;
	63	+
	64	+ public Integer getGdzscType() {
	65	+ return gdzscType;
	66	+ }
	67	+
	68	+ public void setGdzscType(Integer gdzscType) {
	69	+ this.gdzscType = gdzscType;
	70	+ }
	71	+
	72	+ public String getGdzscItem() {
	73	+ return gdzscItem;
	74	+ }
	75	+
	76	+ public void setGdzscItem(String gdzscItem) {
	77	+ this.gdzscItem = gdzscItem;
	78	+ }
58	79
59	80	public String getEyeRight() {
60	81	return eyeRight;

...	...	@@ -746,6 +746,11 @@
746	746	private String zlcpState;
747	747	//孤独症筛查
748	748	private String gdzsc;
	749	+ //孤独症筛查 0 未见异常 1 异常
	750	+ private Integer gdzscType;
	751	+
	752	+ //孤独症筛查征象
	753	+ private String gdzscItem;
749	754	//膳食分析
750	755	private String ssfx;
751	756	//感觉统合能力检查
...	...	@@ -771,6 +776,22 @@
771	776
772	777	//屈光筛查
773	778	private Map<String, String> qgscResult;
	779	+
	780	+ public Integer getGdzscType() {
	781	+ return gdzscType;
	782	+ }
	783	+
	784	+ public void setGdzscType(Integer gdzscType) {
	785	+ this.gdzscType = gdzscType;
	786	+ }
	787	+
	788	+ public String getGdzscItem() {
	789	+ return gdzscItem;
	790	+ }
	791	+
	792	+ public void setGdzscItem(String gdzscItem) {
	793	+ this.gdzscItem = gdzscItem;
	794	+ }
774	795
775	796	public Map<String, String> getQgscResult() {
776	797	return qgscResult;

...	...	@@ -1122,8 +1122,8 @@
1122	1122	Query query = new Query();
1123	1123	Criteria c = Criteria.where("hospitalId").is("2100001605");
1124	1124	query.addCriteria(c);
1125		- query.addCriteria(Criteria.where("created").gte(DateUtil.parseYMD("2023-01-01"))
1126		- .lte(new Date(DateUtil.parseYMD("2023-05-27").getTime() + 24 * 60 * 60 * 1000 - 1)));
	1125	+ query.addCriteria(Criteria.where("created").gte(DateUtil.parseYMD("2022-01-01"))
	1126	+ .lte(new Date(DateUtil.parseYMD("2022-12-31").getTime() + 24 * 60 * 60 * 1000 - 1)));
1127	1127	List<CervicalCancerModel> cervicalCancerModels = mongoTemplate.find(query, CervicalCancerModel.class);
1128	1128	if(CollectionUtils.isNotEmpty(cervicalCancerModels)){
1129	1129	for(CervicalCancerModel model : cervicalCancerModels){