Merge branch 'dev' of trick9191/patient-co-management into dev

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/sign/FamilyContractService.java

@@ -3060,6 +3060,8 @@ public class FamilyContractService extends BaseService {
        if(d!=null){
            sf.setDoctor(doctor);
            sf.setDoctorName(d.getName());
            sf.setSignDoctorCode(doctor);
            sf.setSignDoctorName(d.getName());
        }
        if(hd!=null){
@@ -3243,6 +3245,8 @@ public class FamilyContractService extends BaseService {
        if(d!=null){
            sf.setDoctor(doctor);
            sf.setDoctorName(d.getName());
            sf.setSignDoctorCode(doctor);
            sf.setSignDoctorName(d.getName());
        }
        if(hd!=null){

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/sign/SignWebService.java

@@ -987,7 +987,8 @@ public class SignWebService extends BaseService {
                          String disease,
                          String custom,
                          String sevId,String healthDoctor,
                          Long teamCode) throws Exception {
                          Long teamCode,
                          String expenses) throws Exception {
//        List<SignFamilyRenew> renews = signFamilyRenewDao.findByDoctorAndPatientStatus0(dotorCode, patientCode, signYear);
//
@@ -1020,6 +1021,7 @@ public class SignWebService extends BaseService {
                        if(teamCode!=null&&teamCode!=0){
                            renew.setAdminTeamId(teamCode);
                        }
                        renew.setExpensesType(StringUtils.isEmpty(expenses) ? "01" : expenses);//收费类别
                    }
                }
                renew.setApplyDate(new Date());
@@ -1120,7 +1122,8 @@ public class SignWebService extends BaseService {
                                 String disease,
                                 String custom,
                                 String sevId,String healthDoctor,
                                 Long teamCode) throws Exception {
                                 Long teamCode,
                                 String expenses) throws Exception {
//        List<SignFamily> renews = signFamilyDao.findByDoctorAndPatientOverDue(dotorCode, patientCode, signYear);
//
@@ -1152,6 +1155,7 @@ public class SignWebService extends BaseService {
                        if(teamCode!=null&&teamCode!=0){
                            renew.setAdminTeamId(teamCode);
                        }
                        renew.setExpensesType(StringUtils.isEmpty(expenses) ? "01" : expenses);//收费类别
                    }
                }
                renew.setApplyDate(new Date());
@@ -1534,7 +1538,7 @@ public class SignWebService extends BaseService {
        if (StringUtils.isNotBlank(sevId)) {
            int flag = sevId.indexOf("-");
            if (flag != -1) {
                String sql = "select d.name from wlyy_sign_dict d where d.code = '" + sevId + "' and d.year ='2017' ";
                String sql = "select d.name from wlyy_sign_dict d where d.code = '" + sevId + "' and d.year ='"+DateUtil.getSignYear()+"' ";
                List<Map<String, Object>> list = jdbcTemplate.queryForList(sql);
                if (list != null && list.size() > 0) {
@@ -1548,7 +1552,7 @@ public class SignWebService extends BaseService {
                }
                String[] keys = sevId.split("-");
                if (keys != null && keys.length > 0) {
                    String sql2 = "select d.name from wlyy_sign_dict d where d.code = '" + keys[0] + "' and d.year ='2017' ";
                    String sql2 = "select d.name from wlyy_sign_dict d where d.code = '" + keys[0] + "' and d.year ='"+DateUtil.getSignYear()+"' ";
                    List<Map<String, Object>> list2 = jdbcTemplate.queryForList(sql2);
                    if (list2 != null && list2.size() > 0) {
                        Map<String, Object> name = list2.get(0);
@@ -1561,7 +1565,7 @@ public class SignWebService extends BaseService {
                    }
                }
            } else {
                String sql2 = "select d.name from wlyy_sign_dict d where d.code = '" + sevId + "' and d.year ='2017' ";
                String sql2 = "select d.name from wlyy_sign_dict d where d.code = '" + sevId + "' and d.year ='"+DateUtil.getSignYear()+"' ";
                List<Map<String, Object>> list2 = jdbcTemplate.queryForList(sql2);
                if (list2 != null && list2.size() > 0) {
                    Map<String, Object> name = list2.get(0);
@@ -1585,7 +1589,7 @@ public class SignWebService extends BaseService {
        if (StringUtils.isNotBlank(sevId)) {
            int flag = sevId.indexOf("-");
            if (flag != -1) {
                String sql = "select d.name from wlyy_sign_dict d where d.code = '" + sevId + "' and d.year ='2017' ";
                String sql = "select d.name from wlyy_sign_dict d where d.code = '" + sevId + "' and d.year ='"+DateUtil.getSignYear()+"' ";
                List<Map<String, Object>> list = jdbcTemplate.queryForList(sql);
                String[] keys = sevId.split("-");
@@ -1601,7 +1605,7 @@ public class SignWebService extends BaseService {
                }
                if (keys != null && keys.length > 0) {
                    String sql2 = "select d.name from wlyy_sign_dict d where d.code = '" + keys[0] + "' and d.year ='2017' ";
                    String sql2 = "select d.name from wlyy_sign_dict d where d.code = '" + keys[0] + "' and d.year ='"+DateUtil.getSignYear()+"' ";
                    List<Map<String, Object>> list2 = jdbcTemplate.queryForList(sql2);
                    if (list2 != null && list2.size() > 0) {
                        Map<String, Object> name = list2.get(0);
@@ -1614,7 +1618,7 @@ public class SignWebService extends BaseService {
                    }
                }
            } else {
                String sql2 = "select d.name from wlyy_sign_dict d where d.code = '" + DateUtil.getSignYear() + "' and d.year ='2017' ";
                String sql2 = "select d.name from wlyy_sign_dict d where d.code = '" +sevId+ "' and d.year ='"+DateUtil.getSignYear()+"' ";
                List<Map<String, Object>> list2 = jdbcTemplate.queryForList(sql2);
                if (list2 != null && list2.size() > 0) {
                    Map<String, Object> name = list2.get(0);

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/sign/DoctorSignController.java

@@ -453,7 +453,8 @@ public class DoctorSignController extends WeixinBaseController {
                             @RequestParam(required = false) String custom,
                             @RequestParam(required = false) String sevId,
                             @RequestParam(required = false) String healthDoctor,
                             @RequestParam(required = false) Long teamCode){
                             @RequestParam(required = false) Long teamCode,
                             @RequestParam(required = false) String expenses){
        try{
            //判断是否存在下个年度续签
            int isNowYearSign = signWebService.checkNowYearSign(getUID(),patient);
@@ -468,13 +469,13 @@ public class DoctorSignController extends WeixinBaseController {
            int month = cal.get(Calendar.MONTH)+1;
            int rs = 0;
            if(month<7){
                rs =signWebService.agreeRenew(getAccessToken(),getUID(),patient,state,mesId,year+"",signCode,health,disease,custom,sevId,healthDoctor,teamCode);
                rs =signWebService.agreeRenew(getAccessToken(),getUID(),patient,state,mesId,year+"",signCode,health,disease,custom,sevId,healthDoctor,teamCode,expenses);
//            int rs =signWebService.agreeRenew(getAccessToken(),"test00000000005",patient,state);
            }else{
                rs =signWebService.agreeRenew(getAccessToken(),getUID(),patient,state,mesId,year+"",signCode,health,disease,custom,sevId,healthDoctor,teamCode);
                rs =signWebService.agreeRenew(getAccessToken(),getUID(),patient,state,mesId,year+"",signCode,health,disease,custom,sevId,healthDoctor,teamCode,expenses);
                //如果没有续签记录,走签约记录
                if(rs!=0){
                    rs =signWebService.agreeRenewOverDue(getAccessToken(),getUID(),patient,state,mesId,year+"",signCode,health,disease,custom,sevId,healthDoctor,teamCode);
                    rs =signWebService.agreeRenewOverDue(getAccessToken(),getUID(),patient,state,mesId,year+"",signCode,health,disease,custom,sevId,healthDoctor,teamCode,expenses);
                }
            }
            if(rs != 1){