jiangjiazhi / regional-platform

Authored by yangfei over 7 years ago

Exists in master and in 6 other branches

Showing 7 changed files

...	...	@@ -210,6 +210,10 @@
210	210
211	211	//分娩孕周
212	212	private Integer dueWeek;
	213	+
	214	+ //分娩孕周整周后的天
	215	+ private Integer dueDay;
	216	+
213	217	//0-转诊待接收 0-转诊待接收 1-转诊已接收 2-孕妇或儿童区域下隐藏建档，默认是母档案为null
214	218	private String enable;
215	219	//操作人
...	...	@@ -315,6 +319,14 @@
315	319	private boolean jxXtx;
316	320	//其他(写明病名并详细描述)
317	321	private Map<String,Object> jxOther;
	322	+
	323	+ public Integer getDueDay() {
	324	+ return dueDay;
	325	+ }
	326	+
	327	+ public void setDueDay(Integer dueDay) {
	328	+ this.dueDay = dueDay;
	329	+ }
318	330
319	331	public Integer getDataStatus() {
320	332	return dataStatus;

...	...	@@ -23,11 +23,10 @@
23	23	import org.springframework.data.mongodb.core.query.Criteria;
24	24	import org.springframework.stereotype.Service;
25	25
26		-import java.sql.Connection;
27		-import java.sql.PreparedStatement;
28		-import java.sql.ResultSet;
	26	+import java.sql.*;
29	27	import java.text.SimpleDateFormat;
30	28	import java.util.*;
	29	+import java.util.Date;
31	30
32	31	/**
33	32	* 诸城初诊复诊接口（GXK）
...	...	@@ -577,8 +576,12 @@
577	576	ps.setString(83,fetalPresentation);
578	577	ps.setString(84,join1);
579	578	if(map.get("checkDate") != null){
580		- ps.setString(85,map.get("checkDate").toString());
581		- }else{
	579	+ String created = DateUtil.getyyyy_MM_dd_hms(antExChuModel.getCreated());
	580	+ int index = created.indexOf(" ");
	581	+ String sfm = created.substring(index);
	582	+ String date = map.get("checkDate").toString()+sfm;
	583	+ ps.setString(85, date);
	584	+ } else{
582	585	ps.setString(85,null);
583	586	}
584	587	if(map.get("cDueWeek") != null){
...	...	@@ -833,7 +836,11 @@
833	836	ps.setString(4,patients.getVcCardNo());
834	837	ps.setString(5,patients.getPhone());
835	838	if(map.get("checkDate") != null){
836		- ps.setString(6,map.get("checkDate").toString());
	839	+ String created = DateUtil.getyyyy_MM_dd_hms(antenatalExaminationModel.getCreated());
	840	+ int index = created.indexOf(" ");
	841	+ String sfm = created.substring(index);
	842	+ String date = map.get("checkDate").toString()+sfm;
	843	+ ps.setString(6,date);
837	844	}else{
838	845	ps.setString(6,null);
839	846	}

...	...	@@ -1188,6 +1188,7 @@
1188	1188	}
1189	1189
1190	1190	bm.setDueWeek(b.getDueWeek());
	1191	+ bm.setDueDay(b.getDueDay());
1191	1192	bm.setBabyDiagnosis(b.getBabyDiagnosis());
1192	1193	bm.setBlNo(b.getBlNo());
1193	1194
...	...	@@ -1426,6 +1427,7 @@
1426	1427	result.setBabyDiagnosis(model.getBabyDiagnosis());
1427	1428	result.setBlNo(model.getBlNo());
1428	1429	result.setDueWeek(model.getDueWeek());
	1430	+ result.setDueDay(model.getDueDay());
1429	1431
1430	1432	if (StringUtils.isNotEmpty(model.getDeliverOrg()))
1431	1433	{
...	...	@@ -2333,7 +2335,7 @@
2333	2335
2334	2336	babyQuery.setStreetId(StringUtils.isEmpty(request.getStreetId()) ? null : request.getStreetId());
2335	2337	babyQuery.setQueryNo(request.getQueryNo());
2336		- List<BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(babyQuery, "modified", Sort.Direction.DESC);
	2338	+ List<BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(babyQuery, "created", Sort.Direction.DESC);
2337	2339
2338	2340	return models;
2339	2341	}
...	...	@@ -2583,6 +2585,9 @@
2583	2585	//母亲高危因素
2584	2586	result.setmHighRiskReason2(queryRisk(babyModel.getmHighRiskReason(),false).getHighRisk());
2585	2587	result.setFatherProfessionTypeId(babyModel.getFproTypeId());
	2588	+
	2589	+ result.setDueWeek(babyModel.getDueWeek());
	2590	+ result.setDueDay(babyModel.getDueDay());
2586	2591	} else {
2587	2592	patientsQuery.setPhoneOrCert(cardNo);
2588	2593	List<Patients> patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery);

...	...	@@ -540,6 +540,8 @@
540	540	if (null != deliverAddRequest.getDueDate()) {
541	541	int day = DateUtil.getDays(patients.getLastMenses(), DateUtil.parseYMD(deliverAddRequest.getDueDate()));
542	542	babyModel.setDueWeek(day / 7);
	543	+ int dueDay = day % 7;
	544	+ babyModel.setDueDay(dueDay == 0 ? null : dueDay);
543	545	}
544	546	}
545	547	// 产妇分娩建档
...	...	@@ -646,6 +648,8 @@
646	648	if (null != deliverAddRequest.getDueDate()) {
647	649	int day = DateUtil.getDays(lastMenses, DateUtil.parseYMD(deliverAddRequest.getDueDate()));
648	650	babyModel1.setDueWeek(day / 7);
	651	+ int dueDay = day % 7;
	652	+ babyModel1.setDueDay(dueDay == 0 ? null : dueDay);
649	653	}
650	654	babyModel1.setBabyHeight(baby.getBabyHeight());
651	655	babyModel1.setBabyWeight(baby.getBabyWeight());
...	...	@@ -2203,7 +2207,6 @@
2203	2207	NewBabyManagerResult newBabyManagerResult = new NewBabyManagerResult();
2204	2208	BabyModelQuery babyModelQuery = new BabyModelQuery();
2205	2209	//babyModelQuery.setYn(YnEnums.YES.getId());
2206		- babyModelQuery.setDataStatus(false);
2207	2210	babyModelQuery.setQueryNo(StringUtils.isEmpty(newBabyManagerRequest.getQueryNo()) ? null : newBabyManagerRequest.getQueryNo());
2208	2211	if (StringUtils.isNotEmpty(newBabyManagerRequest.getBirthDate())) {
2209	2212	try {

...	...	@@ -300,6 +300,10 @@
300	300	//分娩孕周
301	301	private Integer dueWeek;
302	302
	303	+
	304	+ //分娩孕周整周后的天
	305	+ private Integer dueDay;
	306	+
303	307	//儿童诊断
304	308	private String babyDiagnosis;
305	309
306	310
...	...	@@ -310,10 +314,16 @@
310	314
311	315	private Integer couponType;
312	316
313		-
314	317	//档案编号滦平需求
315	318	private String fileCode;
316	319
	320	+ public Integer getDueDay() {
	321	+ return dueDay;
	322	+ }
	323	+
	324	+ public void setDueDay(Integer dueDay) {
	325	+ this.dueDay = dueDay;
	326	+ }
317	327
318	328	public String getNbnaNum() {
319	329	return nbnaNum;

...	...	@@ -252,6 +252,9 @@
252	252	private Integer dueWeek;
253	253
254	254
	255	+ //分娩孕周整周后的天
	256	+ private Integer dueDay;
	257	+
255	258	//儿童诊断
256	259	private String babyDiagnosis;
257	260
...	...	@@ -267,6 +270,14 @@
267	270
268	271	//显示服务信息
269	272	private List<PatientSerResult> patientSerResults;
	273	+
	274	+ public Integer getDueDay() {
	275	+ return dueDay;
	276	+ }
	277	+
	278	+ public void setDueDay(Integer dueDay) {
	279	+ this.dueDay = dueDay;
	280	+ }
270	281
271	282	public String getNbnaNum() {
272	283	return nbnaNum;

...	...	@@ -994,7 +994,7 @@
994	994
995	995	if (destModel.getDueWeek() != null)
996	996	{
997		- setDueWeek(destModel.getDueWeek() + "周");
	997	+ setDueWeek(destModel.getDueWeek() + "周" + (destModel.getDueDay() != null ? "+"+String.valueOf(destModel.getDueDay()) +"天" : ""));
998	998	}
999	999
1000	1000	setDueType(FmTypeEnums.getFmNameById(destModel.getDueType()));