jiangjiazhi / regional-platform

Authored by liquanyu over 2 years ago

Exists in master and in 3 other branches

Showing 6 changed files with 25 additions and 14 deletions

...	...	@@ -16,10 +16,8 @@
16	16	public class Test {
17	17
18	18	public static void main(String[] args) throws UnsupportedEncodingException {
19		- IntBuffer ib = IntBuffer.allocate(2);
20		-
21		- ib.put(1);
22		- ib.put(3);
	19	+ String a = "1.0";
	20	+ System.out.println(Double.parseDouble(a));
23	21
24	22	}
25	23

...	...	@@ -419,8 +419,8 @@
419	419	private BabyCheckModel getBabyCheckModel(BabyCheckRequest request) {
420	420
421	421	BabyCheckModel model = new BabyCheckModel();
422		- model.setEyeLeft(request.getEyeLeft());
423		- model.setEyeRight(request.getEyeRight());
	422	+ model.setEyeLeft(request.getEyeLeft() == null ? null : String.valueOf(request.getEyeLeft()));
	423	+ model.setEyeRight(request.getEyeRight() == null ? null : String.valueOf(request.getEyeRight()));
424	424	model.setQgscResult(request.getQgscResult());
425	425	model.setXtxblz(request.getXtxblz());
426	426	model.setEljy(request.getEljy());
...	...	@@ -1279,8 +1279,8 @@
1279	1279	lhBabyEyeCheck.setLhsldcLeft("1");
1280	1280	try
1281	1281	{
1282		- lhBabyEyeCheck.setLhsljcstRight(StringUtils.isNotEmpty(request.getEyeRight()) ? Double.parseDouble(request.getEyeRight()) : null );
1283		- lhBabyEyeCheck.setLhsljcstLeft(StringUtils.isNotEmpty(request.getEyeLeft()) ? Double.parseDouble(request.getEyeLeft()) : null );
	1282	+ lhBabyEyeCheck.setLhsljcstRight(request.getEyeRight());
	1283	+ lhBabyEyeCheck.setLhsljcstLeft(request.getEyeLeft());
1284	1284	}catch (Exception e)
1285	1285	{
1286	1286	}

...	...	@@ -206,6 +206,8 @@
206	206	* @return
207	207	*/
208	208	public void exportLasc(CancerScreeningRequest queryRequest, Integer id, HttpServletResponse response){
	209	+ queryRequest.setPage(1);
	210	+ queryRequest.setLimit(100000);
209	211	List <Map <String, Object>> datas = getLascList(queryRequest, id);
210	212	Map <String, String> cnames = new LinkedHashMap <>();
211	213	cnames.put("name", "姓名");

...	...	@@ -431,6 +431,15 @@
431	431	public Integer productionSieveType;
432	432
433	433	private String height;
	434	+ private String yqWeight;
	435	+
	436	+ public String getYqWeight() {
	437	+ return yqWeight;
	438	+ }
	439	+
	440	+ public void setYqWeight(String yqWeight) {
	441	+ this.yqWeight = yqWeight;
	442	+ }
434	443
435	444	public String getHeight() {
436	445	return height;

...	...	@@ -518,22 +518,22 @@
518	518	private String xtxblz;
519	519
520	520	//隆化儿保检查左右视力检查
521		- private String eyeRight;
522		- private String eyeLeft;
	521	+ private Double eyeRight;
	522	+ private Double eyeLeft;
523	523
524		- public String getEyeRight() {
	524	+ public Double getEyeRight() {
525	525	return eyeRight;
526	526	}
527	527
528		- public void setEyeRight(String eyeRight) {
	528	+ public void setEyeRight(Double eyeRight) {
529	529	this.eyeRight = eyeRight;
530	530	}
531	531
532		- public String getEyeLeft() {
	532	+ public Double getEyeLeft() {
533	533	return eyeLeft;
534	534	}
535	535
536		- public void setEyeLeft(String eyeLeft) {
	536	+ public void setEyeLeft(Double eyeLeft) {
537	537	this.eyeLeft = eyeLeft;
538	538	}
539	539

...	...	@@ -403,6 +403,8 @@
403	403	* @Date: 2020/10/19 16:59
404	404	*/
405	405	public void exportGja(CervicalCancerListRequest param,Integer userId, HttpServletResponse response) {
	406	+ param.setPage(1);
	407	+ param.setLimit(100000);
406	408	List <Map <String, Object>> datas = getGjaList(param, userId);
407	409	Map <String, String> cnames = new LinkedHashMap <>();
408	410	//cnames.put("xz", "乡镇");