jiangjiazhi / regional-platform

Commit 464087f0f992f7a62759c34c5449debadf83b873

Authored by liquanyu almost 7 years ago

Exists in master and in 6 other branches

产筛

Showing 4 changed files with 68 additions and 7 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/SieveApplyOrderModel.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveApplyOrderAddRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java

...	...	@@ -79,6 +79,27 @@
79	79	//送检日期
80	80	private Date sendTime;
81	81
	82	+ //月经天数
	83	+ private Map<String,String> mensesDay;
	84	+ //月经周期
	85	+ private Map<String,String> mensesWeek;
	86	+
	87	+ public Map<String, String> getMensesDay() {
	88	+ return mensesDay;
	89	+ }
	90	+
	91	+ public void setMensesDay(Map<String, String> mensesDay) {
	92	+ this.mensesDay = mensesDay;
	93	+ }
	94	+
	95	+ public Map<String, String> getMensesWeek() {
	96	+ return mensesWeek;
	97	+ }
	98	+
	99	+ public void setMensesWeek(Map<String, String> mensesWeek) {
	100	+ this.mensesWeek = mensesWeek;
	101	+ }
	102	+
82	103	public String getSendDoctor() {
83	104	return sendDoctor;
84	105	}

...	...	@@ -26,13 +26,11 @@
26	26	import com.lyms.platform.permission.service.UsersService;
27	27	import com.lyms.platform.pojo.*;
28	28	import com.lyms.platform.query.*;
29		-import javafx.beans.binding.ObjectExpression;
30	29	import org.apache.commons.collections.CollectionUtils;
31	30	import org.apache.commons.lang.StringUtils;
32	31	import org.apache.commons.lang.math.NumberUtils;
33	32	import org.springframework.beans.factory.annotation.Autowired;
34	33	import org.springframework.beans.factory.annotation.Qualifier;
35		-import org.springframework.data.domain.Sort;
36	34	import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
37	35	import org.springframework.stereotype.Component;
38	36
...	...	@@ -683,6 +681,10 @@
683	681	result.put("applyHospitalId",sieveApply.getApplyHospitalId());
684	682	result.put("sendDoctor",sieveApply.getSendDoctor());
685	683	result.put("sendTime",DateUtil.getyyyy_MM_dd(sieveApply.getSendTime()));
	684	+ result.put("age",DateUtil.getAge(sieveApply.getBirth(), sieveApply.getCreated()));
	685	+ result.put("mensesDay",sieveApply.getMensesDay());
	686	+ result.put("mensesWeek",sieveApply.getMensesWeek());
	687	+ result.put("experimentNum","");
686	688
687	689	map.put("sieveApplyInfo",result);
688	690
...	...	@@ -714,6 +716,25 @@
714	716	viewInfo.put("applyHospitalName", org.getName());
715	717	}
716	718	}
	719	+ String isTire = "";
	720	+ String tireNumber = "";
	721	+
	722	+ AntExChuQuery antExChuQuery1 = new AntExChuQuery();
	723	+ antExChuQuery1.setParentId(parentId);
	724	+ antExChuQuery1.setYn(YnEnums.YES.getId());
	725	+ List<AntExChuModel> data1 = antenatalExaminationService.queryAntExChu(antExChuQuery1);
	726	+ if (CollectionUtils.isNotEmpty(data1))
	727	+ {
	728	+ AntExChuModel chuModel = data1.get(0);
	729	+ if (StringUtils.isNotEmpty(chuModel.getTireNumber()))
	730	+ {
	731	+ isTire = Integer.parseInt(chuModel.getTireNumber()) > 1 ? "是":"否";
	732	+ tireNumber = chuModel.getTireNumber();
	733	+ }
	734	+ }
	735	+
	736	+ map.put("isTire",isTire);
	737	+ map.put("tireNumber",tireNumber);
717	738
718	739	map.put("viewInfo",viewInfo);
719	740	}

...	...	@@ -78,8 +78,11 @@
78	78	//送检日期
79	79	private String sendTime;
80	80
	81	+ //月经天数
	82	+ private Map<String,String> mensesDay;
	83	+ //月经周期
	84	+ private Map<String,String> mensesWeek;
81	85
82		-
83	86	@Override
84	87	public SieveApplyOrderModel convertToDataModel() {
85	88	SieveApplyOrderModel sieveApplyOrderModel = new SieveApplyOrderModel();
86	89
87	90
88	91
...	...	@@ -103,14 +106,30 @@
103	106	sieveApplyOrderModel.setHistoryBirth(historyBirth);
104	107	sieveApplyOrderModel.setPastHistory(pastHistory);
105	108	sieveApplyOrderModel.setApplyHospitalId(applyHospitalId);
106		-
107	109	sieveApplyOrderModel.setSendDoctor(sendDoctor);
108		-
109	110	sieveApplyOrderModel.setSendTime(StringUtils.isNotEmpty(sendTime) ? DateUtil.parseYMD(sendTime) : null);
	111	+ sieveApplyOrderModel.setMensesDay(mensesDay);
	112	+ sieveApplyOrderModel.setMensesWeek(mensesWeek);
110	113
111	114	return sieveApplyOrderModel;
112	115	}
113	116
	117	+
	118	+ public Map<String, String> getMensesDay() {
	119	+ return mensesDay;
	120	+ }
	121	+
	122	+ public void setMensesDay(Map<String, String> mensesDay) {
	123	+ this.mensesDay = mensesDay;
	124	+ }
	125	+
	126	+ public Map<String, String> getMensesWeek() {
	127	+ return mensesWeek;
	128	+ }
	129	+
	130	+ public void setMensesWeek(Map<String, String> mensesWeek) {
	131	+ this.mensesWeek = mensesWeek;
	132	+ }
114	133
115	134	public String getId() {
116	135	return id;

...	...	@@ -1491,8 +1491,8 @@
1491	1491
1492	1492	public static void main(String[] args) {
1493	1493	PatientWeightServiceImpl patientWeightService = new PatientWeightServiceImpl();
1494		- String bmi = patientWeightService.getBmi("65", "168");
1495		- Map<String,String> map = patientWeightService.getComputeKul(65 , 78.76, 40, Double.parseDouble(bmi),"2");
	1494	+ String bmi = patientWeightService.getBmi("50", "172");
	1495	+ Map<String,String> map = patientWeightService.getComputeKul(50 , 52.13, 16, Double.parseDouble(bmi),"1");
1496	1496	System.out.println(map);
1497	1497
1498	1498	// double kulStart = 750;