|
@ -38,6 +38,7 @@ import java.text.SimpleDateFormat;
|
|
|
import java.util.Calendar;
|
|
|
import java.util.Date;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
|
|
|
/**
|
|
|
* 患者基本信息类.
|
|
@ -390,12 +391,13 @@ public class PatientService extends TokenService {
|
|
|
//判断时间是否在6月30之前
|
|
|
if (month < 7) {
|
|
|
//判断是否有签约记录
|
|
|
List<SignFamily> signFamilys1 = jdbcTemplate.queryForList(sql, SignFamily.class);
|
|
|
List<Map<String,Object>> signFamilys1 = jdbcTemplate.queryForList(sql);
|
|
|
if (signFamilys1 != null && signFamilys1.size() > 0) {
|
|
|
//如果有记录则判断其年份是否为当前年份,如果为当前年份,不允许续签
|
|
|
SignFamily sign = signFamilys1.get(0);
|
|
|
if (StringUtils.isNotBlank(sign.getSignYear())) {
|
|
|
int y = Integer.parseInt(sign.getSignYear());
|
|
|
Map<String,Object> sign = signFamilys1.get(0);
|
|
|
|
|
|
if (StringUtils.isNotBlank((String)sign.get("signYear"))){
|
|
|
int y = Integer.parseInt((String)sign.get("signYear"));
|
|
|
if (y == year) {
|
|
|
rs.put("mes", "当前年度已经签约");
|
|
|
rs.put("code", "-2");
|
|
@ -444,7 +446,7 @@ public class PatientService extends TokenService {
|
|
|
rs.put("code", "-3");
|
|
|
return rs;
|
|
|
} else {
|
|
|
rs.put("mes", ",可以续签(未到期)");
|
|
|
rs.put("mes", "可以续签(未到期)");
|
|
|
rs.put("code", "1");
|
|
|
return rs;
|
|
|
}
|