jiangjiazhi / regional-platform

Commit 40c286686ab8acc05828a45a001d2aef09bd946e

Authored by liquanyu over 4 years ago

Exists in master and in 6 other branches

update

Showing 9 changed files with 67 additions and 9 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java
platform-dal/src/main/java/com/lyms/platform/pojo/ResidentsArchiveModel.java
platform-operate-api/src/main/java/com/lyms/hospitalapi/hs/HsfyFmService.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ResidentsArchiveAddRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupPageResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ResidentsArchiveResult.java

...	...	@@ -461,6 +461,15 @@
461	461	//1 未同步 2已经同步
462	462	private Integer isSync;
463	463
	464	+ private String cxNum;
	465	+
	466	+ public String getCxNum() {
	467	+ return cxNum;
	468	+ }
	469	+
	470	+ public void setCxNum(String cxNum) {
	471	+ this.cxNum = cxNum;
	472	+ }
464	473
465	474	public Integer getIsSync() {
466	475	return isSync;

...	...	@@ -207,6 +207,18 @@
207	207	private Integer isSync;
208	208	private String blNum;
209	209
	210	+
	211	+ //1 婚检 2 孕前优生 3 婚检孕前优生
	212	+ private Integer type;
	213	+
	214	+ public Integer getType() {
	215	+ return type;
	216	+ }
	217	+
	218	+ public void setType(Integer type) {
	219	+ this.type = type;
	220	+ }
	221	+
210	222	public String getBlNum() {
211	223	return blNum;
212	224	}

1	1	package com.lyms.hospitalapi.hs;
2	2
3		-import com.lyms.hospitalapi.dzfy.ConnTools;
4	3	import com.lyms.hospitalapi.dzfy.DzfyHisService;
5	4	import com.lyms.hospitalapi.dzfy.Fm;
6	5	import com.lyms.hospitalapi.qhdfy.FmItem;
...	...	@@ -181,8 +180,7 @@
181	180	String id = fm.getID();//获取所有的孕妇ID，方便孕妇产下双胞胎而用
182	181
183	182	//用来查询这个孕妇分娩的最近日期的sql
184		- String dateSql = "select max(CREATED) as babyDate from v_deliveryinfo where " +
185		- " ID='"+id+"'" ;
	183	+ String dateSql = "select max(CREATED) as babyDate from v_deliveryinfo where ID='"+id+"'" ;
186	184
187	185	//获取到这个孕妇的最近的分娩日期
188	186	List<Fm> dateList = queryRunner.query(conn, dateSql, new BeanListHandler<Fm>(Fm.class));
189	187
...	...	@@ -197,15 +195,10 @@
197	195
198	196
199	197	//查询这个孕妇最近日期所有分娩记录的sql
200		- String allSql = "select "+cloumns+" from v_deliveryinfo where " +
201		- " CREATED > CONVERT(DATETIME,'" + startDate + "', 120) and CREATED <= CONVERT(DATETIME,'" + endDate + "', 120)" +
202		- " and ID='"+id+"'" ;
	198	+ String allSql = "select "+cloumns+" from v_deliveryinfo where CREATED > CONVERT(DATETIME,'" + startDate + "', 120) and CREATED <= CONVERT(DATETIME,'" + endDate + "', 120) and ID='"+id+"'" ;
203	199
204	200	//查出这个ID对应孕妇在这个时间段的分娩记录
205	201	List<Fm> allList = queryRunner.query(conn, allSql, new BeanListHandler<Fm>(Fm.class));
206		-
207		- //List<Fm> allList = new ArrayList<Fm>();
208		- //allList.add(fm);
209	202
210	203	Date dueDate = null;
211	204	List<MatDeliverAddRequest.Baby> babies = new ArrayList<>();

...	...	@@ -257,6 +257,7 @@
257	257	//返回婚检信息
258	258	public PremaritalCheckupResult getResult(PremaritalCheckup result) {
259	259	PremaritalCheckupResult checkupResult = new PremaritalCheckupResult();
	260	+ checkupResult.setCxNum(result.getCxNum());
260	261	checkupResult.setId(result.getId());
261	262	checkupResult.setParentId(result.getId());
262	263	checkupResult.setPremaritalUpTime(DateUtil.getyyyy_MM_dd(result.getPremaritalUpTime()));
...	...	@@ -675,6 +676,7 @@
675	676	}
676	677	checkup.setDeliverStatus(addRequest.getDeliverStatus());
677	678	}
	679	+ checkup.setCxNum(addRequest.getCxNum());
