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

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

@@ -3074,4 +3074,24 @@ public class FamilyContractService extends BaseService {
        return 1;
    }
    /**
     *
     * @param code
     * @return
     */
    public String getTeamName(String code){
        try{
            String sql = "SELECT t.name FROM wlyy_doctor_team t WHERE t.code ='"+code+"'";
            List<Map<String,Object>> map = jdbcTemplate.queryForList(sql);
            if(map!=null&&map.size()>0){
                return (String)map.get(0).get("name");
            }
        }catch (Exception e){
            e.printStackTrace();
        }
        return "";
    }
}

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

@@ -929,6 +929,11 @@ public class DoctorFamilyContractController extends WeixinBaseController {
                    json.put("applySurrDate", jtSign.getPatientApplyUnsignDate());
                    json.put("applyDate", jtSign.getPatientApplyDate());
                    json.put("jtSign", new JSONObject(jtSign));
                    if(StringUtils.isNotBlank(jtSign.getTeamCode())){
                        json.put("teamName",familyContractService.getTeamName(jtSign.getTeamCode()));
                    }else{
                        json.put("teamName","");
                    }
                } else {
                    throw new Exception("未找到患者待家庭签约的数据");
                }