jiangjiazhi / regional-platform

Authored by liquanyu over 2 years ago

Exists in master and in 6 other branches

Showing 3 changed files with 56 additions and 14 deletions

...	...	@@ -14,7 +14,55 @@
14	14
15	15	public static void main(String[] args) throws UnsupportedEncodingException {
16	16
17		- System.out.println((int)Double.parseDouble("48.6"));
	17	+
	18	+ String content = "R+0.75DS-0.75DC×119°L+0.25DS-0.25DC×35°";
	19	+
	20	+ String rValue = null;
	21	+ String rdsValue = null;
	22	+ String rdcValue = null;
	23	+ String lValue = null;
	24	+ String ldsValue = null;
	25	+ String ldcValue = null;
	26	+ try
	27	+ {
	28	+ String REGEX_CHINESE = "[\u4e00-\u9fa5]";// 中文正则
	29	+ if (StringUtils.isNotEmpty(content))
	30	+ {
	31	+ content = content.toUpperCase();
	32	+ content = content.replaceAll(REGEX_CHINESE, "");
	33	+ if (content.contains("R+") && content.contains("DS") && content.contains("DC") && content.contains("L+") )
	34	+ {
	35	+ String[] arrays = content.split("L");
	36	+ if (arrays.length == 2)
	37	+ {
	38	+ String rds = arrays[0].trim();
	39	+ String[] rs = rds.split("DS");
	40	+ rValue = rs[0].replace("R","");
	41	+ String[] rdsx = rs[1].split("DC");
	42	+ rdsValue = rdsx[0];
	43	+ rdcValue = rdsx[1].replace("°","");
	44	+
	45	+
	46	+ String lds = arrays[1].trim();
	47	+ String[] ls = lds.split("DS");
	48	+ lValue = ls[0];
	49	+ String[] ldsx = ls[1].split("DC");
	50	+ ldsValue = ldsx[0];
	51	+ ldcValue = ldsx[1].replace("°","");
	52	+ }
	53	+ }
	54	+
	55	+ }
	56	+ }catch (Exception e)
	57	+ {
	58	+
	59	+ }
	60	+ System.out.println(rValue);
	61	+ System.out.println(rdsValue);
	62	+ System.out.println(rdcValue);
	63	+ System.out.println(lValue);
	64	+ System.out.println(ldsValue);
	65	+ System.out.println(ldcValue);
18	66	}
19	67
20	68	private static Date getStartTime() {

...	...	@@ -5893,19 +5893,11 @@
5893	5893	}
5894	5894
5895	5895	Map<String,String> result = new HashMap<>();
5896		- if (checkModel.getQgscResult() != null && checkModel.getQgscResult().size() >0)
5897		- {
5898		- result = checkModel.getQgscResult();
5899		- }
5900		- else
5901		- {
5902		-
5903		- result.put("yesOrNo","no");
5904		- result.put("sg","false");
5905		- result.put("js","false");
5906		- result.put("rs","false");
5907		- result.put("ys","false");
5908		- }
	5896	+ result.put("yesOrNo","no");
	5897	+ result.put("sg","false");
	5898	+ result.put("js","false");
	5899	+ result.put("rs","false");
	5900	+ result.put("ys","false");
5909	5901
5910	5902	if (flag)
5911	5903	{

...	...	@@ -3849,6 +3849,7 @@
3849	3849	for (BabyModel model : datas)
3850	3850	{
3851	3851	Map result = new HashMap();
	3852	+ result.put("babyId",model.getId());
3852	3853	result.put("babyName",model.getName());
3853	3854	result.put("babySex",SexEnum.getTextById(model.getSex()));
3854	3855	result.put("babyBirth",DateUtil.getyyyy_MM_dd(model.getBirth()));
...	...	@@ -4103,6 +4104,7 @@
4103	4104	for (Patients model : datas)
4104	4105	{
4105	4106	Map result = new HashMap();
	4107	+ result.put("pid",model.getPid());
4106	4108	result.put("username",model.getUsername());
4107	4109	result.put("age",DateUtil.getAge2(model.getBirth(),model.getBookbuildingDate()));
4108	4110	result.put("buildWeek",DateUtil.getWeekDesc(model.getLastMenses(),model.getBookbuildingDate()));