678	680	checkup.setJczt(addRequest.getJczt());
679	681	checkup.setFkjjState(addRequest.getFkjjState());
680	682
...	...	@@ -1746,6 +1748,7 @@
1746	1748	//返回婚检信息
1747	1749	public PremaritalCheckupPageResult getPageResult(PremaritalCheckup result, ResidentsArchiveModel archiveModel) {
1748	1750	PremaritalCheckupPageResult checkupResult = new PremaritalCheckupPageResult();
	1751	+ checkupResult.setCxNum(result.getCxNum());
1749	1752	checkupResult.setBaseSign(result.getBaseSign());
1750	1753	checkupResult.setPhysiqueSign(result.getPhysiqueSign());
1751	1754	checkupResult.setRepSign(result.getRepSign());

...	...	@@ -732,6 +732,7 @@
732	732	return null;
733	733	}
734	734	ResidentsArchiveResult result = new ResidentsArchiveResult();
	735	+ result.setType(model.getType());
735	736	FilePathModel filePath = yunBookbuildingService.findFilePath(model.getId());
736	737	result.setFilePath(filePath);
737	738	result.setId(model.getId());

...	...	@@ -169,6 +169,8 @@
169	169	//删除文件路径
170	170	private List<String> delFiles;
171	171
	172	+ //1 婚检 2 孕前优生 3 婚检孕前优生
	173	+ private Integer type;
172	174
173	175	@Override
174	176	public ResidentsArchiveModel convertToDataModel() {
...	...	@@ -271,6 +273,13 @@
271	273	return model;
272	274	}
273	275
	276	+ public Integer getType() {
	277	+ return type;
	278	+ }
	279	+
	280	+ public void setType(Integer type) {
	281	+ this.type = type;
	282	+ }
274	283
275	284	public FilePathModel getFilePath() {
276	285	return filePath;

...	...	@@ -416,6 +416,16 @@
416	416	//色觉
417	417	private String seJue;
418	418
	419	+ private String cxNum;
	420	+
	421	+ public String getCxNum() {
	422	+ return cxNum;
	423	+ }
	424	+
	425	+ public void setCxNum(String cxNum) {
	426	+ this.cxNum = cxNum;
	427	+ }
	428	+
419	429	public String getSeJue() {
420	430	return seJue;
421	431	}

...	...	@@ -426,6 +426,15 @@
426	426	private String fkjjState;
427	427
428	428	private String numCode;
	429	+ private String cxNum;
	430	+
	431	+ public String getCxNum() {
	432	+ return cxNum;
	433	+ }
	434	+
	435	+ public void setCxNum(String cxNum) {
	436	+ this.cxNum = cxNum;
	437	+ }
429	438
430	439	public String getNumCode() {
431	440	return numCode;

...	...	@@ -168,6 +168,18 @@
168	168	private Integer military;
169	169	private FilePathModel filePath;
170	170
	171	+
	172	+ //1 婚检 2 孕前优生 3 婚检孕前优生
	173	+ private Integer type;
	174	+
	175	+ public Integer getType() {
	176	+ return type;
	177	+ }
	178	+
	179	+ public void setType(Integer type) {
	180	+ this.type = type;
	181	+ }
	182	+
171	183	public FilePathModel getFilePath() {
172	184	return filePath;
173	185	}