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

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

@@ -359,8 +359,12 @@ public class SignWebService extends BaseService {
        List<SignFamily> signFamilys =  signFamilyDao.findAllActiveSignByPatient(patient);
        JSONArray jsonArray = new JSONArray();
        for(SignFamily signFamily: signFamilys){
            AdminTeam adminTeam = adminTeamService.getTeam(signFamily.getAdminTeamId());
            Doctor doctor = doctorService.findDoctorByCode(adminTeam.getLeaderCode());
            AdminTeam adminTeam = new AdminTeam();
            Doctor doctor = new Doctor();
            if(signFamily.getAdminTeamId()!=null){
                adminTeam = adminTeamService.getTeam(signFamily.getAdminTeamId());
                doctor = doctorService.findDoctorByCode(adminTeam.getLeaderCode());
            }
            JSONObject jsonObject = new JSONObject();
            jsonObject.put("hospitalName",signFamily.getHospitalName());
            jsonObject.put("hospital",signFamily.getHospital());

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

@@ -276,6 +276,7 @@ public class PatientSignController extends BaseController {
			JSONArray jsonArray  = signWebService.getSigns(getUID());
			return write(200, "查询成功！", "data", jsonArray);
		} catch (Exception ex) {
			ex.printStackTrace();
			return error(-1, "系统错误,请联系管理员!");
		}
	}