|
@ -869,18 +869,18 @@ public class FamilyContractService extends BaseService {
|
|
|
Calendar begin = Calendar.getInstance();
|
|
|
Calendar end = Calendar.getInstance();
|
|
|
// 起始时间
|
|
|
begin.set(Calendar.HOUR,0);
|
|
|
begin.set(Calendar.MINUTE,0);
|
|
|
end.set(Calendar.SECOND,0);
|
|
|
begin.set(Calendar.MILLISECOND,0);
|
|
|
begin.set(Calendar.HOUR, 0);
|
|
|
begin.set(Calendar.MINUTE, 0);
|
|
|
end.set(Calendar.SECOND, 0);
|
|
|
begin.set(Calendar.MILLISECOND, 0);
|
|
|
|
|
|
// 结束时间
|
|
|
end.set(Calendar.HOUR,0);
|
|
|
end.set(Calendar.MINUTE,0);
|
|
|
end.set(Calendar.SECOND,0);
|
|
|
end.set(Calendar.MILLISECOND,0);
|
|
|
end.set(Calendar.HOUR, 0);
|
|
|
end.set(Calendar.MINUTE, 0);
|
|
|
end.set(Calendar.SECOND, 0);
|
|
|
end.set(Calendar.MILLISECOND, 0);
|
|
|
end.set(Calendar.MONTH, 5);
|
|
|
end.set(Calendar.DATE,30);
|
|
|
end.set(Calendar.DATE, 30);
|
|
|
|
|
|
if (month < 2 || month > 5) {
|
|
|
if (month > 5) {
|
|
@ -888,7 +888,7 @@ public class FamilyContractService extends BaseService {
|
|
|
}
|
|
|
} else {
|
|
|
begin.set(Calendar.MONTH, 6);
|
|
|
begin.set(Calendar.DATE,1);
|
|
|
begin.set(Calendar.DATE, 1);
|
|
|
end.add(Calendar.YEAR, 1);
|
|
|
}
|
|
|
|
|
@ -1057,18 +1057,18 @@ public class FamilyContractService extends BaseService {
|
|
|
Calendar begin = Calendar.getInstance();
|
|
|
Calendar end = Calendar.getInstance();
|
|
|
// 起始时间
|
|
|
begin.set(Calendar.HOUR,0);
|
|
|
begin.set(Calendar.MINUTE,0);
|
|
|
end.set(Calendar.SECOND,0);
|
|
|
begin.set(Calendar.MILLISECOND,0);
|
|
|
begin.set(Calendar.HOUR, 0);
|
|
|
begin.set(Calendar.MINUTE, 0);
|
|
|
end.set(Calendar.SECOND, 0);
|
|
|
begin.set(Calendar.MILLISECOND, 0);
|
|
|
|
|
|
// 结束时间
|
|
|
end.set(Calendar.HOUR,0);
|
|
|
end.set(Calendar.MINUTE,0);
|
|
|
end.set(Calendar.SECOND,0);
|
|
|
end.set(Calendar.MILLISECOND,0);
|
|
|
end.set(Calendar.HOUR, 0);
|
|
|
end.set(Calendar.MINUTE, 0);
|
|
|
end.set(Calendar.SECOND, 0);
|
|
|
end.set(Calendar.MILLISECOND, 0);
|
|
|
end.set(Calendar.MONTH, 5);
|
|
|
end.set(Calendar.DATE,30);
|
|
|
end.set(Calendar.DATE, 30);
|
|
|
|
|
|
if (month < 2 || month > 5) {
|
|
|
if (month > 5) {
|
|
@ -1076,7 +1076,7 @@ public class FamilyContractService extends BaseService {
|
|
|
}
|
|
|
} else {
|
|
|
begin.set(Calendar.MONTH, 6);
|
|
|
begin.set(Calendar.DATE,1);
|
|
|
begin.set(Calendar.DATE, 1);
|
|
|
end.add(Calendar.YEAR, 1);
|
|
|
}
|
|
|
|
|
@ -2367,4 +2367,74 @@ public class FamilyContractService extends BaseService {
|
|
|
Integer count = jdbcTemplate.queryForObject(sql, parms, Integer.class);
|
|
|
return count;
|
|
|
}
|
|
|
|
|
|
|
|
|
/**
|
|
|
* 查询医生与居民的团队
|
|
|
*
|
|
|
* @param patient
|
|
|
* @param doctor
|
|
|
* @return
|
|
|
*/
|
|
|
public JSONObject getPatientAndDoctorTeams(String patient, String doctor) {
|
|
|
JSONObject result = new JSONObject();
|
|
|
SignFamily ssSign = signFamilyDao.findSignByPatient(patient, 1);
|
|
|
SignFamily jtSign = signFamilyDao.findSignByPatient(patient, 2);
|
|
|
|
|
|
if (ssSign != null && ssSign.getAdminTeamId() != null) {
|
|
|
JSONObject ssTeam = new JSONObject();
|
|
|
if (doctor.equals(ssSign.getDoctor()) || doctor.equals(ssSign.getDoctorHealth())) {
|
|
|
ssTeam.put("hasSign", 1);
|
|
|
} else {
|
|
|
ssTeam.put("hasSign", 0);
|
|
|
}
|
|
|
|
|
|
AdminTeam team = adminTeamService.getTeam(ssSign.getAdminTeamId());
|
|
|
|
|
|
if (team != null) {
|
|
|
if (doctor.equals(team.getLeaderCode())) {
|
|
|
ssTeam.put("isLeader", 1);
|
|
|
} else {
|
|
|
ssTeam.put("isLeader", 0);
|
|
|
}
|
|
|
|
|
|
ssTeam.put("team", new JSONObject(team));
|
|
|
if (ssTeam.getInt("hasSign") == 1 || ssTeam.getInt("isLeader") == 1) {
|
|
|
result.put("ssTeam", ssTeam);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
|
|
|
if (jtSign != null) {
|
|
|
JSONObject jtTeam = new JSONObject();
|
|
|
if (doctor.equals(jtSign.getDoctor()) || doctor.equals(jtSign.getDoctorHealth())) {
|
|
|
jtTeam.put("hasSign", 1);
|
|
|
} else {
|
|
|
jtTeam.put("hasSign", 0);
|
|
|
}
|
|
|
|
|
|
AdminTeam team = adminTeamService.getTeam(jtSign.getAdminTeamId());
|
|
|
|
|
|
if (team != null) {
|
|
|
if (doctor.equals(team.getLeaderCode())) {
|
|
|
jtTeam.put("isLeader", 1);
|
|
|
} else {
|
|
|
jtTeam.put("isLeader", 0);
|
|
|
}
|
|
|
|
|
|
jtTeam.put("team", new JSONObject(team));
|
|
|
if (jtTeam.getInt("hasSign") == 1 || jtTeam.getInt("isLeader") == 1) {
|
|
|
result.put("jtTeam", jtTeam);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
|
|
|
if (result.has("jtTeam") || result.has("ssTeam")) {
|
|
|
result.put("hasSign",1);
|
|
|
} else {
|
|
|
result.put("hasSign",0);
|
|
|
}
|
|
|
|
|
|
return result;
|
|
|
}
|
|
|
}
|