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

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/prescription/PatientPrescriptionPayService.java

@@ -983,16 +983,38 @@ public class PatientPrescriptionPayService extends BaseService {
                        Date dt = com.yihu.wlyy.util.DateUtil.stringToDate(deliveryTime, "yyyy-MM-dd");
                        expressage.setDeliveryTime(dt);
                    }
                    //根据居民code查询团队长及所在团队待处理订单数量
                    String sql = "SELECT a.id teamCode,a.leader_code leaderCode,d.`name` leaderName " +
                            " FROM wlyy_sign_family t,wlyy_admin_team a,wlyy_doctor d " +
                            " WHERE t.`status`=1 AND t.admin_team_code=a.id AND d.code=a.leader_code " +
                            " AND t.patient=? ";
                    Map<String, Object> team = jdbcTemplate.queryForMap(sql, people);
                    //1.4.8 加入签约过期逻辑处理,确保签约过期以后支付可以成功
                    String teamCode;
                    String leaderCode;
                    String leaderName;
                    try{
                        //根据居民code查询团队长及所在团队待处理订单数量
                        String sql = "SELECT a.id teamCode,a.leader_code leaderCode,d.`name` leaderName " +
                                " FROM wlyy_sign_family t,wlyy_admin_team a,wlyy_doctor d " +
                                " WHERE t.`status`=1 AND t.admin_team_code=a.id AND d.code=a.leader_code " +
                                " AND t.patient=? ";
                        Map<String, Object> team = jdbcTemplate.queryForMap(sql, people);
                        if(team!=null){
                            teamCode = team.get("teamCode").toString();
                            leaderCode = team.get("leaderCode").toString();
                            leaderName = team.get("leaderName").toString();
                        }else {
                            //取历史处方的信息
                            teamCode = prescription.getAdminTeamId()+"";
                            leaderCode = prescription.getDoctor();
                            leaderName = prescription.getDoctorName();
                        }
                    }catch (Exception e){
                        //因签约过期引起的异常处理
                        //取历史处方的信息
                        teamCode = prescription.getAdminTeamId()+"";
                        leaderCode = prescription.getDoctor();
                        leaderName = prescription.getDoctorName();
                    }
                    logger.debug("================> get order amount!");
                    String teamCode = team.get("teamCode").toString();
                    String leaderCode = team.get("leaderCode").toString();
                    String leaderName = team.get("leaderName").toString();
                    String count = infoService.getCountExpressage(teamCode).toString();
                    JSONObject jsonObject = new JSONObject();
                    jsonObject = JSON.parseObject(count);