smartor.git - Gitblit

			@@ -45,11 +45,9 @@
			import java.math.RoundingMode;
			import java.text.DecimalFormat;
			import java.text.SimpleDateFormat;
			import java.time.LocalDate;
			import java.time.LocalDateTime;
			import java.time.LocalTime;
			import java.time.ZoneId;
			import java.time.*;
			import java.time.format.DateTimeFormatter;
			import java.time.temporal.ChronoUnit;
			import java.util.*;
			import java.util.concurrent.TimeUnit;
			import java.util.regex.Matcher;
			@@ -418,9 +416,74 @@
			serviceSubtaskRes.setCurrentPreachform(serviceSubtask.getPreachform().split(",")[0]);
			}
			}
			PatMedInhosp inhosp = patMedInhospMapper.selectPatMedInhospByInhospid(serviceSubtask.getInhospid());
			if (ObjectUtils.isNotEmpty(inhosp)) {
			PatArchive patArchive = patArchiveMapper.selectPatArchiveByPatid(inhosp.getPatid());
			if (ObjectUtils.isNotEmpty(patArchive)) {
			Map<String, String> stringStringMap = calculateAge(patArchive.getBirthdate().toInstant().atZone(ZoneId.systemDefault()).toLocalDate(), LocalDate.now());
			serviceSubtaskRes.setAge(StringUtils.isNotEmpty(stringStringMap.get("age")) ? Long.valueOf(stringStringMap.get("age")) : null);
			serviceSubtaskRes.setSex(patArchive.getSex());
			serviceSubtaskRes.setSexName(patArchive.getSex() != null ? (patArchive.getSex() == 1 ? "男" : "女") : null);
			}
			serviceSubtaskRes.setHospno(inhosp.getInhospno());
			serviceSubtaskRes.setPatno(inhosp.getPatno());
			}

			serviceSubtaskResList.add(serviceSubtaskRes);
			}
			return serviceSubtaskResList;
			}

			public Map<String, String> calculateAge(LocalDate birthdate, LocalDate today) {
			if (birthdate == null \|\| today.isBefore(birthdate)) {
			return null;
			}
			Map<String, String> ageMap = new HashMap<>();

			Period period = Period.between(birthdate, today);
			long totalDays = ChronoUnit.DAYS.between(birthdate, today);
			long totalMonths = ChronoUnit.MONTHS.between(birthdate, today);

			int years = period.getYears();
			int months = period.getMonths();
			int days = period.getDays();

			String ageUnit;
			Integer age;
			String ageUnit2 = null;
			Integer age2 = null;

			if (totalDays < 90) {
			// 小于 1 个月，按天计算
			ageUnit = "天";
			age = (int) totalDays;
			ageMap.put("age", age != null ? age.toString() : null);
			ageMap.put("ageUnit", ageUnit);
			ageMap.put("age2", null);
			ageMap.put("ageUnit2", null);
			} else if (totalMonths < 36) {
			// 小于 1 年，按月 + 天计算
			ageUnit = "月";
			age = (int) totalMonths;
			ageUnit2 = "天";
			age2 = days;
			ageMap.put("age", age != null ? age.toString() : null);
			ageMap.put("ageUnit", ageUnit);
			ageMap.put("age2", age2 != null ? age2.toString() : null);
			ageMap.put("ageUnit2", ageUnit2);
			} else {
			// 大于 1 年，按年 + 月计算
			ageUnit = "岁";
			age = years;
			ageUnit2 = "月";
			age2 = months;
			ageMap.put("age", age != null ? age.toString() : null);
			ageMap.put("ageUnit", ageUnit);
			ageMap.put("age2", age2 != null ? age2.toString() : null);
			ageMap.put("ageUnit2", ageUnit2);
			}

			return ageMap;
			}

			@Override
			@@ -4818,9 +4881,7 @@
			ServiceSubtask serviceSubtask = boxedServiceSubtask(serviceTask, patArchive);
			int i = serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
			//根据生成外链
			if (ObjectUtils.isNotEmpty(serviceSubtask.getTaskid()) &&
			ObjectUtils.isNotEmpty(serviceSubtask.getPatid())
			&& ObjectUtils.isNotEmpty(serviceSubtask.getId())) {
			if (ObjectUtils.isNotEmpty(serviceSubtask.getTaskid()) && ObjectUtils.isNotEmpty(serviceSubtask.getPatid()) && ObjectUtils.isNotEmpty(serviceSubtask.getId())) {
			RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample();
			String taskId = rsaPublicKeyExample.encryptedData(serviceSubtask.getTaskid().toString(), pub_key);
			String patid = rsaPublicKeyExample.encryptedData(serviceSubtask.getPatid().toString(), pub_key);