|
@ -3631,11 +3631,7 @@ public class FamilyContractService extends BaseService {
|
|
|
|
|
|
SignFamily sf = new SignFamily();
|
|
|
|
|
|
Calendar cal = Calendar.getInstance();
|
|
|
int year = cal.get(Calendar.YEAR);
|
|
|
int month = cal.get(Calendar.MONTH) + 1;
|
|
|
String sql = "SELECT t.doctor,t.team_code teamCode,t.admin_team_code adminTeamCode,t.mobile FROM wlyy_sign_family t WHERE t.patient ='" + patient + "' AND t.status=-4 AND t.expenses_status='1' AND t.sign_year ='" + (year - 1) + "'";
|
|
|
|
|
|
String sql = "SELECT t.doctor,t.team_code teamCode,t.admin_team_code adminTeamCode,t.mobile FROM wlyy_sign_family t WHERE t.patient ='" + patient + "' AND t.status=-4 AND t.expenses_status='1' AND t.sign_year ='" + (DateUtil.getSignYear() - 1) + "'";
|
|
|
|
|
|
List<Map<String, Object>> signs = jdbcTemplate.queryForList(sql);
|
|
|
if (signs == null || signs.size() == 0) {
|
|
@ -3744,7 +3740,7 @@ public class FamilyContractService extends BaseService {
|
|
|
//******************扣费接口**********************/
|
|
|
sf.setExpensesStatus("0"); //扣费状态 【0未扣费 1已扣费 2已退费】
|
|
|
|
|
|
sf.setSignYear(year + "");
|
|
|
sf.setSignYear(DateUtil.getSignYear() + "");
|
|
|
|
|
|
//sf.setBegin(DateUtil.stringToDate(DateUtil.getSignYear() + "-07-01 00:00:00", "yyyy-MM-dd HH:mmm:ss"));
|
|
|
sf.setBegin(new Date());
|